Skip to content

Commit 0a8bb68

Browse files
committed
tracing: tprobe-events: Fix to clean up tprobe correctly when module unload
When unloading module, the tprobe events are not correctly cleaned up. Thus it becomes `fprobe-event` and never be enabled again even if loading the same module again. For example; # cd /sys/kernel/tracing # modprobe trace_events_sample # echo 't:my_tprobe foo_bar' >> dynamic_events # cat dynamic_events t:tracepoints/my_tprobe foo_bar # rmmod trace_events_sample # cat dynamic_events f:tracepoints/my_tprobe foo_bar As you can see, the second time my_tprobe starts with 'f' instead of 't'. This unregisters the fprobe and tracepoint callback when module is unloaded but marks the fprobe-event is tprobe-event. Link: https://lore.kernel.org/all/174158724946.189309.15826571379395619524.stgit@mhiramat.tok.corp.google.com/ Fixes: 57a7e6d ("tracing/fprobe: Support raw tracepoints on future loaded modules") Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
1 parent 80e54e8 commit 0a8bb68

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

kernel/trace/trace_fprobe.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,10 +1008,13 @@ static int __tracepoint_probe_module_cb(struct notifier_block *self,
10081008
reenable_trace_fprobe(tf);
10091009
}
10101010
} else if (val == MODULE_STATE_GOING && tp_mod->mod == tf->mod) {
1011-
tracepoint_probe_unregister(tf->tpoint,
1011+
unregister_fprobe(&tf->fp);
1012+
if (trace_fprobe_is_tracepoint(tf)) {
1013+
tracepoint_probe_unregister(tf->tpoint,
10121014
tf->tpoint->probestub, NULL);
1013-
tf->tpoint = NULL;
1014-
tf->mod = NULL;
1015+
tf->tpoint = TRACEPOINT_STUB;
1016+
tf->mod = NULL;
1017+
}
10151018
}
10161019
}
10171020
mutex_unlock(&event_mutex);

0 commit comments

Comments
 (0)