diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2016-11-07 16:26:37 -0500 |
---|---|---|
committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-04-05 09:26:43 -0400 |
commit | b35f549df1d7520d37ba1e6d4a8d4df6bd52d136 (patch) | |
tree | b7e544da953806a2f4d9b2d0aeb167d0baad3955 /arch/sh/include | |
parent | ed3bb007021b9bddb90afae28a19f08ed8890add (diff) |
syscalls: Remove start and number from syscall_get_arguments() args
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.
Link: http://lkml.kernel.org/r/20161107213233.754809394@goodmis.org
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Dave Martin <dave.martin@arm.com>
Cc: "Dmitry V. Levin" <ldv@altlinux.org>
Cc: x86@kernel.org
Cc: linux-snps-arc@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-c6x-dev@linux-c6x.org
Cc: uclinux-h8-devel@lists.sourceforge.jp
Cc: linux-hexagon@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-mips@vger.kernel.org
Cc: nios2-dev@lists.rocketboards.org
Cc: openrisc@lists.librecores.org
Cc: linux-parisc@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-riscv@lists.infradead.org
Cc: linux-s390@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Cc: sparclinux@vger.kernel.org
Cc: linux-um@lists.infradead.org
Cc: linux-xtensa@linux-xtensa.org
Cc: linux-arch@vger.kernel.org
Acked-by: Paul Burton <paul.burton@mips.com> # MIPS parts
Acked-by: Max Filippov <jcmvbkbc@gmail.com> # For xtensa changes
Acked-by: Will Deacon <will.deacon@arm.com> # For the arm64 bits
Reviewed-by: Thomas Gleixner <tglx@linutronix.de> # for x86
Reviewed-by: Dmitry V. Levin <ldv@altlinux.org>
Reported-by: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/syscall_32.h | 26 | ||||
-rw-r--r-- | arch/sh/include/asm/syscall_64.h | 4 |
2 files changed, 7 insertions, 23 deletions
diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall_32.h index 6e118799831c..2bf1199a0595 100644 --- a/arch/sh/include/asm/syscall_32.h +++ b/arch/sh/include/asm/syscall_32.h | |||
@@ -48,30 +48,16 @@ static inline void syscall_set_return_value(struct task_struct *task, | |||
48 | 48 | ||
49 | static inline void syscall_get_arguments(struct task_struct *task, | 49 | static inline void syscall_get_arguments(struct task_struct *task, |
50 | struct pt_regs *regs, | 50 | struct pt_regs *regs, |
51 | unsigned int i, unsigned int n, | ||
52 | unsigned long *args) | 51 | unsigned long *args) |
53 | { | 52 | { |
54 | /* | ||
55 | * Do this simply for now. If we need to start supporting | ||
56 | * fetching arguments from arbitrary indices, this will need some | ||
57 | * extra logic. Presently there are no in-tree users that depend | ||
58 | * on this behaviour. | ||
59 | */ | ||
60 | BUG_ON(i); | ||
61 | 53 | ||
62 | /* Argument pattern is: R4, R5, R6, R7, R0, R1 */ | 54 | /* Argument pattern is: R4, R5, R6, R7, R0, R1 */ |
63 | switch (n) { | 55 | args[5] = regs->regs[1]; |
64 | case 6: args[5] = regs->regs[1]; | 56 | args[4] = regs->regs[0]; |
65 | case 5: args[4] = regs->regs[0]; | 57 | args[3] = regs->regs[7]; |
66 | case 4: args[3] = regs->regs[7]; | 58 | args[2] = regs->regs[6]; |
67 | case 3: args[2] = regs->regs[6]; | 59 | args[1] = regs->regs[5]; |
68 | case 2: args[1] = regs->regs[5]; | 60 | args[0] = regs->regs[4]; |
69 | case 1: args[0] = regs->regs[4]; | ||
70 | case 0: | ||
71 | break; | ||
72 | default: | ||
73 | BUG(); | ||
74 | } | ||
75 | } | 61 | } |
76 | 62 | ||
77 | static inline void syscall_set_arguments(struct task_struct *task, | 63 | static inline void syscall_set_arguments(struct task_struct *task, |
diff --git a/arch/sh/include/asm/syscall_64.h b/arch/sh/include/asm/syscall_64.h index 43882580c7f9..4e8f6460c703 100644 --- a/arch/sh/include/asm/syscall_64.h +++ b/arch/sh/include/asm/syscall_64.h | |||
@@ -47,11 +47,9 @@ static inline void syscall_set_return_value(struct task_struct *task, | |||
47 | 47 | ||
48 | static inline void syscall_get_arguments(struct task_struct *task, | 48 | static inline void syscall_get_arguments(struct task_struct *task, |
49 | struct pt_regs *regs, | 49 | struct pt_regs *regs, |
50 | unsigned int i, unsigned int n, | ||
51 | unsigned long *args) | 50 | unsigned long *args) |
52 | { | 51 | { |
53 | BUG_ON(i + n > 6); | 52 | memcpy(args, ®s->regs[2], 6 * sizeof(args[0])); |
54 | memcpy(args, ®s->regs[2 + i], n * sizeof(args[0])); | ||
55 | } | 53 | } |
56 | 54 | ||
57 | static inline void syscall_set_arguments(struct task_struct *task, | 55 | static inline void syscall_set_arguments(struct task_struct *task, |