tracing: Fixes for 5.19
Subsystems (3)
Steven Rostedt
maintainercover tracing: Fixes for 5.19
Gautam Menghani (1):
tracing/uprobes: Remove unwanted initialization in __trace_uprobe_create()
Masami Hiramatsu (Google) (1):
tracing/kprobes: Check whether get_kretprobe() returns NULL in kretprobe_dispatcher()
Xiang wangx (1):
tracefs: Fix syntax errors in comments
sunliming (1):
tracing: Simplify conditional compilation code in tracing_set_tracer()
----
fs/tracefs/inode.c | 2 +- kernel/trace/trace.c | 2 -- kernel/trace/trace_kprobe.c | 11 ++++++++++- kernel/trace/trace_uprobe.c | 1 - 4 files changed, 11 insertions(+), 5 deletions(-)
Steven Rostedt
maintainerPATCH 1/4 tracing/kprobes: Check whether get_kretprobe() returns NULL in kretprobe_dispatcher()
From: "Masami Hiramatsu (Google)" <[email protected]>
There is a small chance that get_kretprobe(ri) returns NULL in kretprobe_dispatcher() when another CPU unregisters the kretprobe right after __kretprobe_trampoline_handler().
To avoid this issue, kretprobe_dispatcher() checks the get_kretprobe() return value again. And if it is NULL, it returns soon because that kretprobe is under unregistering process.
This issue has been introduced when the kretprobe is decoupled from the struct kretprobe_instance by commit d741bf41d7c7 ("kprobes: Remove kretprobe hash"). Before that commit, the struct kretprob_instance::rp directly points the kretprobe and it is never be NULL.
--- kernel/trace/trace_kprobe.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
kernel/trace/trace_kprobe.c +10 -1
@@ -1718,8 +1718,17 @@ static int kretprobe_dispatcher(struct kretprobe_instance *ri, struct pt_regs *regs) { struct kretprobe *rp = get_kretprobe(ri); - struct trace_kprobe *tk = container_of(rp, struct trace_kprobe, rp); +struct trace_kprobe *tk; + +/* +* There is a small chance that get_kretprobe(ri) returns NULL when +* the kretprobe is unregister on another CPU between kretprobe's +* trampoline_handler and this function. +*/ +if (unlikely (!rp)) +return 0 ; + tk = container_of(rp, struct trace_kprobe, rp);raw_cpu_inc (*tk->nhit);if (trace_probe_test_flag (&tk->tp,TP_FLAG_TRACE ))
Signature · 1 line
2.35.1
Steven Rostedt
maintainerPATCH 2/4 tracing: Simplify conditional compilation code in tracing_set_tracer()
In reply to Steven RostedtFrom: sunliming <[email protected]>
Two conditional compilation directives "#ifdef CONFIG_TRACER_MAX_TRACE" are used consecutively, and no other code in between. Simplify conditional the compilation code and only use one "#ifdef CONFIG_TRACER_MAX_TRACE".
--- kernel/trace/trace.c | 2 -- 1 file changed, 2 deletions(-)
kernel/trace/trace.c +0 -2
@@ -6424,9 +6424,7 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf)synchronize_rcu ();free_snapshot (tr); } -#endif -#ifdef CONFIG_TRACER_MAX_TRACE if (t->use_max_tr && !had_max_tr) { ret =tracing_alloc_snapshot_instance (tr);if (ret <0 )
Signature · 1 line
2.35.1
Steven Rostedt
maintainerPATCH 3/4 tracefs: Fix syntax errors in comments
In reply to Steven RostedtFrom: Xiang wangx <[email protected]>
Delete the redundant word 'to'.
--- fs/tracefs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/tracefs/inode.c +1 -1
@@ -553,7 +553,7 @@ struct dentry *tracefs_create_dir(const char *name, struct dentry *parent)* * Only one instances directory is allowed. * -* The instances directory is special as it allows for mkdir and rmdir to +* The instances directory is special as it allows for mkdir and rmdir * to be done by userspace. When a mkdir or rmdir is performed, the inode * locks are released and the methods passed in (@mkdir and @rmdir) are * called without locks and with the name of the directory being created
Signature · 1 line
2.35.1
Steven Rostedt
maintainerPATCH 4/4 tracing/uprobes: Remove unwanted initialization in __trace_uprobe_create()
In reply to Steven RostedtFrom: Gautam Menghani <[email protected]>
Remove the unwanted initialization of variable 'ret'. This fixes the clang scan warning: Value stored to 'ret' is never read [deadcode.DeadStores]
--- kernel/trace/trace_uprobe.c | 1 - 1 file changed, 1 deletion(-)
kernel/trace/trace_uprobe.c +0 -1
@@ -546,7 +546,6 @@ static int __trace_uprobe_create(int argc, const char **argv)bool is_return = false;int i, ret; - ret =0 ; ref_ctr_offset =0 ;switch (argv[0 ][0 ]) {
Signature · 1 line
2.35.1