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 6FD2714A60F; Sat, 30 May 2026 18:46:10 +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=1780166771; cv=none; b=TEuyac0vavwbRiGB7du4+iObMjqN2Z0yh2/NtwV9p92ajVbdhDPXSe7pthVCk6yNufC2w2Z2j77RqnK/A3ojLTUAzbUE6uWyt/JyNpYoPhBLyEsHQ2XwJJgOxWhEkFs2qtmeBLXiufVmaiiqGVlpV6pOXnC/X1TAWWad6gray9M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780166771; c=relaxed/simple; bh=7cq4oE7Dv2kZxmhu0L/W012/mpFliW/sCXZe4Rhq5UM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JzmlrYu6tDlSz0NrMdPq1wyCcVLAR1u8NKYIYHFXXQDBVwKeZPGLLICvM2BiR4yBCEXfsTLbeuFVdWeE2XqSH9vUq4toSnubIcw/sfX6lSRYbHXr61F5U90A5xPIJwNgnB7a8ysSSH7ZKlCwrXtSfOf+r4+qTRd5ENAY/UWHFQo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Da5wM5O9; 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="Da5wM5O9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C29D81F00893; Sat, 30 May 2026 18:46:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780166770; bh=jcdGoafhcpL1760BFsKwTxekeBIRvZiWXISXrxjEjcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Da5wM5O9tjc4hl5ga1Gwz/WTb5k7TYu5E1O9a2EUP/AoEYtlKRag3ZuFmXSzKbv+U Ee5luslV7Hfnv00diJlnq+9/PJz8RiX13n2P+rFSWzBL4fSRa1h1S5ZOGFXqaP84gk zkaJLZ9nLkCxdLnEH6IXiOXi96z0qGAYfh/Bmm0o= 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 5.10 465/589] tracing: branch: Fix inverted check on stat tracer registration Date: Sat, 30 May 2026 18:05:46 +0200 Message-ID: <20260530160236.883655382@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@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 5.10-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 eff099123aa27..363302960ba9e 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