Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'probes-fixes-v6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
Pull probe fixes from Masami Hiramatsu:
- tprobe-events: Fix to register tracepoint correctly
tprobe-events missed to set tracepoint data structure before
registering callback when enabling it. This sets it correctly.
- tprobe-events: Fix to put tracepoint_user when disable the event
tprobe-events missed to unregister tracepoint callback when the event
is disabled. This ensures to unregister it.
* tag 'probes-fixes-v6.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing: tprobe-events: Fix to put tracepoint_user when disable the tprobe
tracing: tprobe-events: Fix to register tracepoint correctly
+6
-1
+6
-1
kernel/trace/trace_fprobe.c
+6
-1
kernel/trace/trace_fprobe.c
···
106
106
if (!tuser->name)
107
107
return NULL;
108
108
109
+
/* Register tracepoint if it is loaded. */
109
110
if (tpoint) {
111
+
tuser->tpoint = tpoint;
110
112
ret = tracepoint_user_register(tuser);
111
113
if (ret)
112
114
return ERR_PTR(ret);
113
115
}
114
116
115
-
tuser->tpoint = tpoint;
116
117
tuser->refcount = 1;
117
118
INIT_LIST_HEAD(&tuser->list);
118
119
list_add(&tuser->list, &tracepoint_user_list);
···
1514
1513
if (!trace_probe_is_enabled(tp)) {
1515
1514
list_for_each_entry(tf, trace_probe_probe_list(tp), tp.list) {
1516
1515
unregister_fprobe(&tf->fp);
1516
+
if (tf->tuser) {
1517
+
tracepoint_user_put(tf->tuser);
1518
+
tf->tuser = NULL;
1519
+
}
1517
1520
}
1518
1521
}
1519
1522