From patchwork Sun Apr 11 19:07:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: takasi-y@ops.dti.ne.jp X-Patchwork-Id: 49930 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 04846B7D22 for ; Mon, 12 Apr 2010 05:22:41 +1000 (EST) Received: from localhost ([127.0.0.1]:55061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O12jt-0002qI-KN for incoming@patchwork.ozlabs.org; Sun, 11 Apr 2010 15:22:37 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O12ic-0002L8-7u for qemu-devel@nongnu.org; Sun, 11 Apr 2010 15:21:18 -0400 Received: from [140.186.70.92] (port=41090 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O12ia-0001uQ-Ik for qemu-devel@nongnu.org; Sun, 11 Apr 2010 15:21:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O12Ve-0002x0-SK for qemu-devel@nongnu.org; Sun, 11 Apr 2010 15:07:57 -0400 Received: from smtp12.dti.ne.jp ([202.216.231.187]:64035) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O12Ve-0002vv-DE for qemu-devel@nongnu.org; Sun, 11 Apr 2010 15:07:54 -0400 Received: from debian.lan (KHP059140016099.ppp-bb.dion.ne.jp [59.140.16.99]) by smtp12.dti.ne.jp (3.11s) with ESMTP AUTH id o3BJ7ZBb021747; Mon, 12 Apr 2010 04:07:35 +0900 (JST) Date: Mon, 12 Apr 2010 04:07:35 +0900 (JST) Message-Id: <201004111907.o3BJ7ZBb021747@smtp12.dti.ne.jp> From: takasi-y@ops.dti.ne.jp To: qemu-devel@nongnu.org X-Mailer: Sylpheed 2.5.0 (GTK+ 2.18.6; x86_64-pc-linux-gnu) Mime-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Solaris 9 Cc: aurelien@aurel32.net, rth@twiddle.net Subject: [Qemu-devel] [PATCH] linux-user: rlimit conversion between host and target. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org rlim_t conversion between host and target added. Otherwise there are some incorrect case like - RLIM_INFINITY on 32bit target -> 64bit host. - RLIM_INFINITY on 64bit host -> mips and sparc target ? - Big value(for 32bit target) on 64bit host -> 32bit target. One is added into getrlimit, setrlimit, and ugetrlimit. It converts both RLIM_INFINITY and value bigger than target can hold(>31bit) to RLIM_INFINITY. Another one is added to guest_stack_size calculation introduced by 703e0e89. The rule is mostly same except the result on the case is keeping the value of guest_stack_size. Slightly tested for SH4, and x86_64 -linux-user on x86_64-pc-linux host. Signed-off-by: Takashi YOSHII Acked-by: Richard Henderson --- linux-user/main.c | 3 ++- linux-user/syscall.c | 30 ++++++++++++++++++++++-------- linux-user/syscall_defs.h | 8 ++++++++ 3 files changed, 32 insertions(+), 9 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index b394c00..60eea3a 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2645,7 +2645,8 @@ int main(int argc, char **argv, char **envp) { struct rlimit lim; if (getrlimit(RLIMIT_STACK, &lim) == 0 - && lim.rlim_cur != RLIM_INFINITY) { + && lim.rlim_cur != RLIM_INFINITY + && lim.rlim_cur == (target_long)lim.rlim_cur) { guest_stack_size = lim.rlim_cur; } } diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a03e432..cfc91d1 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -831,6 +831,22 @@ static inline abi_long host_to_target_rusage(abi_ulong target_addr, return 0; } +static inline rlim_t target_to_host_rlim(target_ulong target_rlim) +{ + if (target_rlim == TARGET_RLIM_INFINITY) + return RLIM_INFINITY; + else + return tswapl(target_rlim); +} + +static inline target_ulong host_to_target_rlim(rlim_t rlim) +{ + if (rlim == RLIM_INFINITY || rlim != (target_long)rlim) + return TARGET_RLIM_INFINITY; + else + return tswapl(rlim); +} + static inline abi_long copy_from_user_timeval(struct timeval *tv, abi_ulong target_tv_addr) { @@ -5124,21 +5140,19 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, break; case TARGET_NR_setrlimit: { - /* XXX: convert resource ? */ int resource = arg1; struct target_rlimit *target_rlim; struct rlimit rlim; if (!lock_user_struct(VERIFY_READ, target_rlim, arg2, 1)) goto efault; - rlim.rlim_cur = tswapl(target_rlim->rlim_cur); - rlim.rlim_max = tswapl(target_rlim->rlim_max); + rlim.rlim_cur = target_to_host_rlim(target_rlim->rlim_cur); + rlim.rlim_max = target_to_host_rlim(target_rlim->rlim_max); unlock_user_struct(target_rlim, arg2, 0); ret = get_errno(setrlimit(resource, &rlim)); } break; case TARGET_NR_getrlimit: { - /* XXX: convert resource ? */ int resource = arg1; struct target_rlimit *target_rlim; struct rlimit rlim; @@ -5147,8 +5161,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, if (!is_error(ret)) { if (!lock_user_struct(VERIFY_WRITE, target_rlim, arg2, 0)) goto efault; - target_rlim->rlim_cur = tswapl(rlim.rlim_cur); - target_rlim->rlim_max = tswapl(rlim.rlim_max); + target_rlim->rlim_cur = host_to_target_rlim(rlim.rlim_cur); + target_rlim->rlim_max = host_to_target_rlim(rlim.rlim_max); unlock_user_struct(target_rlim, arg2, 1); } } @@ -6233,8 +6247,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, struct target_rlimit *target_rlim; if (!lock_user_struct(VERIFY_WRITE, target_rlim, arg2, 0)) goto efault; - target_rlim->rlim_cur = tswapl(rlim.rlim_cur); - target_rlim->rlim_max = tswapl(rlim.rlim_max); + target_rlim->rlim_cur = host_to_target_rlim(rlim.rlim_cur); + target_rlim->rlim_max = host_to_target_rlim(rlim.rlim_max); unlock_user_struct(target_rlim, arg2, 1); } break; diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 63c2bc3..255e89c 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -669,6 +669,14 @@ struct target_rlimit { abi_ulong rlim_max; }; +#if defined(TARGET_ALPHA) +#define TARGET_RLIM_INFINITY 0x7ffffffffffffffful +#elif defined(TARGET_MIPS) || defined(TARGET_SPARC) +#define TARGET_RLIM_INFINITY 0x7fffffffUL +#else +#define TARGET_RLIM_INFINITY ((target_ulong)~0UL) +#endif + struct target_pollfd { int fd; /* file descriptor */ short events; /* requested events */