Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932193AbcJNIgG (ORCPT ); Fri, 14 Oct 2016 04:36:06 -0400 Received: from mailapp02.imgtec.com ([217.156.133.132]:9672 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752578AbcJNIfj (ORCPT ); Fri, 14 Oct 2016 04:35:39 -0400 From: Marcin Nowakowski To: CC: , , , Marcin Nowakowski , Ingo Molnar , Benjamin Herrenschmidt , "Paul Mackerras" , Michael Ellerman , Subject: [PATCH v4 09/12] powerpc/tracing: fix compat syscall handling Date: Fri, 14 Oct 2016 10:35:12 +0200 Message-ID: <1476434115-25428-11-git-send-email-marcin.nowakowski@imgtec.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1476434115-25428-1-git-send-email-marcin.nowakowski@imgtec.com> References: <1476434115-25428-1-git-send-email-marcin.nowakowski@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.80.2.5] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1780 Lines: 53 Adapt the code to make use of new syscall handling interface Signed-off-by: Marcin Nowakowski Cc: Steven Rostedt Cc: Ingo Molnar Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Michael Ellerman 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 +#include + +#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