From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794591580; b=ZDNVfVLzTRxGWZbw4kQ+SDHqvojYB/76v/7OVK4l3L1HfykWB9v9eSeF4sI+yZxBoMXN oTRPtMhYp9lMwAXHv4rxj5xl+6PTIYZx5zsg6cjHAvfkBKWw3J4yZ3hIJ5xlZiSk62fJk 8yiP1zcEIMeGCgPDJ2xGA9XsBmXoK+6CPT5yWkE9l37J++RVSkHBdEY1fqkmrm00hvSq9 bUO3sL7lJ2r7CnmoYHSaP545fgRLiM95FAY5tH8TRnYK3zR5YscogC/E69ihhttEtRyMh qnlx3g0tKzMBd5RO3nenHZAw4tk4Dmrc+gvZ9lnIe0Fd2RO17ZsMEUnLxA9MQUy3igQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794591580; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=YrsjRn+mW3qsS8V7ETjRQxOXMo/v5hXx1uwwgwf50hw=; b=dEeYcwB2mYcJLXTvwAq135qb8vnjSZyem3XpurIjV8oO4b336Yx9HSQNDlvvH9tTbQCp 9KWAAeXPJqmsHMVTSDw1uqdkF+n6rjnjgHxJXD0f9ndgBkCr717pe7shKD+Rrp1yrSRer 24fPbGHChUNO9+1m1ihjxGyh+dNtpaDyM1sgDc0VYVzQUTSLA9kDXq7ZKLCaVfUQPwP1Q PYShZu+q7Wwu+i0OsCII8oHb6WcRWGle88ZKwrR4WkQJK1RAqMh0bw0js73n1QYYo2QC8 8ExbttAaOWWqpcmiByBupbzY34+N7+1WuXeVyjTsOSL1I94OKVOjbivqk5lzd0UbXAw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=pe8gHGjV; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EE09D606E64F; Fri, 13 Nov 2026 17:39:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=pe8gHGjV Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8796C1F000C6; Fri, 13 Nov 2026 17:39:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794591579; bh=YrsjRn+mW3qsS8V7ETjRQxOXMo/v5hXx1uwwgwf50hw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pe8gHGjVu/TX0ygXRUtZxm/f7zUnTFeC26rXxcEfj1AluD5ExFe1zI7/uRHavpPhc IkaD7WvqJPHb7yuUK5yEdEtEuGV3yJ/vixvY2KRU/JaN1Kd/Ap5FO37tH4KX96g0Eh koU5L9lOfqIhJmm4JqCEo41ATLh16bf1Y0dulfCM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jinchao Wang , Anna Schumaker , Baoquan He , "Darrick J. Wong" , Dave Young , Doug Anderson , "Guilherme G. Piccoli" , Helge Deller , Ingo Molnar , Jason Gunthorpe , Joanthan Cameron , Joel Granados , John Ogness , Kees Cook , Li Huafei , "Luck, Tony" , Luo Gengkun , Max Kellermann , Nam Cao , oushixiong , Petr Mladek , Qianqiang Liu , Sergey Senozhatsky , Sohil Mehta , Steven Rostedt , Tejun Heo , Thomas Gleinxer , Thomas Zimemrmann , Thorsten Blum , Ville Syrjala , Vivek Goyal , Yicong Yang , Yunhui Cui , "Yury Norov (NVIDIA)" , Andrew Morton , Sasha Levin Subject: [PATCH 6.12 627/670] panic: use panic_try_start() in nmi_panic() Date: Fri, 13 Nov 2026 10:53:11 -0500 Message-ID: <20261113153833.039991545@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153811.177190860@linuxfoundation.org> References: <20261113153811.177190860@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jinchao Wang [ Upstream commit 6b69c7ef96f1afc7b426195087f7488f1510c2a4 ] nmi_panic() duplicated the logic to claim panic_cpu with atomic_try_cmpxchg. This is already wrapped in panic_try_start(). Replace the open-coded logic with panic_try_start(), and use panic_on_other_cpu() for the fallback path. This removes duplication and keeps panic handling code consistent. Link: https://lkml.kernel.org/r/20250825022947.1596226-5-wangjinchao600@gmail.com Signed-off-by: Jinchao Wang Cc: Anna Schumaker Cc: Baoquan He Cc: "Darrick J. Wong" Cc: Dave Young Cc: Doug Anderson Cc: "Guilherme G. Piccoli" Cc: Helge Deller Cc: Ingo Molnar Cc: Jason Gunthorpe Cc: Joanthan Cameron Cc: Joel Granados Cc: John Ogness Cc: Kees Cook Cc: Li Huafei Cc: "Luck, Tony" Cc: Luo Gengkun Cc: Max Kellermann Cc: Nam Cao Cc: oushixiong Cc: Petr Mladek Cc: Qianqiang Liu Cc: Sergey Senozhatsky Cc: Sohil Mehta Cc: Steven Rostedt Cc: Tejun Heo Cc: Thomas Gleinxer Cc: Thomas Zimemrmann Cc: Thorsten Blum Cc: Ville Syrjala Cc: Vivek Goyal Cc: Yicong Yang Cc: Yunhui Cui Cc: Yury Norov (NVIDIA) Signed-off-by: Andrew Morton Stable-dep-of: 75eb687ff2bc ("panic: flatten nmi_panic control flow") Signed-off-by: Sasha Levin --- kernel/panic.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index 97c472164393b..b4db7f62b8ed5 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -248,15 +248,9 @@ EXPORT_SYMBOL(panic_on_other_cpu); */ void nmi_panic(struct pt_regs *regs, const char *msg) { - int old_cpu, this_cpu; - - old_cpu = PANIC_CPU_INVALID; - this_cpu = raw_smp_processor_id(); - - /* atomic_try_cmpxchg updates old_cpu on failure */ - if (atomic_try_cmpxchg(&panic_cpu, &old_cpu, this_cpu)) + if (panic_try_start()) panic("%s", msg); - else if (old_cpu != this_cpu) + else if (panic_on_other_cpu()) nmi_panic_self_stop(regs); } EXPORT_SYMBOL(nmi_panic); -- 2.53.0