]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
tracing: branch: Fix inverted check on stat tracer registration
authorBreno Leitao <leitao@debian.org>
Mon, 20 Apr 2026 13:25:09 +0000 (06:25 -0700)
committerSteven Rostedt <rostedt@goodmis.org>
Tue, 28 Apr 2026 18:28:29 +0000 (14:28 -0400)
init_annotated_branch_stats() and all_annotated_branch_stats() check the
return value of register_stat_tracer() with "if (!ret)", but
register_stat_tracer() returns 0 on success and a negative errno on
failure. The inverted check causes the warning to be printed on every
successful registration, e.g.:

  Warning: could not register annotated branches stats

while leaving real failures silent. The initcall also returned a
hard-coded 1 instead of the actual error.

Invert the check and propagate ret so that the warning fires on real
errors and the initcall reports the correct status.

Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: https://patch.msgid.link/20260420-tracing-v1-1-d8f4cd0d6af1@debian.org
Fixes: 002bb86d8d42 ("tracing/ftrace: separate events tracing and stats tracing engine")
Signed-off-by: Breno Leitao <leitao@debian.org>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
kernel/trace/trace_branch.c

index 6809b370e991d81fab16a0b37d8d1cf18f5e5dd8..d1564db95a8f5a003a38ec15cfe9d870ffbdee27 100644 (file)
@@ -373,10 +373,10 @@ __init static int init_annotated_branch_stats(void)
        int ret;
 
        ret = register_stat_tracer(&annotated_branch_stats);
-       if (!ret) {
+       if (ret) {
                printk(KERN_WARNING "Warning: could not register "
                                    "annotated branches stats\n");
-               return 1;
+               return ret;
        }
        return 0;
 }
@@ -438,10 +438,10 @@ __init static int all_annotated_branch_stats(void)
        int ret;
 
        ret = register_stat_tracer(&all_branch_stats);
-       if (!ret) {
+       if (ret) {
                printk(KERN_WARNING "Warning: could not register "
                                    "all branches stats\n");
-               return 1;
+               return ret;
        }
        return 0;
 }