Now that compat syscalls are properly distinguished from native calls,
we can add metadata for compat syscalls as well.
All the macros used to generate the metadata are the same as for
standard syscalls, but with a compat_ prefix to distinguish them easily.
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 | 15 +---
include/linux/compat.h| 74 +++
kernel/trace/trace_syscalls.c | 8 +++--
3 files changed, 90 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/include/asm/ftrace.h
b/arch/powerpc/include/asm/ftrace.h
index 686c5f7..9697a73 100644
--- a/arch/powerpc/include/asm/ftrace.h
+++ b/arch/powerpc/include/asm/ftrace.h
@@ -73,12 +73,17 @@ struct dyn_arch_ftrace {
static inline bool arch_syscall_match_sym_name(const char *sym, const char
*name)
{
/*
-* Compare the symbol name with the system call name. Skip the .sys or
.SyS
-* prefix from the symbol name and the sys prefix from the system call
name and
-* just match the rest. This is only needed on ppc64 since symbol names
on
-* 32bit do not start with a period so the generic function will work.
+* Compare the symbol name with the system call name. Skip the .sys,
+* .SyS or .compat_sys prefix from the symbol name and the sys prefix
+* from the system call name and just match the rest. This is only
+* needed on ppc64 since symbol names on 32bit do not start with a
+* period so the generic function will work.
*/
- return !strcmp(sym + 4, name + 3);
+ int prefix_len = 3;
+
+ if (!strncasecmp(name, "compat_", 7))
+ prefix_len = 10;
+ return !strcmp(sym + prefix_len + 1, name + prefix_len);
}
#endif
#endif /* CONFIG_FTRACE_SYSCALLS && !__ASSEMBLY__ */
diff --git a/include/linux/compat.h b/include/linux/compat.h
index f964ef7..9e84c92 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -30,7 +30,80 @@
#define __SC_DELOUSE(t,v) ((t)(unsigned long)(v))
#endif
+#ifdef CONFIG_FTRACE_SYSCALLS
+#ifndef __SC_STR_ADECL
+#define __SC_STR_ADECL(t, a) #a
+#endif
+
+#ifndef __SC_STR_TDECL
+#define __SC_STR_TDECL(t, a) #t
+#endif
+
+extern struct trace_event_class event_class_syscall_enter;
+extern struct trace_event_class event_class_syscall_exit;
+extern struct trace_event_functions enter_syscall_print_funcs;
+extern struct trace_event_functions exit_syscall_print_funcs;
+
+#define COMPAT_SYSCALL_TRACE_ENTER_EVENT(sname)
\
+ static struct syscall_metadata __syscall_meta_compat_##sname;
\
+ static struct trace_event_call __used \
+ event_enter_compat_##sname = {
\
+ .class = &event_class_syscall_enter, \
+ { \
+ .name = "compat_sys_enter"#sname,
\
+ }, \
+ .event.funcs= &enter_syscall_print_funcs, \
+ .data = (void
*)&__syscall_meta_compat_##sname,\
+ .flags = TRACE_EVENT_FL_CAP_ANY, \
+ }; \
+ static struct trace_event_call __used \
+ __attribute__((section("_ftrace_events")))\
+*__event_enter_compat_##sname = &event_enter_compat_##sname;
+
+#define COMPAT_SYSCALL_TRACE_EXIT_EVENT(sname)
\
+ static struct syscall_metadata __syscall_meta_compat_##sname;
\
+ static struct trace_event_call __used \
+ event_exit_compat_##sname = { \
+ .class = &event_class_syscall_exit,\
+ { \
+ .name = "compat_sys_exit"#sname,
\
+ }, \
+ .event.funcs= &exit_syscall_print_funcs,\
+ .data = (void
*)&__syscall_meta_compat_##sname,\
+ .flags = TRACE_EVENT_FL_CAP_ANY, \
+ }; \
+ static struct trace_event_call __used \
+ __attribute__((section("_ftrace_events")))\
+ *__event_exit_compat_##sname = &event_exit_compat_##sname;
+
+#define COMPAT_SYSCALL_METADATA(sname, nb, ...)
