[PATCH v4 09/12] powerpc/tracing: fix compat syscall handling
From: Marcin Nowakowski <hidden>
Date: 2016-10-14 08:36:06
Also in:
linuxppc-dev, lkml
Subsystem:
function hooks (ftrace), linux for powerpc (32-bit and 64-bit), the rest · Maintainers:
Steven Rostedt, Masami Hiramatsu, Madhavan Srinivasan, Linus Torvalds
Adapt the code to make use of new syscall handling interface Signed-off-by: Marcin Nowakowski <redacted> Cc: Steven Rostedt <rostedt@goodmis.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <redacted> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: linuxppc-dev@lists.ozlabs.org --- arch/powerpc/include/asm/ftrace.h | 13 +++++++++++++ arch/powerpc/kernel/ftrace.c | 4 ++++ 2 files changed, 17 insertions(+)
diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h
index f266051..c6c660d 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h@@ -72,4 +72,17 @@ struct dyn_arch_ftrace { #define ARCH_SYM_NAME_SKIP_CHARS 1 #endif +#if defined(CONFIG_FTRACE_SYSCALLS) && !defined(__ASSEMBLY__) +#if defined(CONFIG_COMPAT) +#include <linux/compat.h> +#include <asm/compat.h> + +#define ARCH_COMPAT_SYSCALL_NUMBERS_OVERLAP 1 +static inline bool arch_trace_is_compat_syscall(struct pt_regs *regs) +{ + return in_compat_syscall(); +} +#endif /* CONFIG_COMPAT */ +#endif /* CONFIG_FTRACE_SYSCALLS && !__ASSEMBLY__ */ + #endif /* _ASM_POWERPC_FTRACE */
diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
index 5bfb35f..12c00f7 100644
--- a/arch/powerpc/kernel/ftrace.c
+++ b/arch/powerpc/kernel/ftrace.c@@ -606,6 +606,10 @@ unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip) #if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64) unsigned long __init arch_syscall_addr(int nr, bool compat) { +#ifdef CONFIG_COMPAT + if (compat) + return sys_call_table[nr*2+1]; +#endif return sys_call_table[nr*2]; } #endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 */
--
2.7.4