Skip to content

Commit 7249921

Browse files
committed
tracing/perf: Fix double put of trace event when init fails
If in perf_trace_event_init(), the perf_trace_event_open() fails, then it will call perf_trace_event_unreg() which will not only unregister the perf trace event, but will also call the put() function of the tp_event. The problem here is that the trace_event_try_get_ref() is called by the caller of perf_trace_event_init() and if perf_trace_event_init() returns a failure, it will then call trace_event_put(). But since the perf_trace_event_unreg() already called the trace_event_put() function, it triggers a WARN_ON(). WARNING: CPU: 1 PID: 30309 at kernel/trace/trace_dynevent.c:46 trace_event_dyn_put_ref+0x15/0x20 If perf_trace_event_reg() does not call the trace_event_try_get_ref() then the perf_trace_event_unreg() should not be calling trace_event_put(). This breaks symmetry and causes bugs like these. Pull out the trace_event_put() from perf_trace_event_unreg() and call it in the locations that perf_trace_event_unreg() is called. This not only fixes this bug, but also brings back the proper symmetry of the reg/unreg vs get/put logic. Link: https://lore.kernel.org/all/[email protected]/ Link: https://lkml.kernel.org/r/[email protected] Cc: [email protected] Fixes: 1d18538 ("tracing: Have dynamic events have a ref counter") Reported-by: Krister Johansen <[email protected]> Reviewed-by: Krister Johansen <[email protected]> Tested-by: Krister Johansen <[email protected]> Acked-by: Jiri Olsa <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent d8a6431 commit 7249921

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

kernel/trace/trace_event_perf.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ static void perf_trace_event_unreg(struct perf_event *p_event)
157157
int i;
158158

159159
if (--tp_event->perf_refcount > 0)
160-
goto out;
160+
return;
161161

162162
tp_event->class->reg(tp_event, TRACE_REG_PERF_UNREGISTER, NULL);
163163

@@ -176,8 +176,6 @@ static void perf_trace_event_unreg(struct perf_event *p_event)
176176
perf_trace_buf[i] = NULL;
177177
}
178178
}
179-
out:
180-
trace_event_put_ref(tp_event);
181179
}
182180

183181
static int perf_trace_event_open(struct perf_event *p_event)
@@ -241,6 +239,7 @@ void perf_trace_destroy(struct perf_event *p_event)
241239
mutex_lock(&event_mutex);
242240
perf_trace_event_close(p_event);
243241
perf_trace_event_unreg(p_event);
242+
trace_event_put_ref(p_event->tp_event);
244243
mutex_unlock(&event_mutex);
245244
}
246245

@@ -292,6 +291,7 @@ void perf_kprobe_destroy(struct perf_event *p_event)
292291
mutex_lock(&event_mutex);
293292
perf_trace_event_close(p_event);
294293
perf_trace_event_unreg(p_event);
294+
trace_event_put_ref(p_event->tp_event);
295295
mutex_unlock(&event_mutex);
296296

297297
destroy_local_trace_kprobe(p_event->tp_event);
@@ -347,6 +347,7 @@ void perf_uprobe_destroy(struct perf_event *p_event)
347347
mutex_lock(&event_mutex);
348348
perf_trace_event_close(p_event);
349349
perf_trace_event_unreg(p_event);
350+
trace_event_put_ref(p_event->tp_event);
350351
mutex_unlock(&event_mutex);
351352
destroy_local_trace_uprobe(p_event->tp_event);
352353
}

0 commit comments

Comments
 (0)