From patchwork Fri Sep 16 07:11:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Nowakowski X-Patchwork-Id: 670704 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sb63G39qJz9rxl for ; Fri, 16 Sep 2016 17:14:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757519AbcIPHOM (ORCPT ); Fri, 16 Sep 2016 03:14:12 -0400 Received: from mailapp01.imgtec.com ([195.59.15.196]:57049 "EHLO mailapp01.imgtec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757260AbcIPHMT (ORCPT ); Fri, 16 Sep 2016 03:12:19 -0400 Received: from HHMAIL01.hh.imgtec.org (unknown [10.100.10.19]) by Forcepoint Email with ESMTPS id 484C123FDAB85; Fri, 16 Sep 2016 08:12:05 +0100 (IST) Received: from WR-NOWAKOWSKI.kl.imgtec.org (10.80.2.5) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Fri, 16 Sep 2016 08:12:06 +0100 From: Marcin Nowakowski To: CC: Marcin Nowakowski , Steven Rostedt , Ingo Molnar , "David S. Miller" , Subject: [PATCH v2 10/11] sparc/tracing: fix compat syscall handling Date: Fri, 16 Sep 2016 09:11:26 +0200 Message-ID: <1474009887-7225-11-git-send-email-marcin.nowakowski@imgtec.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474009887-7225-1-git-send-email-marcin.nowakowski@imgtec.com> References: <1474009887-7225-1-git-send-email-marcin.nowakowski@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [10.80.2.5] Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Add missing arch code - arch_trace_is_compat_syscall and arch_syscall_addr Signed-off-by: Marcin Nowakowski Cc: Steven Rostedt Cc: Ingo Molnar Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org --- arch/sparc/include/asm/ftrace.h | 10 ++++++++++ arch/sparc/kernel/Makefile | 1 + arch/sparc/kernel/ftrace.c | 14 ++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/arch/sparc/include/asm/ftrace.h b/arch/sparc/include/asm/ftrace.h index 3192a8e..a9789c6 100644 --- a/arch/sparc/include/asm/ftrace.h +++ b/arch/sparc/include/asm/ftrace.h @@ -6,6 +6,16 @@ #define MCOUNT_INSN_SIZE 4 /* sizeof mcount call */ #ifndef __ASSEMBLY__ + +#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_COMPAT) +#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_FTRACE_SYSCALLS && CONFIG_COMPAT */ void _mcount(void); #endif diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile index fdb1332..60a12eb 100644 --- a/arch/sparc/kernel/Makefile +++ b/arch/sparc/kernel/Makefile @@ -93,6 +93,7 @@ obj-$(CONFIG_KGDB) += kgdb_$(BITS).o obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o obj-$(CONFIG_EARLYFB) += btext.o obj-$(CONFIG_STACKTRACE) += stacktrace.o diff --git a/arch/sparc/kernel/ftrace.c b/arch/sparc/kernel/ftrace.c index 0a2d2dd..afeb520 100644 --- a/arch/sparc/kernel/ftrace.c +++ b/arch/sparc/kernel/ftrace.c @@ -145,3 +145,17 @@ unsigned long prepare_ftrace_return(unsigned long parent, return return_hooker; } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ + +#if (defined CONFIG_FTRACE_SYSCALLS) && (defined CONFIG_COMPAT) +extern const unsigned int sys_call_table[]; +extern const unsigned int sys_call_table32[]; + +unsigned long __init arch_syscall_addr(int nr, bool compat) +{ + if (compat) + return (unsigned long)sys_call_table32[nr]; + + return (unsigned long)sys_call_table[nr]; +} + +#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_COMPAT */