sycalls: Remove args i and n from syscall_get_arguments()
Subsystems (25)
Steven Rostedt
maintainerv3 cover sycalls: Remove args i and n from syscall_get_arguments()
[ Looking for acks ]
Two and a half years ago I sent out 3 patches and a title letter that had this[1]:
At Linux Plumbers, Andy Lutomirski approached me to tell me that the syscall_get_arguments() implementation in x86 was horrible and gcc certainly gets it wrong. He said that since the tracepoints only pass in 0 and 6 for i and n repectively, it should be optimized for that case. Inspecting the kernel, I discovered that all users pass in 0 for i and only one file passing in something other than 6 for the number of arguments. That code happens to be my own code used for the special syscall tracing. That can easily be converted to just using 0 and 6 as well, and only copying what is needed. Which is probably the faster path anyway for that case.
I haven't run the numbers (I can do that when I get some time), but since pretty much all use cases use 0 and 6 and that would allow these functions not to need strange logic to handle odd cases, I think this is still a win.
It received positive comments but also Linus asked to remove the separate arg pointers and replace them with a single structure and fill that instead. But for some reason, this got pushed aside and forgotten (probably, had to do with the fact that I left Red Hat shortly after this).
Recently, it was brought back up again[2] and I decided to dust off these patches and resubmit them. I also added one more patch to do the same for syscall_set_arguments() that I did for syscall_get_arguments() even though syscall_set_arguments() currently (and never has) had any callers. But we are told that in the near future it may have one.
The changes do optimize the logic a little, but for most archs I just kept the same logic (loops and such) as I don't have a way to test it, and didn't want to break the logic.
I added a new struct syscall_info that holds seccomp_data and also includes a stack pointer (sp) field. I would change seccomp_data, but because its in include/uapi/linux/seccomp.h I didn't want to touch it and break userspace. Perhaps we could add the field at the end, but I didn't want to chance it (unless others say its OK).
I ran these through zero-day-bot and compiled tested these changes for all architectures except for csky which I do not have a cross compiler for.
Note the following archs fail normal builds, but they fail the same with these patches:
arc
h8300
parisc64
Note, you may notice that I have "(Red Hat)" as the author of the first three patches (even though they are signed off by "(VMware)"). This is because those patches were originally written while I was working for Red Hat. But as I forward ported them while working for VMware, my signed-off-by reflects that.
[1] - https://lore.kernel.org/lkml/[email protected]/T/#u
[2] - https://lore.kernel.org/lkml/[email protected]/T/#u
Changes since v2:
- Added Dmitry's two patches to fix riscv and csky
- Rebased to handle the two new patches
Dmitry V. Levin (2):
riscv: Fix syscall_get_arguments() and syscall_set_arguments()
csky: Fix syscall_get_arguments() and syscall_set_arguments()
Steven Rostedt (Red Hat) (3):
ptrace: Remove maxargs from task_current_syscall() tracing/syscalls: Pass in hardcoded 6 into syscall_get_arguments()
syscalls: Remove start and number from syscall_get_arguments() args
Steven Rostedt (VMware) (1):
syscalls: Remove start and number from syscall_set_arguments() args
----
arch/arc/include/asm/syscall.h | 7 +- arch/arm/include/asm/syscall.h | 47 ++--------- arch/arm64/include/asm/syscall.h | 46 ++--------- arch/c6x/include/asm/syscall.h | 79 ++++--------------- arch/csky/include/asm/syscall.h | 26 ++----- arch/h8300/include/asm/syscall.h | 34 ++------ arch/hexagon/include/asm/syscall.h | 4 +- arch/ia64/include/asm/syscall.h | 13 +--- arch/ia64/kernel/ptrace.c | 7 +- arch/microblaze/include/asm/syscall.h | 8 +- arch/mips/include/asm/syscall.h | 3 +- arch/mips/kernel/ptrace.c | 2 +- arch/nds32/include/asm/syscall.h | 62 +++------------ arch/nios2/include/asm/syscall.h | 84 ++++---------------- arch/openrisc/include/asm/syscall.h | 12 +-- arch/parisc/include/asm/syscall.h | 30 ++----- arch/powerpc/include/asm/syscall.h | 15 ++-- arch/riscv/include/asm/syscall.h | 24 ++---- arch/s390/include/asm/syscall.h | 28 +++---- arch/sh/include/asm/syscall_32.h | 47 +++-------- arch/sh/include/asm/syscall_64.h | 8 +- arch/sparc/include/asm/syscall.h | 11 ++- arch/um/include/asm/syscall-generic.h | 78 +++---------------- arch/x86/include/asm/syscall.h | 142 ++++++++-------------------------- arch/xtensa/include/asm/syscall.h | 33 ++------ fs/proc/base.c | 17 ++-- include/asm-generic/syscall.h | 21 ++--- include/linux/ptrace.h | 11 ++- include/trace/events/syscalls.h | 2 +- kernel/seccomp.c | 2 +- kernel/trace/trace_syscalls.c | 9 ++- lib/syscall.c | 57 ++++++-------- 32 files changed, 247 insertions(+), 722 deletions(-)
Steven Rostedt
maintainerPATCH v3 1/6 ptrace: Remove maxargs from task_current_syscall()
From: "Steven Rostedt (Red Hat)" <[email protected]>
task_current_syscall() has a single user that passes in 6 for maxargs, which is the maximum arguments that can be used to get system calls from syscall_get_arguments(). Instead of passing in a number of arguments to grab, just get 6 arguments. The args argument even specifies that it's an array of 6 items.
This will also allow changing syscall_get_arguments() to not get a variable number of arguments, but always grab 6.
Linus also suggested not passing in a bunch of arguments to task_current_syscall() but to instead pass in a pointer to a structure, and just fill the structure. struct seccomp_data has almost all the parameters that is needed except for the stack pointer (sp). As seccomp_data is part of uapi, and I'm afraid to change it, a new structure was created "syscall_info", which includes seccomp_data and adds the "sp" field.
--- fs/proc/base.c | 17 +++++++------ include/linux/ptrace.h | 11 +++++--- lib/syscall.c | 57 ++++++++++++++++++------------------------ 3 files changed, 42 insertions(+), 43 deletions(-)
fs/proc/base.c +9 -8
@@ -616,24 +616,25 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,static int proc_pid_syscall (struct seq_file *m,struct pid_namespace *ns,struct pid *pid,struct task_struct *task) { -long nr; -unsigned long args[6 ], sp, pc; +struct syscall_info info; +u64 *args = &info.data.args[0 ];int res; res =lock_trace (task);if (res)return res; -if (task_current_syscall (task, &nr, args,6 , &sp, &pc)) +if (task_current_syscall (task, &info))seq_puts (m,"running\n" ); -else if (nr <0 ) -seq_printf (m,"%ld 0x%lx 0x%lx\n" , nr, sp, pc); +else if (info.data.nr <0 ) +seq_printf (m,"%d 0x%llx 0x%llx\n" , + info.data.nr, info.sp, info.data.instruction_pointer);else seq_printf (m, -"%ld 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n" , - nr, +"%d 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx 0x%llx\n" , + info.data.nr, args[0 ], args[1 ], args[2 ], args[3 ], args[4 ], args[5 ], - sp, pc); + info.sp, info.data.instruction_pointer);unlock_trace (task);return 0 ;
include/linux/ptrace.h +8 -3
@@ -9,6 +9,13 @@#include <linux/bug.h> /* For BUG_ON. */ #include <linux/pid_namespace.h> /* For task_active_pid_ns. */ #include <uapi/linux/ptrace.h> +#include <linux/seccomp.h> + +/* Add sp to seccomp_data, as seccomp is user API, we don't want to modify it */ +struct syscall_info { +__u64 sp; +struct seccomp_data data; +};extern int ptrace_access_vm (struct task_struct *tsk,unsigned long addr,void *buf,int len,unsigned int gup_flags);
@@ -407,9 +414,7 @@ static inline void user_single_step_report(struct pt_regs *regs)#define current_user_stack_pointer () user_stack_pointer(current_pt_regs())#endif -extern int task_current_syscall (struct task_struct *target,long *callno, -unsigned long args[6 ],unsigned int maxargs, -unsigned long *sp,unsigned long *pc); +extern int task_current_syscall (struct task_struct *target,struct syscall_info *info);extern void sigaction_compat_abi (struct k_sigaction *act,struct k_sigaction *oact);#endif
lib/syscall.c +25 -32
101 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH 1/6 v3] ptrace: Remove maxargs from task_current_syscall()
Quoted 20 lines · Steven Rostedt
From: "Steven Rostedt (Red Hat)" <[email protected]>
task_current_syscall()has a single user that passes in 6 for maxargs, which is the maximum arguments that can be used to get system calls fromsyscall_get_arguments(). Instead of passing in a number of arguments to grab, just get 6 arguments. The args argument even specifies that it's an array of 6 items.This will also allow changing
syscall_get_arguments()to not get a variable number of arguments, but always grab 6.Linus also suggested not passing in a bunch of arguments to
task_current_syscall()but to instead pass in a pointer to a structure, and just fill the structure. structseccomp_datahas almost all the parameters that is needed except for the stack pointer (sp). Asseccomp_datais part of uapi, and I'm afraid to change it, a new structure was created "syscall_info", which includesseccomp_dataand adds the "sp" field.
Quoted 8 lines
Cc Thomas Gleixner <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Alexey Dobriyan <[email protected]>Cc Oleg Nesterov <[email protected]>Cc Kees Cook <[email protected]>Cc Al Viro <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>
Steven Rostedt
maintainerPATCH v3 2/6 tracing/syscalls: Pass in hardcoded 6 into syscall_get_arguments()
In reply to Steven RostedtFrom: "Steven Rostedt (Red Hat)" <[email protected]>
The only users that calls syscall_get_arguments() with a variable and not a hard coded '6' is ftrace_syscall_enter(). syscall_get_arguments() can be optimized by removing a variable input, and always grabbing 6 arguments regardless of what the system call actually uses.
Change ftrace_syscall_enter() to pass the 6 args into a local stack array and copy the necessary arguments into the trace event as needed.
This is needed to remove two parameters from syscall_get_arguments().
--- kernel/trace/trace_syscalls.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
kernel/trace/trace_syscalls.c +6 -3
@@ -314,6 +314,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id)struct ring_buffer_event *event;struct ring_buffer *buffer;unsigned long irq_flags; +unsigned long args[6 ];int pc;int syscall_nr;int size;
@@ -347,7 +348,8 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) entry =ring_buffer_event_data (event); entry->nr = syscall_nr; -syscall_get_arguments (current, regs,0 , sys_data->nb_args, entry->args); +syscall_get_arguments (current, regs,0 ,6 , args); +memcpy (entry->args, args,sizeof (unsigned long ) * sys_data->nb_args);event_trigger_unlock_commit (trace_file, buffer, event, entry, irq_flags, pc);
@@ -583,6 +585,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)struct syscall_metadata *sys_data;struct syscall_trace_enter *rec;struct hlist_head *head; +unsigned long args[6 ];bool valid_prog_array;int syscall_nr;int rctx;
@@ -613,8 +616,8 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)return ; rec->nr = syscall_nr; -syscall_get_arguments (current, regs,0 , sys_data->nb_args, - (unsigned long *)&rec->args); +syscall_get_arguments (current, regs,0 ,6 , args); +memcpy (&rec->args, args,sizeof (unsigned long ) * sys_data->nb_args); if ((valid_prog_array && !perf_call_bpf_enter(sys_data->enter_event, regs, sys_data, rec)) ||
Signature · 1 line
2.20.1
Steven Rostedt
maintainerPATCH v3 3/6 riscv: Fix syscall_get_arguments() and syscall_set_arguments()
In reply to Steven RostedtFrom: "Dmitry V. Levin" <[email protected]>
RISC-V syscall arguments are located in orig_a0,a1..a5 fields of struct pt_regs.
Due to an off-by-one bug and a bug in pointer arithmetic syscall_get_arguments() was reading s3..s7 fields instead of a1..a5. Likewise, syscall_set_arguments() was writing s3..s7 fields instead of a1..a5.
--- arch/riscv/include/asm/syscall.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
arch/riscv/include/asm/syscall.h +7 -5
@@ -79,10 +79,11 @@ static inline void syscall_get_arguments(struct task_struct *task,if (i ==0 ) { args[0 ] = regs->orig_a0; args++; - i++; n--; + }else { + i--; } -memcpy (args, ®s->a1 + i *sizeof (regs->a1), n *sizeof (args[0 ])); +memcpy (args, ®s->a1 + i, n *sizeof (args[0 ])); } static inline void syscall_set_arguments(struct task_struct *task,
@@ -94,10 +95,11 @@ static inline void syscall_set_arguments(struct task_struct *task,if (i ==0 ) { regs->orig_a0 = args[0 ]; args++; - i++; n--; - } -memcpy (®s->a1 + i *sizeof (regs->a1), args, n *sizeof (regs->a0)); + }else { + i--; + } +memcpy (®s->a1 + i, args, n *sizeof (regs->a1)); }static inline int syscall_get_arch (void )
Signature · 1 line
2.20.1
Re: [PATCH 3/6 v3] riscv: Fix syscall_get_arguments() and syscall_set_arguments()
Quoted 12 lines · Steven Rostedt
From: "Dmitry V. Levin" <[email protected]>
RISC-V syscall arguments are located in orig_a0,a1..a5 fields of struct
pt_regs.Due to an off-by-one bug and a bug in pointer arithmetic
syscall_get_arguments()was reading s3..s7 fields instead of a1..a5. Likewise,syscall_set_arguments()was writing s3..s7 fields instead of a1..a5.
Quoted 11 lines
Fixes e2c0cdfba7f69 ("RISC-V: User-facing API")Cc Ingo Molnar <[email protected]>Cc Kees Cook <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Will Drewry <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Cc [email protected] # v4.15+Signed-off-by Dmitry V. Levin <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>
According to
https://lore.kernel.org/lkml/mhng-8e9b547b-7fe3-43d2-9dea-b217de923605@palmer-si-x1c4/
the following tag could be added to this patch:
Signature · 1 line
ldv
Steven Rostedt
maintainerRe: [PATCH 3/6 v3] riscv: Fix syscall_get_arguments() and syscall_set_arguments()
Quoted 25 lines · On Thu, 4 Apr 2019 17:02:10 +0300 "Dmitry V. Levin" <[email protected]> wrote:
Quoted 12 lines · Steven Rostedt
From: "Dmitry V. Levin" <[email protected]>
RISC-V syscall arguments are located in orig_a0,a1..a5 fields of struct
pt_regs.Due to an off-by-one bug and a bug in pointer arithmetic
syscall_get_arguments()was reading s3..s7 fields instead of a1..a5. Likewise,syscall_set_arguments()was writing s3..s7 fields instead of a1..a5.Quoted 11 lines
Fixes e2c0cdfba7f69 ("RISC-V: User-facing API")Cc Ingo Molnar <[email protected]>Cc Kees Cook <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Will Drewry <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Cc [email protected] # v4.15+Signed-off-by Dmitry V. Levin <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>
Quoted 5 lines
According to
https://lore.kernel.org/lkml/mhng-8e9b547b-7fe3-43d2-9dea-b217de923605@palmer-si-x1c4/
the following tag could be added to this patch:Acked-by Palmer Dabbelt <[email protected]>
That link isn't actually an ack. Palmer, you OK if I add it?
-- Steve
Palmer Dabbelt
Acked-byRe: [PATCH 3/6 v3] riscv: Fix syscall_get_arguments() and syscall_set_arguments()
Quoted 28 lines · On Thu, 04 Apr 2019 07:26:53 PDT (-0700), [email protected] wrote:
Quoted 25 lines · On Thu, 4 Apr 2019 17:02:10 +0300 "Dmitry V. Levin" <[email protected]> wrote:
Quoted 23 lines · Steven Rostedt
From: "Dmitry V. Levin" <[email protected]>
RISC-V syscall arguments are located in orig_a0,a1..a5 fields of struct
pt_regs.Due to an off-by-one bug and a bug in pointer arithmetic
syscall_get_arguments()was reading s3..s7 fields instead of a1..a5. Likewise,syscall_set_arguments()was writing s3..s7 fields instead of a1..a5.Fixes e2c0cdfba7f69 ("RISC-V: User-facing API")Cc Ingo Molnar <[email protected]>Cc Kees Cook <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Will Drewry <[email protected]>Cc Palmer Dabbelt <[email protected]>Cc Albert Ou <[email protected]>Cc [email protected] # v4.15+Signed-off-by Dmitry V. Levin <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>
Quoted 7 lines
Quoted 5 lines
According to
https://lore.kernel.org/lkml/mhng-8e9b547b-7fe3-43d2-9dea-b217de923605@palmer-si-x1c4/
the following tag could be added to this patch:Acked-by Palmer Dabbelt <[email protected]>That link isn't actually an ack. Palmer, you OK if I add it?
Thanks!
Steven Rostedt
maintainerPATCH v3 4/6 csky: Fix syscall_get_arguments() and syscall_set_arguments()
In reply to Steven RostedtFrom: "Dmitry V. Levin" <[email protected]>
C-SKY syscall arguments are located in orig_a0,a1,a2,a3,regs[0],regs[1] fields of struct pt_regs.
Due to an off-by-one bug and a bug in pointer arithmetic syscall_get_arguments() was reading orig_a0,regs[1..5] fields instead. Likewise, syscall_set_arguments() was writing orig_a0,regs[1..5] fields instead.
--- arch/csky/include/asm/syscall.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/csky/include/asm/syscall.h +6 -4
@@ -49,10 +49,11 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,if (i ==0 ) { args[0 ] = regs->orig_a0; args++; - i++; n--; + }else { + i--; } -memcpy (args, ®s->a1 + i *sizeof (regs->a1), n *sizeof (args[0 ])); +memcpy (args, ®s->a1 + i, n *sizeof (args[0 ])); } static inline void
@@ -63,10 +64,11 @@ syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,if (i ==0 ) { regs->orig_a0 = args[0 ]; args++; - i++; n--; + }else { + i--; } -memcpy (®s->a1 + i *sizeof (regs->a1), args, n *sizeof (regs->a0)); +memcpy (®s->a1 + i, args, n *sizeof (regs->a1)); } static inline int
Signature · 1 line
2.20.1
Re: [PATCH 4/6 v3] csky: Fix syscall_get_arguments() and syscall_set_arguments()
Quoted 12 lines · Steven Rostedt
From: "Dmitry V. Levin" <[email protected]>
C-SKY syscall arguments are located in orig_a0,a1,a2,a3,regs[0],regs[1] fields of struct
pt_regs.Due to an off-by-one bug and a bug in pointer arithmetic
syscall_get_arguments()was reading orig_a0,regs[1..5] fields instead. Likewise,syscall_set_arguments()was writing orig_a0,regs[1..5] fields instead.
Quoted 9 lines
Fixes 4859bfca11c7d ("csky: System Call")Cc Ingo Molnar <[email protected]>Cc Kees Cook <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Will Drewry <[email protected]>Cc Guo Ren <[email protected]>Cc [email protected] # v4.20+Signed-off-by Dmitry V. Levin <[email protected]>Signed-off-by Steven Rostedt (VMware) <[email protected]>
According to
https://lore.kernel.org/lkml/20190330004949.GA15705@guoren-Inspiron-7460/
the following tags could be added to this patch:
Signature · 1 line
ldv
Steven Rostedt
maintainerRe: [PATCH 4/6 v3] csky: Fix syscall_get_arguments() and syscall_set_arguments()
Quoted 6 lines · On Thu, 4 Apr 2019 17:02:01 +0300 "Dmitry V. Levin" <[email protected]> wrote:
According to
https://lore.kernel.org/lkml/20190330004949.GA15705@guoren-Inspiron-7460/
the following tags could be added to this patch:Tested-by Guo Ren <[email protected]>Acked-by Guo Ren <[email protected]>
Thanks! Added.
-- Steve
Steven Rostedt
maintainerPATCH v3 5/6 syscalls: Remove start and number from syscall_get_arguments() args
In reply to Steven RostedtFrom: "Steven Rostedt (Red Hat)" <[email protected]>
At Linux Plumbers, Andy Lutomirski approached me and pointed out that the function call syscall_get_arguments() implemented in x86 was horribly written and not optimized for the standard case of passing in 0 and 6 for the starting index and the number of system calls to get. When looking at all the users of this function, I discovered that all instances pass in only 0 and 6 for these arguments. Instead of having this function handle different cases that are never used, simply rewrite it to return the first 6 arguments of a system call.
This should help out the performance of tracing system calls by ptrace, ftrace and perf.
--- arch/arc/include/asm/syscall.h | 7 ++- arch/arm/include/asm/syscall.h | 23 ++------- arch/arm64/include/asm/syscall.h | 22 ++------ arch/c6x/include/asm/syscall.h | 41 +++------------ arch/csky/include/asm/syscall.h | 14 ++--- arch/h8300/include/asm/syscall.h | 34 +++---------- arch/hexagon/include/asm/syscall.h | 4 +- arch/ia64/include/asm/syscall.h | 5 +- arch/microblaze/include/asm/syscall.h | 4 +- arch/mips/include/asm/syscall.h | 3 +- arch/mips/kernel/ptrace.c | 2 +- arch/nds32/include/asm/syscall.h | 33 +++--------- arch/nios2/include/asm/syscall.h | 42 +++------------ arch/openrisc/include/asm/syscall.h | 6 +-- arch/parisc/include/asm/syscall.h | 30 +++-------- arch/powerpc/include/asm/syscall.h | 8 ++- arch/riscv/include/asm/syscall.h | 13 ++--- arch/s390/include/asm/syscall.h | 17 ++----- arch/sh/include/asm/syscall_32.h | 26 +++------- arch/sh/include/asm/syscall_64.h | 4 +- arch/sparc/include/asm/syscall.h | 4 +- arch/um/include/asm/syscall-generic.h | 39 +++----------- arch/x86/include/asm/syscall.h | 73 +++++++-------------------- arch/xtensa/include/asm/syscall.h | 16 ++---- include/asm-generic/syscall.h | 11 ++-- include/trace/events/syscalls.h | 2 +- kernel/seccomp.c | 2 +- kernel/trace/trace_syscalls.c | 4 +- lib/syscall.c | 2 +- 29 files changed, 113 insertions(+), 378 deletions(-)
arch/arc/include/asm/syscall.h +3 -4
@@ -55,12 +55,11 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,*/ static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) +unsigned long *args) {unsigned long *inside_ptregs = &(regs->r0); - inside_ptregs -= i; - -BUG_ON ((i + n) >6 ); +unsigned int n =6 ; +unsigned int i =0 ;while (n--) { args[i++] = (*inside_ptregs);
arch/arm/include/asm/syscall.h +3 -20
@@ -55,29 +55,12 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -if (n ==0 ) -return ; - -if (i + n >SYSCALL_MAX_ARGS ) { -unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i; -unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ; -pr_warn ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); -memset (args_bad,0 , n_bad *sizeof (args[0 ])); - n =SYSCALL_MAX_ARGS - i; - } - -if (i ==0 ) { - args[0 ] = regs->ARM_ORIG_r0; - args++; - i++; - n--; - } + args[0 ] = regs->ARM_ORIG_r0; + args++; -memcpy (args, ®s->ARM_r0 + i, n *sizeof (args[0 ])); +memcpy (args, ®s->ARM_r0 +1 ,5 *sizeof (args[0 ])); } static inline void syscall_set_arguments(struct task_struct *task,
arch/arm64/include/asm/syscall.h +3 -19
@@ -65,28 +65,12 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -if (n ==0 ) -return ; - -if (i + n >SYSCALL_MAX_ARGS ) { -unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i; -unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ; -pr_warning ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); -memset (args_bad,0 , n_bad *sizeof (args[0 ])); - } - -if (i ==0 ) { - args[0 ] = regs->orig_x0; - args++; - i++; - n--; - } + args[0 ] = regs->orig_x0; + args++; -memcpy (args, ®s->regs[i], n *sizeof (args[0 ])); +memcpy (args, ®s->regs[1 ],5 *sizeof (args[0 ])); } static inline void syscall_set_arguments(struct task_struct *task,
arch/c6x/include/asm/syscall.h +8 -33
48 lines not on this page · raw message
arch/csky/include/asm/syscall.h +4 -10
@@ -43,17 +43,11 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) +unsigned long *args) { -BUG_ON (i + n >6 ); -if (i ==0 ) { - args[0 ] = regs->orig_a0; - args++; - n--; - }else { - i--; - } -memcpy (args, ®s->a1 + i, n *sizeof (args[0 ])); + args[0 ] = regs->orig_a0; + args++; +memcpy (args, ®s->a1,5 *sizeof (args[0 ])); } static inline void
arch/h8300/include/asm/syscall.h +7 -27
@@ -17,34 +17,14 @@ syscall_get_nr(struct task_struct *task, struct pt_regs *regs)static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) +unsigned long *args) { -BUG_ON (i + n >6 ); - -while (n >0 ) { -switch (i) { -case 0 : - *args++ = regs->er1; -break ; -case 1 : - *args++ = regs->er2; -break ; -case 2 : - *args++ = regs->er3; -break ; -case 3 : - *args++ = regs->er4; -break ; -case 4 : - *args++ = regs->er5; -break ; -case 5 : - *args++ = regs->er6; -break ; - } - i++; - n--; - } + *args++ = regs->er1; + *args++ = regs->er2; + *args++ = regs->er3; + *args++ = regs->er4; + *args++ = regs->er5; + *args = regs->er6; }
arch/hexagon/include/asm/syscall.h +1 -3
@@ -37,10 +37,8 @@ static inline long syscall_get_nr(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -BUG_ON (i + n >6 ); -memcpy (args, &(®s->r00)[i], n *sizeof (args[0 ])); +memcpy (args, &(®s->r00)[0 ],6 *sizeof (args[0 ])); }#endif
arch/ia64/include/asm/syscall.h +1 -4
@@ -63,12 +63,9 @@ extern void ia64_syscall_get_set_arguments(struct task_struct *task, unsigned long *args, int rw);static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -BUG_ON (i + n >6 ); - -ia64_syscall_get_set_arguments (task, regs, i, n, args,0 ); +ia64_syscall_get_set_arguments (task, regs,0 ,6 , args,0 ); } static inline void syscall_set_arguments(struct task_struct *task,
arch/microblaze/include/asm/syscall.h +3 -1
@@ -82,9 +82,11 @@ static inline void microblaze_set_syscall_arg(struct pt_regs *regs,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { +unsigned int i =0 ; +unsigned int n =6 ; +while (n--) *args++ =microblaze_get_syscall_arg (regs, i++); }
arch/mips/include/asm/syscall.h +2 -1
@@ -116,9 +116,10 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { +unsigned int i =0 ; +unsigned int n =6 ;int ret;/* O32 ABI syscall() */
arch/mips/kernel/ptrace.c +1 -1
@@ -1419,7 +1419,7 @@ asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall) sd.nr = syscall; sd.arch =syscall_get_arch (); -syscall_get_arguments (current, regs,0 ,6 , args); +syscall_get_arguments (current, regs, args);for (i =0 ; i <6 ; i++) sd.args[i] = args[i]; sd.instruction_pointer =KSTK_EIP (current);
arch/nds32/include/asm/syscall.h +6 -27
@@ -108,42 +108,21 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,* syscall_get_arguments - extract system call parameter values * @task: task of interest, must be blocked * @regs: task_pt_regs() of @task -* @i: argument index [0,5] -* @n: number of arguments; n+i must be [1,6]. * @args: array filled with argument values * -* Fetches @n arguments to the system call starting with the @i'th argument -* (from 0 through 5). Argument @i is stored in @args[0], and so on. -* An arch inline version is probably optimal when @i and @n are constants. +* Fetches 6 arguments to the system call (from 0 through 5). The first +* argument is stored in @args[0], and so on. * * It's only valid to call this when @task is stopped for tracing on * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -* It's invalid to call this with @i + @n > 6; we only support system calls -* taking up to 6 arguments. */ #define SYSCALL_MAX_ARGS 6void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) +unsigned long *args) { -if (n ==0 ) -return ; -if (i + n >SYSCALL_MAX_ARGS ) { -unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i; -unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ; -pr_warning ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); -memset (args_bad,0 , n_bad *sizeof (args[0 ])); -memset (args_bad,0 , n_bad *sizeof (args[0 ])); - } - -if (i ==0 ) { - args[0 ] = regs->orig_r0; - args++; - i++; - n--; - } - -memcpy (args, ®s->uregs[0 ] + i, n *sizeof (args[0 ])); + args[0 ] = regs->orig_r0; + args++; +memcpy (args, ®s->uregs[0 ] +1 ,5 *sizeof (args[0 ])); }/**
arch/nios2/include/asm/syscall.h +7 -35
49 lines not on this page · raw message
arch/openrisc/include/asm/syscall.h +2 -4
@@ -56,11 +56,9 @@ syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) +unsigned long *args) { -BUG_ON (i + n >6 ); - -memcpy (args, ®s->gpr[3 + i], n *sizeof (args[0 ])); +memcpy (args, ®s->gpr[3 ],6 *sizeof (args[0 ])); } static inline void
arch/parisc/include/asm/syscall.h +8 -22
@@ -18,29 +18,15 @@ static inline long syscall_get_nr(struct task_struct *tsk, }static inline void syscall_get_arguments (struct task_struct *tsk, -struct pt_regs *regs,unsigned int i, -unsigned int n,unsigned long *args) +struct pt_regs *regs, +unsigned long *args) { -BUG_ON (i); - -switch (n) { -case 6 : - args[5 ] = regs->gr[21 ]; -case 5 : - args[4 ] = regs->gr[22 ]; -case 4 : - args[3 ] = regs->gr[23 ]; -case 3 : - args[2 ] = regs->gr[24 ]; -case 2 : - args[1 ] = regs->gr[25 ]; -case 1 : - args[0 ] = regs->gr[26 ]; -case 0 : -break ; -default : -BUG (); - } + args[5 ] = regs->gr[21 ]; + args[4 ] = regs->gr[22 ]; + args[3 ] = regs->gr[23 ]; + args[2 ] = regs->gr[24 ]; + args[1 ] = regs->gr[25 ]; + args[0 ] = regs->gr[26 ]; } static inline long syscall_get_return_value(struct task_struct *task,
arch/powerpc/include/asm/syscall.h +3 -5
@@ -65,22 +65,20 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {unsigned long val, mask =-1UL ; - -BUG_ON (i + n >6 ); +unsigned int n =6 ;#ifdef CONFIG_COMPAT if (test_tsk_thread_flag (task,TIF_32BIT )) mask =0xffffffff ;#endif while (n--) { -if (n ==0 && i ==0 ) +if (n ==0 ) val = regs->orig_gpr3;else - val = regs->gpr[3 + i + n]; + val = regs->gpr[3 + n]; args[n] = val & mask; }
arch/riscv/include/asm/syscall.h +3 -10
@@ -72,18 +72,11 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -BUG_ON (i + n >6 ); -if (i ==0 ) { - args[0 ] = regs->orig_a0; - args++; - n--; - }else { - i--; - } -memcpy (args, ®s->a1 + i, n *sizeof (args[0 ])); + args[0 ] = regs->orig_a0; + args++; +memcpy (args, ®s->a1,5 *sizeof (args[0 ])); } static inline void syscall_set_arguments(struct task_struct *task,
arch/s390/include/asm/syscall.h +5 -12
@@ -56,27 +56,20 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {unsigned long mask =-1UL ; +unsigned int n =6 ; -/* -* No arguments for this syscall, there's nothing to do. -*/ -if (!n) -return ; - -BUG_ON (i + n >6 );#ifdef CONFIG_COMPAT if (test_tsk_thread_flag (task,TIF_31BIT )) mask =0xffffffff ;#endif while (n-- >0 ) -if (i + n >0 ) - args[n] = regs->gprs[2 + i + n] & mask; -if (i ==0 ) - args[0 ] = regs->orig_gpr2 & mask; +if (n >0 ) + args[n] = regs->gprs[2 + n] & mask; + + args[0 ] = regs->orig_gpr2 & mask; } static inline void syscall_set_arguments(struct task_struct *task,
arch/sh/include/asm/syscall_32.h +6 -20
@@ -48,30 +48,16 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -/* -* Do this simply for now. If we need to start supporting -* fetching arguments from arbitrary indices, this will need some -* extra logic. Presently there are no in-tree users that depend -* on this behaviour. -*/ -BUG_ON (i);/* Argument pattern is: R4, R5, R6, R7, R0, R1 */ -switch (n) { -case 6 : args[5 ] = regs->regs[1 ]; -case 5 : args[4 ] = regs->regs[0 ]; -case 4 : args[3 ] = regs->regs[7 ]; -case 3 : args[2 ] = regs->regs[6 ]; -case 2 : args[1 ] = regs->regs[5 ]; -case 1 : args[0 ] = regs->regs[4 ]; -case 0 : -break ; -default : -BUG (); - } + args[5 ] = regs->regs[1 ]; + args[4 ] = regs->regs[0 ]; + args[3 ] = regs->regs[7 ]; + args[2 ] = regs->regs[6 ]; + args[1 ] = regs->regs[5 ]; + args[0 ] = regs->regs[4 ]; } static inline void syscall_set_arguments(struct task_struct *task,
arch/sh/include/asm/syscall_64.h +1 -3
@@ -47,11 +47,9 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -BUG_ON (i + n >6 ); -memcpy (args, ®s->regs[2 + i], n *sizeof (args[0 ])); +memcpy (args, ®s->regs[2 ],6 *sizeof (args[0 ])); } static inline void syscall_set_arguments(struct task_struct *task,
arch/sparc/include/asm/syscall.h +2 -2
@@ -96,11 +96,11 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {int zero_extend =0 ;unsigned int j; +unsigned int n =6 ;#ifdef CONFIG_SPARC64 if (test_tsk_thread_flag (task,TIF_32BIT ))
@@ -108,7 +108,7 @@ static inline void syscall_get_arguments(struct task_struct *task,#endif for (j =0 ; j < n; j++) { -unsigned long val = regs->u_regs[UREG_I0 + i + j]; +unsigned long val = regs->u_regs[UREG_I0 + j];if (zero_extend) args[j] = (u32 ) val;
arch/um/include/asm/syscall-generic.h +6 -33
@@ -53,43 +53,16 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {const struct uml_pt_regs *r = ®s->regs; -switch (i) { -case 0 : -if (!n--) -break ; - *args++ =UPT_SYSCALL_ARG1 (r); -case 1 : -if (!n--) -break ; - *args++ =UPT_SYSCALL_ARG2 (r); -case 2 : -if (!n--) -break ; - *args++ =UPT_SYSCALL_ARG3 (r); -case 3 : -if (!n--) -break ; - *args++ =UPT_SYSCALL_ARG4 (r); -case 4 : -if (!n--) -break ; - *args++ =UPT_SYSCALL_ARG5 (r); -case 5 : -if (!n--) -break ; - *args++ =UPT_SYSCALL_ARG6 (r); -case 6 : -if (!n--) -break ; -default : -BUG (); -break ; - } + *args++ =UPT_SYSCALL_ARG1 (r); + *args++ =UPT_SYSCALL_ARG2 (r); + *args++ =UPT_SYSCALL_ARG3 (r); + *args++ =UPT_SYSCALL_ARG4 (r); + *args++ =UPT_SYSCALL_ARG5 (r); + *args =UPT_SYSCALL_ARG6 (r); } static inline void syscall_set_arguments(struct task_struct *task,
arch/x86/include/asm/syscall.h +17 -56
91 lines not on this page · raw message
arch/xtensa/include/asm/syscall.h +3 -13
@@ -59,23 +59,13 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {static const unsigned int reg[] =XTENSA_SYSCALL_ARGUMENT_REGS ; -unsigned int j; - -if (n ==0 ) -return ; - -WARN_ON_ONCE (i + n >SYSCALL_MAX_ARGS ); +unsigned int i; -for (j =0 ; j < n; ++j) { -if (i + j <SYSCALL_MAX_ARGS ) - args[j] = regs->areg[reg[i + j]]; -else - args[j] =0 ; - } +for (i =0 ; i <6 ; ++i) + args[i] = regs->areg[reg[i]]; } static inline void syscall_set_arguments(struct task_struct *task,
include/asm-generic/syscall.h +3 -8
@@ -105,21 +105,16 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,* syscall_get_arguments - extract system call parameter values * @task: task of interest, must be blocked * @regs: task_pt_regs() of @task -* @i: argument index [0,5] -* @n: number of arguments; n+i must be [1,6]. * @args: array filled with argument values * -* Fetches @n arguments to the system call starting with the @i'th argument -* (from 0 through 5). Argument @i is stored in @args[0], and so on. -* An arch inline version is probably optimal when @i and @n are constants. +* Fetches 6 arguments to the system call. First argument is stored in +* @args[0], and so on. * * It's only valid to call this when @task is stopped for tracing on * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -* It's invalid to call this with @i + @n > 6; we only support system calls -* taking up to 6 arguments. */ void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args); +unsigned long *args);/** * syscall_set_arguments - change system call parameter value
include/trace/events/syscalls.h +1 -1
@@ -28,7 +28,7 @@ TRACE_EVENT_FN(sys_enter,TP_fast_assign ( __entry->id = id; -syscall_get_arguments (current, regs,0 ,6 , __entry->args); +syscall_get_arguments (current, regs, __entry->args); ), TP_printk("NR %ld (%lx, %lx, %lx, %lx, %lx, %lx)",
kernel/seccomp.c +1 -1
@@ -149,7 +149,7 @@ static void populate_seccomp_data(struct seccomp_data *sd) sd->nr =syscall_get_nr (task, regs); sd->arch =syscall_get_arch (); -syscall_get_arguments (task, regs,0 ,6 , args); +syscall_get_arguments (task, regs, args); sd->args[0 ] = args[0 ]; sd->args[1 ] = args[1 ]; sd->args[2 ] = args[2 ];
kernel/trace/trace_syscalls.c +2 -2
@@ -348,7 +348,7 @@ static void ftrace_syscall_enter(void *data, struct pt_regs *regs, long id) entry =ring_buffer_event_data (event); entry->nr = syscall_nr; -syscall_get_arguments (current, regs,0 ,6 , args); +syscall_get_arguments (current, regs, args);memcpy (entry->args, args,sizeof (unsigned long ) * sys_data->nb_args); event_trigger_unlock_commit(trace_file, buffer, event, entry,
@@ -616,7 +616,7 @@ static void perf_syscall_enter(void *ignore, struct pt_regs *regs, long id)return ; rec->nr = syscall_nr; -syscall_get_arguments (current, regs,0 ,6 , args); +syscall_get_arguments (current, regs, args);memcpy (&rec->args, args,sizeof (unsigned long ) * sys_data->nb_args); if ((valid_prog_array &&
lib/syscall.c +1 -1
@@ -27,7 +27,7 @@ static int collect_syscall(struct task_struct *target, struct syscall_info *info info->data.nr =syscall_get_nr (target, regs);if (info->data.nr !=-1L ) -syscall_get_arguments (target, regs,0 ,6 , +syscall_get_arguments (target, regs, (unsigned long *)&info->data.args[0 ]);put_task_stack (target);
Signature · 1 line
2.20.1
Re: [PATCH 5/6 v3] syscalls: Remove start and number from syscall_get_arguments() args
Hi Steven,
Quoted 37 lines · Steven Rostedt
From: "Steven Rostedt (Red Hat)" <[email protected]>
At Linux Plumbers, Andy Lutomirski approached me and pointed out that the function call
syscall_get_arguments()implemented in x86 was horribly written and not optimized for the standard case of passing in 0 and 6 for the starting index and the number of system calls to get. When looking at all the users of this function, I discovered that all instances pass in only 0 and 6 for these arguments. Instead of having this function handle different cases that are never used, simply rewrite it to return the first 6 arguments of a system call.This should help out the performance of tracing system calls by ptrace, ftrace and perf.
Cc Oleg Nesterov <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Kees Cook <[email protected]>Cc Andy Lutomirski <[email protected]>Cc Dominik Brodowski <[email protected]>Cc Dave Martin <[email protected]>Cc "Dmitry V. Levin" <[email protected]>
Quoted 8 lines
Thanks,
Paul
Re: [PATCH 5/6 v3] syscalls: Remove start and number from syscall_get_arguments() args
In reply to Steven RostedtQuoted 11 lines · Steven Rostedt
From: "Steven Rostedt (Red Hat)" <[email protected]>
At Linux Plumbers, Andy Lutomirski approached me and pointed out that the function call
syscall_get_arguments()implemented in x86 was horribly written and not optimized for the standard case of passing in 0 and 6 for the starting index and the number of system calls to get. When looking at all the users of this function, I discovered that all instances pass in only 0 and 6 for these arguments. Instead of having this function handle different cases that are never used, simply rewrite it to return the first 6 arguments of a system call.
Quoted 4 lines
This should help out the performance of tracing system calls by ptrace, ftrace and perf.
For x86:
Re: [PATCH 5/6 v3] syscalls: Remove start and number from syscall_get_arguments() args
In reply to Steven RostedtQuoted 11 lines · Steven Rostedt
From: "Steven Rostedt (Red Hat)" <[email protected]>
At Linux Plumbers, Andy Lutomirski approached me and pointed out that the function call
syscall_get_arguments()implemented in x86 was horribly written and not optimized for the standard case of passing in 0 and 6 for the starting index and the number of system calls to get. When looking at all the users of this function, I discovered that all instances pass in only 0 and 6 for these arguments. Instead of having this function handle different cases that are never used, simply rewrite it to return the first 6 arguments of a system call.
Quoted 4 lines
This should help out the performance of tracing system calls by ptrace, ftrace and perf.
FWIW, you can add
There are several places listed below where I'd prefer to see more readable equivalents, but feel free to leave it to respective arch maintainers.
Quoted 5 lines
arch/hexagon/include/asm/syscall.h +0
-0
arch/hexagon/include/asm/syscall.h static inline long syscall_get_nr(struct task_struct *task, · line 42
Quoted 9 lines
arch/hexagon/include/asm/syscall.h +1
-3@@ -37,10 +37,8 @@ static inline long syscall_get_nr(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -BUG_ON (i + n >6 ); -memcpy (args, &(®s->r00)[i], n *sizeof (args[0 ])); +memcpy (args, &(®s->r00)[0 ],6 *sizeof (args[0 ]));
A shorter and slightly more readable equivalent is
memcpy(args, ®s->r00, 6 * sizeof(args[0]));
Quoted 41 lines
arch/nds32/include/asm/syscall.h +3
-21@@ -108,42 +108,21 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,* syscall_get_arguments - extract system call parameter values * @task: task of interest, must be blocked * @regs: task_pt_regs() of @task -* @i: argument index [0,5] -* @n: number of arguments; n+i must be [1,6]. * @args: array filled with argument values * -* Fetches @n arguments to the system call starting with the @i'th argument -* (from 0 through 5). Argument @i is stored in @args[0], and so on. -* An arch inline version is probably optimal when @i and @n are constants. +* Fetches 6 arguments to the system call (from 0 through 5). The first +* argument is stored in @args[0], and so on. * * It's only valid to call this when @task is stopped for tracing on * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -* It's invalid to call this with @i + @n > 6; we only support system calls -* taking up to 6 arguments. */ #define SYSCALL_MAX_ARGS 6void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) +unsigned long *args) { -if (n ==0 ) -return ; -if (i + n >SYSCALL_MAX_ARGS ) { -unsigned long *args_bad = args +SYSCALL_MAX_ARGS - i; -unsigned int n_bad = n + i -SYSCALL_MAX_ARGS ; -pr_warning ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); -memset (args_bad,0 , n_bad *sizeof (args[0 ])); -memset (args_bad,0 , n_bad *sizeof (args[0 ])); - } - -if (i ==0 ) { - args[0 ] = regs->orig_r0;
arch/nds32/include/asm/syscall.h void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs, · line 126
Quoted 10 lines
arch/nds32/include/asm/syscall.h +3
-6- args++; - i++; - n--; - } - -memcpy (args, ®s->uregs[0 ] + i, n *sizeof (args[0 ])); + args[0 ] = regs->orig_r0; + args++; +memcpy (args, ®s->uregs[0 ] +1 ,5 *sizeof (args[0 ])); }
A shorter and slightly more readable equivalent of the last memcpy is
memcpy(args, ®s->uregs[1], 5 * sizeof(args[0]));
Quoted 20 lines
arch/powerpc/include/asm/syscall.h +1
-3@@ -65,22 +65,20 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {unsigned long val, mask =-1UL ; - -BUG_ON (i + n >6 ); +unsigned int n =6 ;#ifdef CONFIG_COMPAT if (test_tsk_thread_flag (task,TIF_32BIT )) mask =0xffffffff ;#endif
arch/powerpc/include/asm/syscall.h static inline void syscall_set_return_value(struct task_struct *task, · line 84
Quoted 10 lines
arch/powerpc/include/asm/syscall.h +2
-2while (n--) { -if (n ==0 && i ==0 ) +if (n ==0 ) val = regs->orig_gpr3;else - val = regs->gpr[3 + i + n]; + val = regs->gpr[3 + n]; args[n] = val & mask; }
A shorter and slightly more readable equivalent of the loop is
while (--n) args[n] = regs->gpr[3 + n] & mask; args[0] = regs->orig_gpr3 & mask;
Quoted 24 lines
arch/s390/include/asm/syscall.h +1
-8@@ -56,27 +56,20 @@ static inline void syscall_set_return_value(struct task_struct *task,static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) {unsigned long mask =-1UL ; +unsigned int n =6 ; -/* -* No arguments for this syscall, there's nothing to do. -*/ -if (!n) -return ; - -BUG_ON (i + n >6 );#ifdef CONFIG_COMPAT if (test_tsk_thread_flag (task,TIF_31BIT )) mask =0xffffffff ;
arch/s390/include/asm/syscall.h static inline void syscall_set_return_value(struct task_struct *task, · line 72
Quoted 10 lines
arch/s390/include/asm/syscall.h +4
-4#endif while (n-- >0 ) -if (i + n >0 ) - args[n] = regs->gprs[2 + i + n] & mask; -if (i ==0 ) - args[0 ] = regs->orig_gpr2 & mask; +if (n >0 ) + args[n] = regs->gprs[2 + n] & mask; + + args[0 ] = regs->orig_gpr2 & mask;
A shorter and slightly more readable equivalent of the loop is
while (--n > 0) args[n] = regs->gprs[2 + n] & mask;
Signature · 1 line
ldv
Steven Rostedt
maintainerRe: [PATCH 5/6 v3] syscalls: Remove start and number from syscall_get_arguments() args
Quoted 2 lines · On Thu, 4 Apr 2019 21:17:58 +0300 "Dmitry V. Levin" <[email protected]> wrote:
There are several places listed below where I'd prefer to see more readable equivalents, but feel free to leave it to respective arch maintainers.
I was going to do similar changes, but figured I'd do just that (let the arch maintainers further optimize the code). I made this more about fixing the interface and less about the optimization and clean ups that it can allow.
-- Steve
Re: [PATCH 5/6 v3] syscalls: Remove start and number from syscall_get_arguments() args
In reply to Steven RostedtQuoted 14 lines · Steven Rostedt
From: "Steven Rostedt (Red Hat)" <[email protected]>
At Linux Plumbers, Andy Lutomirski approached me and pointed out that the function call
syscall_get_arguments()implemented in x86 was horribly written and not optimized for the standard case of passing in 0 and 6 for the starting index and the number of system calls to get. When looking at all the users of this function, I discovered that all instances pass in only 0 and 6 for these arguments. Instead of having this function handle different cases that are never used, simply rewrite it to return the first 6 arguments of a system call.This should help out the performance of tracing system calls by ptrace, ftrace and perf.
[...]
Quoted 1 line
arch/xtensa/include/asm/syscall.h | 16 ++----
For xtensa changes:
Signature · 2 lines
Thanks. -- Max
Steven Rostedt
maintainerPATCH v3 6/6 syscalls: Remove start and number from syscall_set_arguments() args
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
After removing the start and count arguments of syscall_get_arguments() it seems reasonable to remove them from syscall_set_arguments(). Note, as of today, there are no users of syscall_set_arguments(). But we are told that there will be soon. But for now, at least make it consistent with syscall_get_arguments().
--- arch/arm/include/asm/syscall.h | 22 ++------- arch/arm64/include/asm/syscall.h | 22 ++------- arch/c6x/include/asm/syscall.h | 38 +++------------ arch/csky/include/asm/syscall.h | 14 ++---- arch/ia64/include/asm/syscall.h | 10 ++-- arch/ia64/kernel/ptrace.c | 7 ++- arch/microblaze/include/asm/syscall.h | 4 +- arch/nds32/include/asm/syscall.h | 29 ++--------- arch/nios2/include/asm/syscall.h | 42 +++------------- arch/openrisc/include/asm/syscall.h | 6 +-- arch/powerpc/include/asm/syscall.h | 7 +-- arch/riscv/include/asm/syscall.h | 13 ++--- arch/s390/include/asm/syscall.h | 11 ++--- arch/sh/include/asm/syscall_32.h | 21 +++----- arch/sh/include/asm/syscall_64.h | 4 +- arch/sparc/include/asm/syscall.h | 7 ++- arch/um/include/asm/syscall-generic.h | 39 +++------------ arch/x86/include/asm/syscall.h | 69 +++++++-------------------- arch/xtensa/include/asm/syscall.h | 17 ++----- include/asm-generic/syscall.h | 10 +--- 20 files changed, 88 insertions(+), 304 deletions(-)
arch/arm/include/asm/syscall.h +4 -18
@@ -65,26 +65,12 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -if (n ==0 ) -return ; - -if (i + n >SYSCALL_MAX_ARGS ) { -pr_warn ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); - n =SYSCALL_MAX_ARGS - i; - } - -if (i ==0 ) { - regs->ARM_ORIG_r0 = args[0 ]; - args++; - i++; - n--; - } - -memcpy (®s->ARM_r0 + i, args, n *sizeof (args[0 ])); + regs->ARM_ORIG_r0 = args[0 ]; + args++; + +memcpy (®s->ARM_r0 +1 , args,5 *sizeof (args[0 ])); }static inline int syscall_get_arch (void )
arch/arm64/include/asm/syscall.h +4 -18
@@ -75,26 +75,12 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -if (n ==0 ) -return ; - -if (i + n >SYSCALL_MAX_ARGS ) { -pr_warning ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); - n =SYSCALL_MAX_ARGS - i; - } - -if (i ==0 ) { - regs->orig_x0 = args[0 ]; - args++; - i++; - n--; - } - -memcpy (®s->regs[i], args, n *sizeof (args[0 ])); + regs->orig_x0 = args[0 ]; + args++; + +memcpy (®s->regs[1 ], args,5 *sizeof (args[0 ])); }/*
arch/c6x/include/asm/syscall.h +6 -32
@@ -59,40 +59,14 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -switch (i) { -case 0 : -if (!n--) -break ; - regs->a4 = *args++; -case 1 : -if (!n--) -break ; - regs->b4 = *args++; -case 2 : -if (!n--) -break ; - regs->a6 = *args++; -case 3 : -if (!n--) -break ; - regs->b6 = *args++; -case 4 : -if (!n--) -break ; - regs->a8 = *args++; -case 5 : -if (!n--) -break ; - regs->a9 = *args++; -case 6 : -if (!n) -break ; -default : -BUG (); - } + regs->a4 = *args++; + regs->b4 = *args++; + regs->a6 = *args++; + regs->b6 = *args++; + regs->a8 = *args++; + regs->a9 = *args; }#endif /* __ASM_C6X_SYSCALLS_H */
arch/csky/include/asm/syscall.h +4 -10
@@ -52,17 +52,11 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) +const unsigned long *args) { -BUG_ON (i + n >6 ); -if (i ==0 ) { - regs->orig_a0 = args[0 ]; - args++; - n--; - }else { - i--; - } -memcpy (®s->a1 + i, args, n *sizeof (regs->a1)); + regs->orig_a0 = args[0 ]; + args++; +memcpy (®s->a1, args,5 *sizeof (regs->a1)); } static inline int
arch/ia64/include/asm/syscall.h +3 -7
@@ -59,23 +59,19 @@ static inline void syscall_set_return_value(struct task_struct *task, }extern void ia64_syscall_get_set_arguments (struct task_struct *task, -struct pt_regs *regs,unsigned int i,unsigned int n, -unsigned long *args,int rw); +struct pt_regs *regs,unsigned long *args,int rw);static inline void syscall_get_arguments (struct task_struct *task,struct pt_regs *regs,unsigned long *args) { -ia64_syscall_get_set_arguments (task, regs,0 ,6 , args,0 ); +ia64_syscall_get_set_arguments (task, regs, args,0 ); }static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,unsigned long *args) { -BUG_ON (i + n >6 ); - -ia64_syscall_get_set_arguments (task, regs, i, n, args,1 ); +ia64_syscall_get_set_arguments (task, regs, args,1 ); }static inline int syscall_get_arch (void )
arch/ia64/kernel/ptrace.c +3 -4
@@ -2179,12 +2179,11 @@ static void syscall_get_set_args_cb(struct unw_frame_info *info, void *data) }void ia64_syscall_get_set_arguments (struct task_struct *task, -struct pt_regs *regs,unsigned int i,unsigned int n, -unsigned long *args,int rw) +struct pt_regs *regs,unsigned long *args,int rw) {struct syscall_get_set_args data = { - .i = i, - .n = n, + .i =0 , + .n =6 , .args = args, .regs = regs, .rw = rw,
arch/microblaze/include/asm/syscall.h +3 -1
@@ -93,9 +93,11 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { +unsigned int i =0 ; +unsigned int n =6 ; +while (n--)microblaze_set_syscall_arg (regs, i++, *args++); }
arch/nds32/include/asm/syscall.h +5 -24
@@ -129,39 +129,20 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,* syscall_set_arguments - change system call parameter value * @task: task of interest, must be in system call entry tracing * @regs: task_pt_regs() of @task -* @i: argument index [0,5] -* @n: number of arguments; n+i must be [1,6]. * @args: array of argument values to store * -* Changes @n arguments to the system call starting with the @i'th argument. -* Argument @i gets value @args[0], and so on. -* An arch inline version is probably optimal when @i and @n are constants. +* Changes 6 arguments to the system call. The first argument gets value +* @args[0], and so on. * * It's only valid to call this when @task is stopped for tracing on * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -* It's invalid to call this with @i + @n > 6; we only support system calls -* taking up to 6 arguments. */ void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -if (n ==0 ) -return ; - -if (i + n >SYSCALL_MAX_ARGS ) { -pr_warn ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); - n =SYSCALL_MAX_ARGS - i; - } - -if (i ==0 ) { - regs->orig_r0 = args[0 ]; - args++; - i++; - n--; - } + regs->orig_r0 = args[0 ]; + args++; -memcpy (®s->uregs[0 ] + i, args, n *sizeof (args[0 ])); +memcpy (®s->uregs[0 ] +1 , args,5 *sizeof (args[0 ])); }#endif /* _ASM_NDS32_SYSCALL_H */
arch/nios2/include/asm/syscall.h +7 -35
49 lines not on this page · raw message
arch/openrisc/include/asm/syscall.h +2 -4
@@ -63,11 +63,9 @@ syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) +const unsigned long *args) { -BUG_ON (i + n >6 ); - -memcpy (®s->gpr[3 + i], args, n *sizeof (args[0 ])); +memcpy (®s->gpr[3 ], args,6 *sizeof (args[0 ])); }static inline int syscall_get_arch (void )
arch/powerpc/include/asm/syscall.h +2 -5
@@ -86,15 +86,12 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -BUG_ON (i + n >6 ); -memcpy (®s->gpr[3 + i], args, n *sizeof (args[0 ])); +memcpy (®s->gpr[3 ], args,6 *sizeof (args[0 ]));/* Also copy the first argument into orig_gpr3 */ -if (i ==0 && n >0 ) - regs->orig_gpr3 = args[0 ]; + regs->orig_gpr3 = args[0 ]; }static inline int syscall_get_arch (void )
arch/riscv/include/asm/syscall.h +3 -10
@@ -81,18 +81,11 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -BUG_ON (i + n >6 ); -if (i ==0 ) { - regs->orig_a0 = args[0 ]; - args++; - n--; - }else { - i--; - } -memcpy (®s->a1 + i, args, n *sizeof (regs->a1)); + regs->orig_a0 = args[0 ]; + args++; +memcpy (®s->a1, args,5 *sizeof (regs->a1)); }static inline int syscall_get_arch (void )
arch/s390/include/asm/syscall.h +5 -6
@@ -74,15 +74,14 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -BUG_ON (i + n >6 ); +unsigned int n =6 ; +while (n-- >0 ) -if (i + n >0 ) - regs->gprs[2 + i + n] = args[n]; -if (i ==0 ) - regs->orig_gpr2 = args[0 ]; +if (n >0 ) + regs->gprs[2 + n] = args[n]; + regs->orig_gpr2 = args[0 ]; }static inline int syscall_get_arch (void )
arch/sh/include/asm/syscall_32.h +6 -15
@@ -62,23 +62,14 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -/* Same note as above applies */ -BUG_ON (i); - -switch (n) { -case 6 : regs->regs[1 ] = args[5 ]; -case 5 : regs->regs[0 ] = args[4 ]; -case 4 : regs->regs[7 ] = args[3 ]; -case 3 : regs->regs[6 ] = args[2 ]; -case 2 : regs->regs[5 ] = args[1 ]; -case 1 : regs->regs[4 ] = args[0 ]; -break ; -default : -BUG (); - } + regs->regs[1 ] = args[5 ]; + regs->regs[0 ] = args[4 ]; + regs->regs[7 ] = args[3 ]; + regs->regs[6 ] = args[2 ]; + regs->regs[5 ] = args[1 ]; + regs->regs[4 ] = args[0 ]; }static inline int syscall_get_arch (void )
arch/sh/include/asm/syscall_64.h +1 -3
@@ -54,11 +54,9 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -BUG_ON (i + n >6 ); -memcpy (®s->regs[2 + i], args, n *sizeof (args[0 ])); +memcpy (®s->regs[2 ], args,6 *sizeof (args[0 ])); }static inline int syscall_get_arch (void )
arch/sparc/include/asm/syscall.h +3 -4
@@ -119,13 +119,12 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -unsigned int j; +unsigned int i; -for (j =0 ; j < n; j++) - regs->u_regs[UREG_I0 + i + j] = args[j]; +for (i =0 ; i <6 ; i++) + regs->u_regs[UREG_I0 + i] = args[i]; }static inline int syscall_get_arch (void )
arch/um/include/asm/syscall-generic.h +6 -33
@@ -67,43 +67,16 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) {struct uml_pt_regs *r = ®s->regs; -switch (i) { -case 0 : -if (!n--) -break ; -UPT_SYSCALL_ARG1 (r) = *args++; -case 1 : -if (!n--) -break ; -UPT_SYSCALL_ARG2 (r) = *args++; -case 2 : -if (!n--) -break ; -UPT_SYSCALL_ARG3 (r) = *args++; -case 3 : -if (!n--) -break ; -UPT_SYSCALL_ARG4 (r) = *args++; -case 4 : -if (!n--) -break ; -UPT_SYSCALL_ARG5 (r) = *args++; -case 5 : -if (!n--) -break ; -UPT_SYSCALL_ARG6 (r) = *args++; -case 6 : -if (!n--) -break ; -default : -BUG (); -break ; - } +UPT_SYSCALL_ARG1 (r) = *args++; +UPT_SYSCALL_ARG2 (r) = *args++; +UPT_SYSCALL_ARG3 (r) = *args++; +UPT_SYSCALL_ARG4 (r) = *args++; +UPT_SYSCALL_ARG5 (r) = *args++; +UPT_SYSCALL_ARG6 (r) = *args; }/* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */
arch/x86/include/asm/syscall.h +16 -53
79 lines not on this page · raw message
arch/xtensa/include/asm/syscall.h +3 -14
@@ -70,24 +70,13 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) {static const unsigned int reg[] =XTENSA_SYSCALL_ARGUMENT_REGS ; -unsigned int j; - -if (n ==0 ) -return ; - -if (WARN_ON_ONCE (i + n >SYSCALL_MAX_ARGS )) { -if (i <SYSCALL_MAX_ARGS ) - n =SYSCALL_MAX_ARGS - i; -else -return ; - } +unsigned int i; -for (j =0 ; j < n; ++j) - regs->areg[reg[i + j]] = args[j]; +for (i =0 ; i <6 ; ++i) + regs->areg[reg[i]] = args[i]; }asmlinkage long xtensa_rt_sigreturn (struct pt_regs *);
include/asm-generic/syscall.h +2 -8
@@ -120,21 +120,15 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,* syscall_set_arguments - change system call parameter value * @task: task of interest, must be in system call entry tracing * @regs: task_pt_regs() of @task -* @i: argument index [0,5] -* @n: number of arguments; n+i must be [1,6]. * @args: array of argument values to store * -* Changes @n arguments to the system call starting with the @i'th argument. -* Argument @i gets value @args[0], and so on. -* An arch inline version is probably optimal when @i and @n are constants. +* Changes 6 arguments to the system call. +* The first argument gets value @args[0], and so on. * * It's only valid to call this when @task is stopped for tracing on * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -* It's invalid to call this with @i + @n > 6; we only support system calls -* taking up to 6 arguments. */ void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args);/**
Signature · 1 line
2.20.1
Re: [PATCH 6/6 v3] syscalls: Remove start and number from syscall_set_arguments() args
Quoted 9 lines · Steven Rostedt
From: "Steven Rostedt (VMware)" <[email protected]>
After removing the start and count arguments of
syscall_get_arguments()it seems reasonable to remove them fromsyscall_set_arguments(). Note, as of today, there are no users ofsyscall_set_arguments(). But we are told that there will be soon. But for now, at least make it consistent withsyscall_get_arguments().
For x86:
Re: [PATCH 6/6 v3] syscalls: Remove start and number from syscall_set_arguments() args
In reply to Steven RostedtQuoted 9 lines · Steven Rostedt
From: "Steven Rostedt (VMware)" <[email protected]>
After removing the start and count arguments of
syscall_get_arguments()it seems reasonable to remove them fromsyscall_set_arguments(). Note, as of today, there are no users ofsyscall_set_arguments(). But we are told that there will be soon. But for now, at least make it consistent withsyscall_get_arguments().
FWIW, you can add
There are two places listed below where I'd prefer to see more readable equivalents, but feel free to leave it to respective arch maintainers.
Quoted 38 lines
arch/nds32/include/asm/syscall.h +2
-19@@ -129,39 +129,20 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,* syscall_set_arguments - change system call parameter value * @task: task of interest, must be in system call entry tracing * @regs: task_pt_regs() of @task -* @i: argument index [0,5] -* @n: number of arguments; n+i must be [1,6]. * @args: array of argument values to store * -* Changes @n arguments to the system call starting with the @i'th argument. -* Argument @i gets value @args[0], and so on. -* An arch inline version is probably optimal when @i and @n are constants. +* Changes 6 arguments to the system call. The first argument gets value +* @args[0], and so on. * * It's only valid to call this when @task is stopped for tracing on * entry to a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. -* It's invalid to call this with @i + @n > 6; we only support system calls -* taking up to 6 arguments. */ void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -if (n ==0 ) -return ; - -if (i + n >SYSCALL_MAX_ARGS ) { -pr_warn ("%s called with max args %d, handling only %d\n" , - __func__, i + n,SYSCALL_MAX_ARGS ); - n =SYSCALL_MAX_ARGS - i; - } - -if (i ==0 ) { - regs->orig_r0 = args[0 ];
arch/nds32/include/asm/syscall.h void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, · line 147
Quoted 10 lines
arch/nds32/include/asm/syscall.h +3
-5- args++; - i++; - n--; - } + regs->orig_r0 = args[0 ]; + args++; -memcpy (®s->uregs[0 ] + i, args, n *sizeof (args[0 ])); +memcpy (®s->uregs[0 ] +1 , args,5 *sizeof (args[0 ])); }
A shorter and slightly more readable equivalent of the last memcpy is
memcpy(®s->uregs[1], args, 5 * sizeof(args[0]));
Quoted 13 lines
arch/s390/include/asm/syscall.h +1
-2@@ -74,15 +74,14 @@ static inline void syscall_get_arguments(struct task_struct *task,static inline void syscall_set_arguments (struct task_struct *task,struct pt_regs *regs, -unsigned int i,unsigned int n,const unsigned long *args) { -BUG_ON (i + n >6 ); +unsigned int n =6 ;
arch/s390/include/asm/syscall.h static inline void syscall_get_arguments(struct task_struct *task, · line 85
Quoted 10 lines
arch/s390/include/asm/syscall.h +4
-4+while (n-- >0 ) -if (i + n >0 ) - regs->gprs[2 + i + n] = args[n]; -if (i ==0 ) - regs->orig_gpr2 = args[0 ]; +if (n >0 ) + regs->gprs[2 + n] = args[n]; + regs->orig_gpr2 = args[0 ]; }
A shorter and slightly more readable equivalent of the loop is
while (--n > 0) regs->gprs[2 + n] = args[n];
Signature · 1 line
ldv
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 6/6 v3] syscalls: Remove start and number from syscall_set_arguments() args
In reply to Steven RostedtQuoted 8 lines · Steven Rostedt
From: "Steven Rostedt (VMware)" <[email protected]>
After removing the start and count arguments of
syscall_get_arguments()it seems reasonable to remove them fromsyscall_set_arguments(). Note, as of today, there are no users ofsyscall_set_arguments(). But we are told that there will be soon. But for now, at least make it consistent withsyscall_get_arguments().
[...]
Quoted 1 line
arch/xtensa/include/asm/syscall.h | 17 ++-----
For xtensa changes:
Signature · 2 lines
Thanks. -- Max
Steven Rostedt
maintainerQuoted 2 lines · On Mon, 01 Apr 2019 09:41:04 -0400 Steven Rostedt <[email protected]> wrote:
[ Looking for acks ]
I got a couple.
Quoted 2 lines
Two and a half years ago I sent out 3 patches and a title letter that had this[1]:
Linus,
Is this something that can go into this -rc release or would you want me to wait till the next merge window?
The reason I ask, is that there's two arch patches in this series that have stable tags attached to them. But I moved things around such that they are applied before the global arch patches are and can be applied independently.
Should I move those two patches up front and just add those to this release cycle, or would you like the entire series now?
-- Steve
Quoted 34 lines
----
arch/arc/include/asm/syscall.h | 7 +- arch/arm/include/asm/syscall.h | 47 ++--------- arch/arm64/include/asm/syscall.h | 46 ++--------- arch/c6x/include/asm/syscall.h | 79 ++++--------------- arch/csky/include/asm/syscall.h | 26 ++----- arch/h8300/include/asm/syscall.h | 34 ++------ arch/hexagon/include/asm/syscall.h | 4 +- arch/ia64/include/asm/syscall.h | 13 +--- arch/ia64/kernel/ptrace.c | 7 +- arch/microblaze/include/asm/syscall.h | 8 +- arch/mips/include/asm/syscall.h | 3 +- arch/mips/kernel/ptrace.c | 2 +- arch/nds32/include/asm/syscall.h | 62 +++------------ arch/nios2/include/asm/syscall.h | 84 ++++---------------- arch/openrisc/include/asm/syscall.h | 12 +-- arch/parisc/include/asm/syscall.h | 30 ++----- arch/powerpc/include/asm/syscall.h | 15 ++-- arch/riscv/include/asm/syscall.h | 24 ++---- arch/s390/include/asm/syscall.h | 28 +++---- arch/sh/include/asm/syscall_32.h | 47 +++-------- arch/sh/include/asm/syscall_64.h | 8 +- arch/sparc/include/asm/syscall.h | 11 ++- arch/um/include/asm/syscall-generic.h | 78 +++---------------- arch/x86/include/asm/syscall.h | 142 ++++++++-------------------------- arch/xtensa/include/asm/syscall.h | 33 ++------ fs/proc/base.c | 17 ++-- include/asm-generic/syscall.h | 21 ++--- include/linux/ptrace.h | 11 ++- include/trace/events/syscalls.h | 2 +- kernel/seccomp.c | 2 +- kernel/trace/trace_syscalls.c | 9 ++- lib/syscall.c | 57 ++++++-------- 32 files changed, 247 insertions(+), 722 deletions(-)
Quoted 11 lines · Steven Rostedt
Is this something that can go into this -rc release or would you want me to wait till the next merge window?
The reason I ask, is that there's two arch patches in this series that have stable tags attached to them. But I moved things around such that they are applied before the global arch patches are and can be applied independently.
Should I move those two patches up front and just add those to this release cycle, or would you like the entire series now?
I think I can take the entire series. It's removing code and fixing a couple of bugs in the process. Even if not all changes are pure fixes, it looks good to me.
I assume you've actually used this and can trace system calls with arguments properly, so that it's all tested at least on x86-64?
Linus
Steven Rostedt
maintainerQuoted 3 lines · On Thu, 4 Apr 2019 15:24:16 -1000 Linus Torvalds…
I assume you've actually used this and can trace system calls with arguments properly, so that it's all tested at least on x86-64?
Yep, and even tested it against strace. Looks fine. I also ran it through my entire ftrace test suite (takes around 10 hours or more), and it all passed.
I'll collect the last bit of acks and then send you a pull request.
-- Steve
Quoted 1 line · Steven Rostedt
[ Looking for acks ]
For the arm64 bits:
Will