From: Masami Hiramatsu (Google) <mhiramat@kernel.org>
To: Breno Leitao <leitao@debian.org>
Cc: Steven Rostedt <rostedt@goodmis.org>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
Steven Rostedt <srostedt@redhat.com>,
linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org,
paulmck@kernel.org, kernel-team@meta.com
Subject: Re: [PATCH] tracing: branch: Fix inverted check on stat tracer registration
Date: Tue, 21 Apr 2026 08:57:25 +0900 [thread overview]
Message-ID: <20260421085725.4e5c8ebf3a5e0470bab61e4e@kernel.org> (raw)
In-Reply-To: <20260420-tracing-v1-1-d8f4cd0d6af1@debian.org>
On Mon, 20 Apr 2026 06:25:09 -0700
Breno Leitao <leitao@debian.org> wrote:
> 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.
>
Good catch!
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Thanks,
> Fixes: 002bb86d8d42 ("tracing/ftrace: separate events tracing and stats tracing engine")
> Signed-off-by: Breno Leitao <leitao@debian.org>
> ---
> kernel/trace/trace_branch.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/trace/trace_branch.c b/kernel/trace/trace_branch.c
> index 6809b370e991d..d1564db95a8f5 100644
> --- a/kernel/trace/trace_branch.c
> +++ b/kernel/trace/trace_branch.c
> @@ -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;
> }
>
> ---
> base-commit: c7275b05bc428c7373d97aa2da02d3a7fa6b9f66
> change-id: 20260420-tracing-3f1367ee4b93
>
> Best regards,
> --
> Breno Leitao <leitao@debian.org>
>
--
Masami Hiramatsu (Google) <mhiramat@kernel.org>
prev parent reply other threads:[~2026-04-20 23:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-20 13:25 [PATCH] tracing: branch: Fix inverted check on stat tracer registration Breno Leitao
2026-04-20 23:57 ` Masami Hiramatsu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260421085725.4e5c8ebf3a5e0470bab61e4e@kernel.org \
--to=mhiramat@kernel.org \
--cc=fweisbec@gmail.com \
--cc=kernel-team@meta.com \
--cc=leitao@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@elte.hu \
--cc=paulmck@kernel.org \
--cc=rostedt@goodmis.org \
--cc=srostedt@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox