From: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
To: <linux-kernel@vger.kernel.org>
Cc: <linux-api@vger.kernel.org>, <luto@amacapital.net>,
<rostedt@goodmis.org>,
Marcin Nowakowski <marcin.nowakowski@imgtec.com>,
Ingo Molnar <mingo@redhat.com>,
"James E.J. Bottomley" <jejb@parisc-linux.org>,
"Helge Deller" <deller@gmx.de>, <linux-parisc@vger.kernel.org>
Subject: [PATCH v4 12/12] parisc/tracing: fix compat syscall handling
Date: Fri, 14 Oct 2016 10:35:15 +0200 [thread overview]
Message-ID: <1476434115-25428-14-git-send-email-marcin.nowakowski@imgtec.com> (raw)
In-Reply-To: <1476434115-25428-1-git-send-email-marcin.nowakowski@imgtec.com>
Add missing arch code - arch_trace_is_compat_syscall and
arch_syscall_addr
Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-parisc@vger.kernel.org
---
arch/parisc/include/asm/ftrace.h | 10 ++++++++++
arch/parisc/kernel/Makefile | 1 +
arch/parisc/kernel/ftrace.c | 15 +++++++++++++++
3 files changed, 26 insertions(+)
diff --git a/arch/parisc/include/asm/ftrace.h b/arch/parisc/include/asm/ftrace.h
index d635c6b..0b54385 100644
--- a/arch/parisc/include/asm/ftrace.h
+++ b/arch/parisc/include/asm/ftrace.h
@@ -12,6 +12,16 @@ extern unsigned long return_address(unsigned int);
#define ftrace_return_address(n) return_address(n)
+#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_COMPAT)
+#include <linux/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_FTRACE_SYSCALLS && CONFIG_COMPAT */
+
#endif /* __ASSEMBLY__ */
#endif /* _ASM_PARISC_FTRACE_H */
diff --git a/arch/parisc/kernel/Makefile b/arch/parisc/kernel/Makefile
index 69a1118..7d1fd39 100644
--- a/arch/parisc/kernel/Makefile
+++ b/arch/parisc/kernel/Makefile
@@ -31,3 +31,4 @@ obj64-$(CONFIG_AUDIT) += compat_audit.o
obj-$(CONFIG_64BIT) += perf.o perf_asm.o $(obj64-y)
obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
+obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
diff --git a/arch/parisc/kernel/ftrace.c b/arch/parisc/kernel/ftrace.c
index 5a5506a..41db7ca 100644
--- a/arch/parisc/kernel/ftrace.c
+++ b/arch/parisc/kernel/ftrace.c
@@ -56,6 +56,7 @@ static void __hot prepare_ftrace_return(unsigned long *parent,
}
#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
+#ifdef CONFIG_FUNCTION_TRACER
void notrace __hot ftrace_function_trampoline(unsigned long parent,
unsigned long self_addr,
unsigned long org_sp_gr3)
@@ -85,4 +86,18 @@ void notrace __hot ftrace_function_trampoline(unsigned long parent,
}
#endif
}
+#endif /* CONFIG_FUNCTION_TRACER */
+#if (defined CONFIG_FTRACE_SYSCALLS) && (defined CONFIG_64BIT)
+extern const unsigned int sys_call_table64[];
+unsigned long __init arch_syscall_addr(int nr, bool compat)
+{
+#ifdef CONFIG_COMPAT
+ if (compat)
+ return (unsigned long)sys_call_table[nr];
+#endif /* CONFIG_COMPAT */
+
+ return (unsigned long)sys_call_table64[nr];
+}
+
+#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_64BIT */
--
2.7.4
prev parent reply other threads:[~2016-10-14 8:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-14 8:35 [PATCH v4 00/12] syscall/tracing: compat syscall support Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 01/12] tracing/syscalls: remove syscall_nr from syscall metadata Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 02/12] tracing/syscalls: add handling for compat tasks Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 03/12] tracing/syscalls: drop arch_syscall_match_sym_name Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 04/12] tracing/syscalls: add compat syscall metadata Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 05/12] syscall/tracing: allow arch to override syscall_get_nr for ftrace Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 05/12] tracing/syscalls: " Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 06/12] x86/tracing: fix compat syscall handling Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 07/12] s390/tracing: " Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 08/12] arm64/tracing: " Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 09/12] powerpc/tracing: " Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 10/12] tile/tracing: " Marcin Nowakowski
2016-10-14 8:35 ` [PATCH v4 11/12] sparc/tracing: " Marcin Nowakowski
2016-10-14 8:35 ` Marcin Nowakowski [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476434115-25428-14-git-send-email-marcin.nowakowski@imgtec.com \
--to=marcin.nowakowski@imgtec.com \
--cc=deller@gmx.de \
--cc=jejb@parisc-linux.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=luto@amacapital.net \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®