tracing: Arch syscalls tracing shrinks and fixlets
Subsystems (5)
Ingo,
Please pull the tracing/core branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
tracing/core
Thanks,
Frederic.
---
Frederic Weisbecker (4):
tracing: Move syscalls metadata handling from arch to core
tracing: Document HAVE_SYSCALL_TRACEPOINTS needs
ftrace: Copy ftrace_graph_filter boot param using strlcpy
ftrace: Rename set_bootup_ftrace into set_cmdline_ftrace
Documentation/trace/ftrace-design.txt | 13 ++++- arch/s390/kernel/ftrace.c | 67 +------------------------- arch/x86/kernel/ftrace.c | 76 +---------------------------- include/trace/syscall.h | 2 +- kernel/trace/ftrace.c | 2 +- kernel/trace/trace.c | 4 +- kernel/trace/trace_syscalls.c | 86 +++++++++++++++++++++++++++++++++ 7 files changed, 105 insertions(+), 145 deletions(-)
PATCH 1/4 tracing: Move syscalls metadata handling from arch to core
Most of the syscalls metadata processing is done from arch. But these operations are mostly generic accross archs. Especially now that we have a common variable name that expresses the number of syscalls supported by an arch: NR_syscalls, the only remaining bits that need to reside in arch is the syscall nr to addr translation.
v2: Compare syscalls symbols only after the "sys" prefix so that we
avoid spurious mismatches with archs that have syscalls wrappers, in which case syscalls symbols have "SyS" prefixed aliases. (Reported by: Heiko Carstens)
--- arch/s390/kernel/ftrace.c | 67 +------------------------------- arch/x86/kernel/ftrace.c | 76 +----------------------------------- include/trace/syscall.h | 2 +- kernel/trace/trace_syscalls.c | 86 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 91 insertions(+), 140 deletions(-)
arch/s390/kernel/ftrace.c +2 -65
@@ -206,73 +206,10 @@ out:#ifdef CONFIG_FTRACE_SYSCALLS -extern unsigned long __start_syscalls_metadata[]; -extern unsigned long __stop_syscalls_metadata[];extern unsigned int sys_call_table[]; -static struct syscall_metadata **syscalls_metadata; - -struct syscall_metadata *syscall_nr_to_meta (int nr) -{ -if (!syscalls_metadata || nr >= NR_syscalls || nr <0 ) -return NULL ; - -return syscalls_metadata[nr]; -} - -int syscall_name_to_nr (char *name) -{ -int i; - -if (!syscalls_metadata) -return -1 ; -for (i =0 ; i < NR_syscalls; i++) -if (syscalls_metadata[i]) -if (!strcmp (syscalls_metadata[i]->name, name)) -return i; -return -1 ; -} - -void set_syscall_enter_id (int num,int id) -{ - syscalls_metadata[num]->enter_id = id; -} - -void set_syscall_exit_id (int num,int id) +unsigned long __init arch_syscall_addr (int nr) { - syscalls_metadata[num]->exit_id = id; -} - -static struct syscall_metadata *find_syscall_meta (unsigned long syscall) -{ -struct syscall_metadata *start; -struct syscall_metadata *stop; -char str[KSYM_SYMBOL_LEN ]; - - start = (struct syscall_metadata *)__start_syscalls_metadata; - stop = (struct syscall_metadata *)__stop_syscalls_metadata; -kallsyms_lookup (syscall,NULL ,NULL ,NULL , str); - -for ( ; start < stop; start++) { -if (start->name && !strcmp (start->name +3 , str +3 )) -return start; - } -return NULL ; -} - -static int __init arch_init_ftrace_syscalls (void ) -{ -struct syscall_metadata *meta; -int i; - syscalls_metadata =kzalloc (sizeof (*syscalls_metadata) * NR_syscalls, -GFP_KERNEL ); -if (!syscalls_metadata) -return -ENOMEM ; -for (i =0 ; i < NR_syscalls; i++) { - meta =find_syscall_meta ((unsigned long )sys_call_table[i]); - syscalls_metadata[i] = meta; - } -return 0 ; +return (unsigned long )sys_call_table[nr]; } -arch_initcall (arch_init_ftrace_syscalls);#endif
arch/x86/kernel/ftrace.c +2 -74
84 lines not on this page · raw message
include/trace/syscall.h +1 -1
@@ -33,7 +33,7 @@ struct syscall_metadata { };#ifdef CONFIG_FTRACE_SYSCALLS -extern struct syscall_metadata *syscall_nr_to_meta (int nr); +extern unsigned long arch_syscall_addr (int nr);extern int syscall_name_to_nr (char *name);void set_syscall_enter_id (int num,int id);void set_syscall_exit_id (int num,int id);
kernel/trace/trace_syscalls.c +86 -0
98 lines not on this page · raw message
Signature · 1 line
1.6.2.3
PATCH 2/4 tracing: Document HAVE_SYSCALL_TRACEPOINTS needs
In reply to Frederic WeisbeckerDocument the arch needed requirements to get the support for syscalls tracing.
v2: HAVE_FTRACE_SYSCALLS have been changed to HAVE_SYSCALL_TRACEPOINTS
recently. Update this config name in the documentation then.
--- Documentation/trace/ftrace-design.txt | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-)
Documentation/trace/ftrace-design.txt +11 -2
@@ -213,10 +213,19 @@ If you can't trace NMI functions, then skip this option. <details to be filled> -HAVE_FTRACE_SYSCALLS +HAVE_SYSCALL_TRACEPOINTS --------------------- -<details to be filled> +You need very few things to get the syscalls tracing in an arch. + +- Have a NR_syscalls variable in <asm/unistd.h> that provides the number + of syscalls supported by the arch. +- Implement arch_syscall_addr() that resolves a syscall address from a + syscall number. +- Support the TIF_SYSCALL_TRACEPOINT thread flags +- Put the trace_sys_enter() and trace_sys_exit() tracepoints calls from ptrace + in the ptrace syscalls tracing path. +- Tag this arch as HAVE_SYSCALL_TRACEPOINTS. HAVE_FTRACE_MCOUNT_RECORD
Signature · 1 line
1.6.2.3
PATCH 3/4 ftrace: Copy ftrace_graph_filter boot param using strlcpy
In reply to Frederic WeisbeckerWe are using strncpy in the wrong way to copy the ftrace_graph_filter boot param because we pass the buffer size instead of the max string size it can contain (buffer size - 1). The end result might not be NULL terminated as we are abusing the max string size.
Lets use strlcpy() instead.
--- kernel/trace/ftrace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
kernel/trace/ftrace.c +1 -1
@@ -2293,7 +2293,7 @@ __setup("ftrace_filter=", set_ftrace_filter);#ifdef CONFIG_FUNCTION_GRAPH_TRACER static int __init set_graph_function (char *str) { -strncpy (ftrace_graph_buf, str,FTRACE_FILTER_SIZE ); +strlcpy (ftrace_graph_buf, str,FTRACE_FILTER_SIZE );return 1 ; }__setup ("ftrace_graph_filter=" , set_graph_function);
Signature · 1 line
1.6.2.3
PATCH 4/4 ftrace: Rename set_bootup_ftrace into set_cmdline_ftrace
In reply to Frederic Weisbeckerset_cmdline_ftrace is a better match against what does this function:
apply a tracer name from the kernel command line.
--- kernel/trace/trace.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
kernel/trace/trace.c +2 -2
@@ -129,7 +129,7 @@ static int tracing_set_tracer(const char *buf);static char bootup_tracer_buf[MAX_TRACER_SIZE ]__initdata ;static char *default_bootup_tracer; -static int __init set_bootup_ftrace (char *str) +static int __init set_cmdline_ftrace (char *str) {strncpy (bootup_tracer_buf, str,MAX_TRACER_SIZE ); default_bootup_tracer = bootup_tracer_buf;
@@ -137,7 +137,7 @@ static int __init set_bootup_ftrace(char *str) ring_buffer_expanded =1 ;return 1 ; } -__setup ("ftrace=" , set_bootup_ftrace); +__setup ("ftrace=" , set_cmdline_ftrace);static int __init set_ftrace_dump_on_oops (char *str) {
Signature · 1 line
1.6.2.3
Quoted 17 lines · Frederic Weisbecker
Ingo,
Please pull the tracing/core branch that can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git
tracing/coreThanks,
Frederic.---
Frederic Weisbecker (4):
tracing: Move syscalls metadata handling from arch to core
tracing: DocumentHAVE_SYSCALL_TRACEPOINTSneeds
ftrace: Copyftrace_graph_filterboot param using strlcpy
ftrace: Renameset_bootup_ftraceintoset_cmdline_ftrace
Quoted 8 lines
Documentation/trace/ftrace-design.txt | 13 ++++- arch/s390/kernel/ftrace.c | 67 +------------------------- arch/x86/kernel/ftrace.c | 76 +---------------------------- include/trace/syscall.h | 2 +- kernel/trace/ftrace.c | 2 +- kernel/trace/trace.c | 4 +- kernel/trace/trace_syscalls.c | 86 +++++++++++++++++++++++++++++++++ 7 files changed, 105 insertions(+), 145 deletions(-)
Pulled, thanks a lot Frederic!
Ingo