tracing: Minor fixes for the last pull request
Steven Rostedt
maintainerPATCH 3/5 tracing: Have error path in predicate_parse() free its allocated memory
In reply to Steven RostedtFrom: Navid Emamdoost <[email protected]>
In predicate_parse, there is an error path that is not going to out_free instead it returns directly which leads to a memory leak.
--- kernel/trace/trace_events_filter.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/trace/trace_events_filter.c +4 -2
@@ -452,8 +452,10 @@ predicate_parse(const char *str, int nr_parens, int nr_preds,switch (*next) {case '(' :/* #2 */ -if (top - op_stack > nr_parens) -return ERR_PTR (-EINVAL ); +if (top - op_stack > nr_parens) { + ret = -EINVAL ; + goto out_free; + } *(++top) = invert;continue ;case '!' :/* #3 */
Signature · 1 line
2.20.1
Steven Rostedt
maintainercover tracing: Minor fixes for the last pull request
Some final fix ups that will be sent to Linus shortly.
Changbin Du (1):
mm, tracing: Print symbol name for call_site in trace events
Masami Hiramatsu (1):
tracing/probe: Fix to check the difference of nr_args before adding probe
Nathan Chancellor (1):
tracing: Fix clang -Wint-in-bool-context warnings in IF_ASSIGN macro
Navid Emamdoost (1):
tracing: Have error path in predicate_parse() free its allocated memory
Steven Rostedt (VMware) (1):
selftests/ftrace: Fix same probe error test
----
include/trace/events/kmem.h | 7 ++++--- kernel/trace/trace.h | 10 +++++----- kernel/trace/trace_events_filter.c | 6 ++++-- kernel/trace/trace_probe.c | 16 ++++++++++++++++ .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 2 +- 5 files changed, 30 insertions(+), 11 deletions(-)
Steven Rostedt
maintainerPATCH 2/5 tracing: Fix clang -Wint-in-bool-context warnings in IF_ASSIGN macro
From: Nathan Chancellor <[email protected]>
After r372664 in clang, the IF_ASSIGN macro causes a couple hundred warnings along the lines of:
kernel/trace/trace_output.c:1331:2: warning: converting the enum constant to a boolean [-Wint-in-bool-context] kernel/trace/trace.h:409:3: note: expanded from macro 'trace_assign_type'
IF_ASSIGN(var, ent, struct ftrace_graph_ret_entry, ^kernel/trace/trace.h:371:14: note: expanded from macro 'IF_ASSIGN'
WARN_ON(id && (entry)->type != id); \
^264 warnings generated.
This warning can catch issues with constructs like:
if (state == A || B)
where the developer really meant:
if (state == A || state == B)
This is currently the only occurrence of the warning in the kernel tree across defconfig, allyesconfig, allmodconfig for arm32, arm64, and x86_64. Add the implicit '!= 0' to the WARN_ON statement to fix the warnings and find potential issues in the future.
--- kernel/trace/trace.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/trace/trace.h +5 -5
@@ -365,11 +365,11 @@ static inline struct trace_array *top_trace_array(void) __builtin_types_compatible_p(typeof(var), type *) #undef IF_ASSIGN -#define IF_ASSIGN(var, entry, etype, id) \ -if (FTRACE_CMP_TYPE (var, etype)) { \ - var = (typeof (var))(entry); \ -WARN_ON (id && (entry)->type != id); \ -break ; \ +#define IF_ASSIGN(var, entry, etype, id) \ +if (FTRACE_CMP_TYPE (var, etype)) { \ + var = (typeof (var))(entry); \ +WARN_ON (id !=0 && (entry)->type != id); \ +break ; \ }/* Will cause compile errors if type is not found. */
Signature · 1 line
2.20.1
Steven Rostedt
maintainerPATCH 5/5 selftests/ftrace: Fix same probe error test
In reply to Steven RostedtFrom: "Steven Rostedt (VMware)" <[email protected]>
The "same probe" selftest that tests that adding the same probe fails doesn't add the same probe and passes, which fails the test.
--- .../selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc +1 -1
@@ -95,7 +95,7 @@ echo 'p:kprobes/testevent _do_fork abcd=\1' > kprobe_events check_error 'p:kprobes/testevent _do_fork ^bcd=\1' # DIFF_ARG_TYPE check_error 'p:kprobes/testevent _do_fork ^abcd=\1:u8' # DIFF_ARG_TYPE check_error 'p:kprobes/testevent _do_fork ^abcd=\"foo"' # DIFF_ARG_TYPE -check_error '^p:kprobes/testevent _do_fork' # SAME_PROBE +check_error '^p:kprobes/testevent _do_fork abcd=\1' # SAME_PROBE fi exit 0
Signature · 1 line
2.20.1
Steven Rostedt
maintainerPATCH 1/5 tracing/probe: Fix to check the difference of nr_args before adding probe
In reply to Steven RostedtFrom: Masami Hiramatsu <[email protected]>
Steven reported that a test triggered:
==================================================================
BUG: KASAN: slab-out-of-bounds in trace_kprobe_create+0xa9e/0xe40 Read of size 8 at addr ffff8880c4f25a48 by task ftracetest/4798 CPU: 2 PID: 4798 Comm: ftracetest Not tainted 5.3.0-rc6-test+ #30 Hardware name: Hewlett-Packard HP Compaq Pro 6300 SFF/339A, BIOS K01 v03.03 07/14/2016 Call Trace: dump_stack+0x7c/0xc0 ? trace_kprobe_create+0xa9e/0xe40 print_address_description+0x6c/0x332 ? trace_kprobe_create+0xa9e/0xe40 ? trace_kprobe_create+0xa9e/0xe40 __kasan_report.cold.6+0x1a/0x3b ? trace_kprobe_create+0xa9e/0xe40 kasan_report+0xe/0x12 trace_kprobe_create+0xa9e/0xe40 ? print_kprobe_event+0x280/0x280 ? match_held_lock+0x1b/0x240 ? find_held_lock+0xac/0xd0 ? fs_reclaim_release.part.112+0x5/0x20 ? lock_downgrade+0x350/0x350 ? kasan_unpoison_shadow+0x30/0x40 ? __kasan_kmalloc.constprop.6+0xc1/0xd0 ? trace_kprobe_create+0xe40/0xe40 ? trace_kprobe_create+0xe40/0xe40 create_or_delete_trace_kprobe+0x2e/0x60 trace_run_command+0xc3/0xe0 ? trace_panic_handler+0x20/0x20 ? kasan_unpoison_shadow+0x30/0x40 trace_parse_run_command+0xdc/0x163 vfs_write+0xe1/0x240 ksys_write+0xba/0x150 ? __ia32_sys_read+0x50/0x50 ? tracer_hardirqs_on+0x61/0x180 ? trace_hardirqs_off_caller+0x43/0x110 ? mark_held_locks+0x29/0xa0 ? do_syscall_64+0x14/0x260 do_syscall_64+0x68/0x260
Fix to check the difference of nr_args before adding probe on existing probes. This also may set the error log index bigger than the number of command parameters. In that case it sets the error position is next to the last parameter.
--- kernel/trace/trace_probe.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
kernel/trace/trace_probe.c +16 -0
@@ -178,6 +178,16 @@ void __trace_probe_log_err(int offset, int err_type)if (!command)return ; +if (trace_probe_log.index >= trace_probe_log.argc) { +/** +* Set the error position is next to the last arg + space. +* Note that len includes the terminal null and the cursor +* appaers at pos + 1. +*/ + pos = len; + offset =0 ; + } +/* And make a command string from argv array */ p = command;for (i =0 ; i < trace_probe_log.argc; i++) {
@@ -1084,6 +1094,12 @@ int trace_probe_compare_arg_type(struct trace_probe *a, struct trace_probe *b) {int i; +/* In case of more arguments */ +if (a->nr_args < b->nr_args) +return a->nr_args +1 ; +if (a->nr_args > b->nr_args) +return b->nr_args +1 ; +for (i =0 ; i < a->nr_args; i++) { if ((b->nr_args <= i) || ((a->args[i].type != b->args[i].type) ||
Signature · 1 line
2.20.1
Steven Rostedt
maintainerPATCH 4/5 mm, tracing: Print symbol name for call_site in trace events
In reply to Steven RostedtFrom: Changbin Du <[email protected]>
To improve the readability of raw slab trace points, print the call_site ip using '%pS'. Then we can grep events with function names.
[002] .... 808.188897: kmem_cache_free: call_site=putname+0x47/0x50 ptr=00000000cef40c80 [002] .... 808.188898: kfree: call_site=security_cred_free+0x42/0x50 ptr=0000000062400820 [002] .... 808.188904: kmem_cache_free: call_site=put_cred_rcu+0x88/0xa0 ptr=0000000058d74ef8 [002] .... 808.188913: kmem_cache_alloc: call_site=prepare_creds+0x26/0x100 ptr=0000000058d74ef8 bytes_req=168 bytes_alloc=576 gfp_flags=GFP_KERNEL [002] .... 808.188917: kmalloc: call_site=security_prepare_creds+0x77/0xa0 ptr=0000000062400820 bytes_req=8 bytes_alloc=336 gfp_flags=GFP_KERNEL|__GFP_ZERO [002] .... 808.188920: kmem_cache_alloc: call_site=getname_flags+0x4f/0x1e0 ptr=00000000cef40c80 bytes_req=4096 bytes_alloc=4480 gfp_flags=GFP_KERNEL [002] .... 808.188925: kmem_cache_free: call_site=putname+0x47/0x50 ptr=00000000cef40c80 [002] .... 808.188926: kfree: call_site=security_cred_free+0x42/0x50 ptr=0000000062400820 [002] .... 808.188931: kmem_cache_free: call_site=put_cred_rcu+0x88/0xa0 ptr=0000000058d74ef8
--- include/trace/events/kmem.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
include/trace/events/kmem.h +4 -3
@@ -35,8 +35,8 @@ DECLARE_EVENT_CLASS(kmem_alloc, __entry->gfp_flags = gfp_flags; ), - TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s", - __entry->call_site, + TP_printk("call_site=%pS ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s", + (void *)__entry->call_site, __entry->ptr, __entry->bytes_req, __entry->bytes_alloc,
@@ -131,7 +131,8 @@ DECLARE_EVENT_CLASS(kmem_free, __entry->ptr = ptr; ), -TP_printk ("call_site=%lx ptr=%p" , __entry->call_site, __entry->ptr) +TP_printk ("call_site=%pS ptr=%p" , + (void *)__entry->call_site, __entry->ptr) ); DEFINE_EVENT(kmem_free, kfree,
Signature · 1 line
2.20.1