Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756849AbZDXCUv (ORCPT ); Thu, 23 Apr 2009 22:20:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754571AbZDXCUl (ORCPT ); Thu, 23 Apr 2009 22:20:41 -0400 Received: from mx2.redhat.com ([66.187.237.31]:40070 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753557AbZDXCUk (ORCPT ); Thu, 23 Apr 2009 22:20:40 -0400 Message-ID: <49F12226.3070108@redhat.com> Date: Thu, 23 Apr 2009 22:21:26 -0400 From: Masami Hiramatsu User-Agent: Thunderbird 2.0.0.21 (X11/20090320) MIME-Version: 1.0 To: "Luck, Tony" , Anil S Keshavamurthy CC: LKML , ia64 , Roland McGrath , David Smith , systemtap-ml Subject: Re: [PATCH][BUGFIX] utrace/ia64: Fix syscall_get_set_args_cb() to handle syscalls via syscall() References: <49EFA4DA.9020402@redhat.com> In-Reply-To: <49EFA4DA.9020402@redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3313 Lines: 95 Hi, Actually, this patch is not only for utrace, but also fixing /proc/pid/syscall. I made a small program which reads /proc/pid/syscall via both of read() and syscall(). Without this patch: --- read() read: 1026 0x3 0x60000fffffcb75e8 0x100 0x60000fffffcb7700 0x0 0x20000000000b03f0 0x600007ffffcbc020 0xa000000000010721 syscall() read: 1026 0x402 0x3 0x60000fffffcb75e8 0x100 0x2a8 0x0 0x600007ffffcbc048 0x2000000000209730 --- You can see "0x402"(1026) appeared at syscall() read result. With this patch: --- read() read: 1026 0x3 0x60000fffff8a35c8 0x100 0x60000fffff8a36e0 0x0 0x20000000000b03f0 0x600007ffff8a8020 0xa000000000010721 syscall() read: 1026 0x3 0x60000fffff8a35c8 0x100 0x2a8 0x0 0x4 0x600007ffff8a8048 0x2000000000209730 --- Here, you can see that "0x402" disappeared from syscall() case. Thank you, Masami Hiramatsu wrote: > Fix syscall_get_set_args_cb() to decode user-stack correctly in case of > syscall() which allocates locals in user-stack. If locals (cfm.sol) exist > on the stack, we have to skip it for getting real systemcall arguments. > > And also, fix the number of getting arguments which must be less than > (nr outputs - args->i) instead of nr outputs, because args->i is the > indent number (this means, syscall_get_set_args_cb() get/set arguments > from (i)th to (i+n)th.) > > Signed-off-by: Masami Hiramatsu > Cc: Anil S Keshavamurthy > Cc: Roland McGrath > Cc: David Smith > --- > arch/ia64/kernel/ptrace.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > Index: 2.6-rc/arch/ia64/kernel/ptrace.c > =================================================================== > --- 2.6-rc.orig/arch/ia64/kernel/ptrace.c > +++ 2.6-rc/arch/ia64/kernel/ptrace.c > @@ -2189,6 +2189,10 @@ struct syscall_get_set_args { > int rw; > }; > > +#define CFM_SOF(cfm) ((cfm) & 0x7f) /* Size of frame */ > +#define CFM_SOL(cfm) (((cfm) >> 7) & 0x7f) /* Size of locals */ > +#define CFM_OUT(cfm) (CFM_SOF(cfm) - CFM_SOL(cfm)) /* Size of outputs */ > + > static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data) > { > struct syscall_get_set_args *args = data; > @@ -2205,15 +2209,18 @@ static void syscall_get_set_args_cb(stru > > count = 0; > if (in_syscall(pt)) > - count = min_t(int, args->n, cfm & 0x7f); > + /* args->i + args->n must be less equal than nr outputs */ > + count = min_t(int, args->n, CFM_OUT(cfm) - args->i); > > for (i = 0; i < count; i++) { > + /* Skips dirties and locals */ > if (args->rw) > - *ia64_rse_skip_regs(krbs, ndirty + i + args->i) = > + *ia64_rse_skip_regs(krbs, > + ndirty + CFM_SOL(cfm) + args->i + i) = > args->args[i]; > else > args->args[i] = *ia64_rse_skip_regs(krbs, > - ndirty + i + args->i); > + ndirty + CFM_SOL(cfm) + args->i + i); > } > > if (!args->rw) { -- Masami Hiramatsu Software Engineer Hitachi Computer Products (America) Inc. Software Solutions Division e-mail: mhiramat@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/