Skip to content

Commit 7bcadb3

Browse files
devnexengregkh
authored andcommitted
tracepoint: balance regfunc() on func_add() failure in tracepoint_add_func()
[ Upstream commit fad217e ] When a tracepoint goes through the 0 -> 1 transition, tracepoint_add_func() invokes the subsystem's ext->regfunc() before attempting to install the new probe via func_add(). If func_add() then fails (for example, when allocate_probes() cannot allocate a new probe array under memory pressure and returns -ENOMEM), the function returns the error without calling the matching ext->unregfunc(), leaving the side effects of regfunc() behind with no installed probe to justify them. For syscall tracepoints this is particularly unpleasant: syscall_regfunc() bumps sys_tracepoint_refcount and sets SYSCALL_TRACEPOINT on every task. After a leaked failure, the refcount is stuck at a non-zero value with no consumer, and every task continues paying the syscall trace entry/exit overhead until reboot. Other subsystems providing regfunc()/unregfunc() pairs exhibit similarly scoped persistent state. Mirror the existing 1 -> 0 cleanup and call ext->unregfunc() in the func_add() error path, gated on the same condition used there so the unwind is symmetric with the registration. Fixes: 8cf868a ("tracing: Have the reg function allow to fail") Cc: stable@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Link: https://patch.msgid.link/20260413190601.21993-1-devnexen@gmail.com Signed-off-by: David Carlier <devnexen@gmail.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> [ changed `tp->ext->unregfunc` to `tp->unregfunc` to match older struct layout ] Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 113c065 commit 7bcadb3

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

kernel/tracepoint.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ static int tracepoint_add_func(struct tracepoint *tp,
337337
lockdep_is_held(&tracepoints_mutex));
338338
old = func_add(&tp_funcs, func, prio);
339339
if (IS_ERR(old)) {
340+
if (tp->unregfunc && !static_key_enabled(&tp->key))
341+
tp->unregfunc();
340342
WARN_ON_ONCE(warn && PTR_ERR(old) != -ENOMEM);
341343
return PTR_ERR(old);
342344
}

0 commit comments

Comments
 (0)