From: Jinchao Wang <wangjinchao600@gmail.com>
To: pmladek@suse.com, akpm@linux-foundation.org,
Steven Rostedt <rostedt@goodmis.org>,
John Ogness <john.ogness@linutronix.de>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: linux-kernel@vger.kernel.org, feng.tang@linux.alibaba.com,
joel.granados@kernel.org, wangjinchao600@gmail.com,
namcao@linutronix.de, sravankumarlpu@gmail.com
Subject: [PATCH 6/9] printk/nbcon: use panic_on_this_cpu() helper
Date: Wed, 20 Aug 2025 17:14:51 +0800 [thread overview]
Message-ID: <20250820091702.512524-7-wangjinchao600@gmail.com> (raw)
In-Reply-To: <20250820091702.512524-6-wangjinchao600@gmail.com>
nbcon_context_try_acquire() compared
panic_cpu directly with smp_processor_id().
This open-coded check is now provided by
panic_on_this_cpu().
Switch to panic_on_this_cpu() to simplify
the code and improve readability.
Signed-off-by: Jinchao Wang <wangjinchao600@gmail.com>
---
kernel/printk/nbcon.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/printk/nbcon.c b/kernel/printk/nbcon.c
index 646801813415..7490865e2f44 100644
--- a/kernel/printk/nbcon.c
+++ b/kernel/printk/nbcon.c
@@ -2,6 +2,7 @@
// Copyright (C) 2022 Linutronix GmbH, John Ogness
// Copyright (C) 2022 Intel, Thomas Gleixner
+#include "linux/panic.h"
#include <linux/atomic.h>
#include <linux/bug.h>
#include <linux/console.h>
@@ -589,7 +590,6 @@ static struct printk_buffers panic_nbcon_pbufs;
*/
static bool nbcon_context_try_acquire(struct nbcon_context *ctxt, bool is_reacquire)
{
- unsigned int cpu = smp_processor_id();
struct console *con = ctxt->console;
struct nbcon_state cur;
int err;
@@ -614,7 +614,7 @@ static bool nbcon_context_try_acquire(struct nbcon_context *ctxt, bool is_reacqu
/* Acquire succeeded. */
/* Assign the appropriate buffer for this context. */
- if (atomic_read(&panic_cpu) == cpu)
+ if (panic_on_this_cpu())
ctxt->pbufs = &panic_nbcon_pbufs;
else
ctxt->pbufs = con->pbufs;
--
2.43.0
next prev parent reply other threads:[~2025-08-20 9:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-20 9:14 [PATCH 0/9] panic: introduce panic status function family Jinchao Wang
2025-08-20 9:14 ` [PATCH 1/9] panic: Introduce helper functions for panic state Jinchao Wang
2025-08-20 9:14 ` [PATCH 2/9] fbdev: Use panic_in_progress() helper Jinchao Wang
2025-08-20 9:14 ` [PATCH 3/9] crash_core: use panic_try_start() in crash_kexec() Jinchao Wang
2025-08-20 9:14 ` [PATCH 4/9] panic: use panic_try_start() in nmi_panic() Jinchao Wang
2025-08-20 9:14 ` [PATCH 5/9] panic: use panic_try_start() in vpanic() Jinchao Wang
2025-08-20 9:14 ` Jinchao Wang [this message]
2025-08-20 9:14 ` [PATCH 7/9] panic/printk: replace this_cpu_in_panic() with panic_on_this_cpu() Jinchao Wang
2025-08-20 9:14 ` [PATCH 8/9] panic/printk: replace other_cpu_in_panic() with panic_on_other_cpu() Jinchao Wang
2025-08-20 9:14 ` [PATCH 9/9] watchdog: skip checks when panic is in progress Jinchao Wang
2025-08-20 15:18 ` Yury Norov
2025-08-21 1:29 ` Jinchao Wang
2025-08-25 10:05 ` [PATCH 8/9] panic/printk: replace other_cpu_in_panic() with panic_on_other_cpu() John Ogness
2025-08-25 9:53 ` [PATCH 6/9] printk/nbcon: use panic_on_this_cpu() helper John Ogness
2025-08-26 0:58 ` Jinchao Wang
2025-08-20 13:35 ` [PATCH 3/9] crash_core: use panic_try_start() in crash_kexec() Baoquan He
2025-08-20 13:43 ` Baoquan He
2025-08-21 2:43 ` Baoquan He
2025-08-21 3:41 ` Jinchao Wang
2025-08-20 10:44 ` [PATCH 2/9] fbdev: Use panic_in_progress() helper Qianqiang Liu
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=20250820091702.512524-7-wangjinchao600@gmail.com \
--to=wangjinchao600@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=feng.tang@linux.alibaba.com \
--cc=joel.granados@kernel.org \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=namcao@linutronix.de \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.org \
--cc=sravankumarlpu@gmail.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;
as well as URLs for NNTP newsgroup(s).