From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 D8E01332608 for ; Wed, 29 Apr 2026 20:14:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777493691; cv=none; b=Bl7zQ1quikbI8OlLOoL9lMikg9QTgnN46d/SFC1yTZ6zbQMpBKd+zmUsHu/asbwqt/h+bcWQyxdT4eRhQPWz4UNCtdZ6q/Z3if2laR1iJ9m3X511JADJ7aSVihg4tRg3SXgXleXDlDMQdzDuglT6TACaZkarFnAWE5uufYAiG5M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777493691; c=relaxed/simple; bh=JcAbi55XZmwwzMWUCvzjcBCJ4uFIk2EewuWEV1pzCRU=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=J/kCq1uVTr+vGSWkZnFaEJ2zTaWu26Sr+BvMH5kik0tgo8EIpZX9thjulp8jozgvxmI1dyOwzbew+NpQdXif2SzbclfnLCDgrUFqk/ImZiodTHTMkVdP18G3UoBKP7buGfVnTM6iC9ZjRCemJkdUvBrCM17AYK/ITohBmHrAKvQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=phEwiMFm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="phEwiMFm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A2422C2BCC6; Wed, 29 Apr 2026 20:14:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777493691; bh=JcAbi55XZmwwzMWUCvzjcBCJ4uFIk2EewuWEV1pzCRU=; h=Date:From:To:Cc:Subject:References:From; b=phEwiMFmGLIxAYbyCuB7VbYCkcKXT3rJE+JxhrufKYWzt63B4Yqe/RTsbTkSMMbUm ay46ld2UlHIfv+2mwLksI/5sKt88zBAWR2+6G3v1JPZPGSSq6oFKlGoVdO9C/lR9BO RNbgj9WUY9vgr7IZcVKxs33BPhYZIhgyUypdS2W7ZAzMw7uJcu4T/Nq2IDFeCn/KwM s8Q2niAbAr1/7DfcQ6WX7FqPp9LgIQSxN4O1sFsHY/C3egpC5Kd3UgP8P+NmzZFs3p DjeDL/2z+zelRQa3gYqt3ZadVXTrvZLHM6u6InRjFm8GwcJNd3bAgHUfeKAXmelnEJ pwy23VL24vGuA== Received: from rostedt by gandalf with local (Exim 4.99.1) (envelope-from ) id 1wIBJN-00000003m5J-1OwZ; Wed, 29 Apr 2026 16:15:09 -0400 Message-ID: <20260429201509.194600092@kernel.org> User-Agent: quilt/0.69 Date: Wed, 29 Apr 2026 16:14:54 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Ingo Molnar , Frederic Weisbecker , Breno Leitao Subject: [for-linus][PATCH 1/3] tracing: branch: Fix inverted check on stat tracer registration References: <20260429201453.449214720@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 From: Breno Leitao 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 --- 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 6809b370e991..d1564db95a8f 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; } -- 2.53.0