From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C9E22157A5A; Sat, 30 May 2026 17:24:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161897; cv=none; b=QmDTEFDp0ln2A45X3Kfq83GZPrl32DgefcJZE1l7k2jpQngp/86E8jnGZCG7VYeyIOLHwWePzZNmIHdT4YQeru3yUCDjkwRWban5nQpyu3pLv1LFv1xG40NOr8HEyRb849e82ODKwup7ZHkpNdnFdYfgj6xjwbRVo4Gdg8uOO5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161897; c=relaxed/simple; bh=nfgfLPg6W5KkmuTbGjLuWKmFfcxQdsqcOe8T6BtZiQ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oprMWoi5G3Bp0lUQYkze4qiCF8M6c6bK0FYjgW+K+XurFBOBDy7wJ0HB0tHX7D4qdJAaSjw0CS6bAVyLF7InLj6lz/oHR290vv5AsKzw/Bm+W3KdQT08lhEqyJtMxDZlvxiou/qAcWSRLnrxN68qqgo6NKHmATrJqixGeTmdnN4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XITedFJA; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="XITedFJA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AA4C1F00893; Sat, 30 May 2026 17:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161895; bh=PA4kUlVe9a2Gg66PjokF2rZLQVADU7Phrn046p49B68=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XITedFJASR4vhHw6RTyPjWgkgjN7gcuewy3JF/gu5Dl8gAsqniZD7ZgJhD9oC02I1 m860fsk8EWvwogZ8uUCzMYyOmXTGJurbFu2V/tahk8DocDsYhUcF1Hz04Rg7yfl4CD YyFEmsXEvyoW2cTRFQwlpVc/84RaO4qTHoitm7Ag= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mathieu Desnoyers , Ingo Molnar , Frederic Weisbecker , Breno Leitao , "Masami Hiramatsu (Google)" , Steven Rostedt , Sasha Levin Subject: [PATCH 6.1 732/969] tracing: branch: Fix inverted check on stat tracer registration Date: Sat, 30 May 2026 18:04:16 +0200 Message-ID: <20260530160320.756941634@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Breno Leitao [ Upstream commit 3b75dd76e64a04771861bb5647951c264919e563 ] 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 Cc: Ingo Molnar Cc: Frederic Weisbecker 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 Acked-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt Signed-off-by: Sasha Levin --- 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 e47fdb4c92fbc..30f72e0ecb5d4 100644 --- a/kernel/trace/trace_branch.c +++ b/kernel/trace/trace_branch.c @@ -379,10 +379,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; } @@ -444,10 +444,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; } -- 2.53.0