From nobody Fri Dec 19 10:25:41 2025 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 73EB51A5B8A for ; Wed, 26 Mar 2025 08:48:04 +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=1742978884; cv=none; b=o86TFbJAXW+jEyUq6lgU/WA1tiUbRbX0UR56OBHAC0fFF4cS5pHCBR7nDcQWHo+QBbp/MHFeSa8DUh8qLAcPDqXd5Li0UjeGoaPBNm2Y+fIcnxaVs4ozYLAbi72G3p2eT/DDGnjD+LOCwf8sRHDVKAG4ghsEur1bqoTh4Sx4s28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742978884; c=relaxed/simple; bh=kgK8HDdR4C83iTnFOCSRurx4wL3asSYvWsShCTWO/TM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ezATnObVL6xP3tNHc+nWwRtEc9nk+DgEWh2qvQao+zILOWQudFKHcGSVF080MmA39+Ldvs7K2dEUqfvrV0lqfsDm6aVUEaYttZO27pVZULcBCKtv41d+nR4X2L5dUdewgb3uoAgoFU2HfW75jJW5hu/4d3ptL2N4AKDEI8oSgeY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Qukxr2Sl; 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="Qukxr2Sl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8A47C4CEEA; Wed, 26 Mar 2025 08:48:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742978883; bh=kgK8HDdR4C83iTnFOCSRurx4wL3asSYvWsShCTWO/TM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qukxr2Sl+P0/r1Wg7jrhjPr//a+NI6O2irWr82N5s1jQoIEG7VP3XEab1iGSCA3wh bm49Qa29ZS135a8x3RZemuahYJidvCLjBVFLTbhOIfYRWe1RTjlFa9bJim1YMcUZ2N ZYUtHWAJltW8fae37Y0peM1d/rd+Z1WgtHgsfzqavE6pfK4yYvtCBcFeWCy0lGtMzF GsFsCIDfxK3nJn7dckMvkJnX07FGvFqaS7O8XwY17HvQMUXullHwYDX24vXA5Ppuwv 6E1ycwsI7FBZ7cqbFCi/G10v3RZ2+co6LE2Uhyz0H4EqfptlB2IpyzqFf0gf8QG0HK U771WlIt878AA== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Peter Zijlstra Subject: [PATCH 1/5] bugs/core: Extend __WARN_FLAGS() with the 'cond_str' parameter Date: Wed, 26 Mar 2025 09:47:46 +0100 Message-ID: <20250326084751.2260634-2-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250326084751.2260634-1-mingo@kernel.org> References: <20250326084751.2260634-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Push it down into every architecture that defines __WARN_FLAGS(). Don't pass anything substantial down yet, just propagate the new parameter with empty strings, without generating it or using it. Signed-off-by: Ingo Molnar --- arch/arm64/include/asm/bug.h | 2 +- arch/loongarch/include/asm/bug.h | 2 +- arch/parisc/include/asm/bug.h | 4 ++-- arch/powerpc/include/asm/bug.h | 2 +- arch/riscv/include/asm/bug.h | 2 +- arch/s390/include/asm/bug.h | 2 +- arch/sh/include/asm/bug.h | 2 +- arch/x86/include/asm/bug.h | 2 +- include/asm-generic/bug.h | 7 ++++--- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/arm64/include/asm/bug.h b/arch/arm64/include/asm/bug.h index 28be048db3f6..bceeaec21fb9 100644 --- a/arch/arm64/include/asm/bug.h +++ b/arch/arm64/include/asm/bug.h @@ -19,7 +19,7 @@ unreachable(); \ } while (0) =20 -#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) +#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) =20 #define HAVE_ARCH_BUG =20 diff --git a/arch/loongarch/include/asm/bug.h b/arch/loongarch/include/asm/= bug.h index f6f254f2c5db..51c2cb98d728 100644 --- a/arch/loongarch/include/asm/bug.h +++ b/arch/loongarch/include/asm/bug.h @@ -42,7 +42,7 @@ asm_inline volatile (__stringify(ASM_BUG_FLAGS(flags)) \ extra); =20 -#define __WARN_FLAGS(flags) \ +#define __WARN_FLAGS(cond_str, flags) \ do { \ instrumentation_begin(); \ __BUG_FLAGS(BUGFLAG_WARNING|(flags), ANNOTATE_REACHABLE(10001b));\ diff --git a/arch/parisc/include/asm/bug.h b/arch/parisc/include/asm/bug.h index 833555f74ffa..1a87cf80ec3c 100644 --- a/arch/parisc/include/asm/bug.h +++ b/arch/parisc/include/asm/bug.h @@ -50,7 +50,7 @@ #endif =20 #ifdef CONFIG_DEBUG_BUGVERBOSE -#define __WARN_FLAGS(flags) \ +#define __WARN_FLAGS(cond_str, flags) \ do { \ asm volatile("\n" \ "1:\t" PARISC_BUG_BREAK_ASM "\n" \ @@ -66,7 +66,7 @@ "i" (sizeof(struct bug_entry)) ); \ } while(0) #else -#define __WARN_FLAGS(flags) \ +#define __WARN_FLAGS(cond_str, flags) \ do { \ asm volatile("\n" \ "1:\t" PARISC_BUG_BREAK_ASM "\n" \ diff --git a/arch/powerpc/include/asm/bug.h b/arch/powerpc/include/asm/bug.h index 1db485aacbd9..34d39ec79720 100644 --- a/arch/powerpc/include/asm/bug.h +++ b/arch/powerpc/include/asm/bug.h @@ -72,7 +72,7 @@ } while (0) #define HAVE_ARCH_BUG =20 -#define __WARN_FLAGS(flags) BUG_ENTRY("twi 31, 0, 0", BUGFLAG_WARNING | (f= lags)) +#define __WARN_FLAGS(cond_str, flags) BUG_ENTRY("twi 31, 0, 0", BUGFLAG_WA= RNING | (flags)) =20 #ifdef CONFIG_PPC64 #define BUG_ON(x) do { \ diff --git a/arch/riscv/include/asm/bug.h b/arch/riscv/include/asm/bug.h index 1aaea81fb141..b22ee4d2c882 100644 --- a/arch/riscv/include/asm/bug.h +++ b/arch/riscv/include/asm/bug.h @@ -76,7 +76,7 @@ do { \ unreachable(); \ } while (0) =20 -#define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) +#define __WARN_FLAGS(cond_str, flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) =20 #define HAVE_ARCH_BUG =20 diff --git a/arch/s390/include/asm/bug.h b/arch/s390/include/asm/bug.h index c500d45fb465..ef3e495ec1e3 100644 --- a/arch/s390/include/asm/bug.h +++ b/arch/s390/include/asm/bug.h @@ -46,7 +46,7 @@ unreachable(); \ } while (0) =20 -#define __WARN_FLAGS(flags) do { \ +#define __WARN_FLAGS(cond_str, flags) do { \ __EMIT_BUG(BUGFLAG_WARNING|(flags)); \ } while (0) =20 diff --git a/arch/sh/include/asm/bug.h b/arch/sh/include/asm/bug.h index 05a485c4fabc..834c621ab249 100644 --- a/arch/sh/include/asm/bug.h +++ b/arch/sh/include/asm/bug.h @@ -52,7 +52,7 @@ do { \ unreachable(); \ } while (0) =20 -#define __WARN_FLAGS(flags) \ +#define __WARN_FLAGS(cond_str, flags) \ do { \ __asm__ __volatile__ ( \ "1:\t.short %O0\n" \ diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index f0e9acf72547..413b86b876d9 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -92,7 +92,7 @@ do { \ * were to trigger, we'd rather wreck the machine in an attempt to get the * message out than not know about it. */ -#define __WARN_FLAGS(flags) \ +#define __WARN_FLAGS(cond_str, flags) \ do { \ __auto_type __flags =3D BUGFLAG_WARNING|(flags); \ instrumentation_begin(); \ diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index 387720933973..af76e4a04b16 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -100,17 +100,18 @@ extern __printf(1, 2) void __warn_printk(const char *= fmt, ...); instrumentation_end(); \ } while (0) #else -#define __WARN() __WARN_FLAGS(BUGFLAG_TAINT(TAINT_WARN)) +#define __WARN() __WARN_FLAGS("", BUGFLAG_TAINT(TAINT_WARN)) #define __WARN_printf(taint, arg...) do { \ instrumentation_begin(); \ __warn_printk(arg); \ - __WARN_FLAGS(BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\ + __WARN_FLAGS("", BUGFLAG_NO_CUT_HERE | BUGFLAG_TAINT(taint));\ instrumentation_end(); \ } while (0) #define WARN_ON_ONCE(condition) ({ \ int __ret_warn_on =3D !!(condition); \ if (unlikely(__ret_warn_on)) \ - __WARN_FLAGS(BUGFLAG_ONCE | \ + __WARN_FLAGS("", \ + BUGFLAG_ONCE | \ BUGFLAG_TAINT(TAINT_WARN)); \ unlikely(__ret_warn_on); \ }) --=20 2.45.2 From nobody Fri Dec 19 10:25:41 2025 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 272B01A4F21 for ; Wed, 26 Mar 2025 08:48:05 +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=1742978886; cv=none; b=if91jzV729JAwXfjaHXbUz1ThXGLHqf2oq52SyBWCN0A+5Zzf2Nq+Rsfnv0SLTTkp9+yTHvgWeIvAIKVuK1TApAJoGIrtiZZiIgGp+1rdPND60B08Fg4EbfjEwke73ld45ZaJo5WM34at5aa1GJKVkDe2HYW9/4dZNG038WQ4zI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742978886; c=relaxed/simple; bh=/rS5pVho0QtfCxm0/PsZq0BHiFHCltn4BrsMWAHguTE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=npAAfBplEfs+YDgOMXQSGbBwjUtmBCvwa23UMkDF1Y4UjAOw5KHsHIL+SSTaJjsWwYxS5m5sfjsI59YDHNo+s4VmgtptwN0xpyxMTF6p64XrESplLF/wzm3A8LIr6UN5cqR0nCVy7GOw+e+ctcnt+3VSM40TRb9mn/2Q4X7pdhA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZCJ4vgjT; 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="ZCJ4vgjT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BFB7C4CEE2; Wed, 26 Mar 2025 08:48:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742978885; bh=/rS5pVho0QtfCxm0/PsZq0BHiFHCltn4BrsMWAHguTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZCJ4vgjTl6aRSJq7u4bJ0HRq3lI0CMWnW4KUparyZ7dlg82GmBln+dCdY0dXlrv4G ZVS8PaiKQHfr5NeCk6+TyDq3jbV3/1ID98JwZub8QjA2dNB/v2ykU7wHzmtkxChfpP Q8oGkWGUfjZfF/eofkBy7Q+6XTWh8Qq9TH91KNx0vCut9No0j1yXizE8EswRT3DrLm T2OlHExoFPw3ZlpxWzDBGtTwMif0ROn7xYIeHaEPI05l6keid0dXzuh/PbKsC9qa3M nlhdWG5gNF3M6DVAH5RltkbAaGtgFRnngdmRg5PBnJCp3jvmYMz8cKgZCuNGFtSGb1 o0eKnfMM4Wzvg== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Peter Zijlstra Subject: [PATCH 2/5] bugs/core: Pass down the condition string of WARN_ON_ONCE(cond) warnings to __WARN_FLAGS() Date: Wed, 26 Mar 2025 09:47:47 +0100 Message-ID: <20250326084751.2260634-3-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250326084751.2260634-1-mingo@kernel.org> References: <20250326084751.2260634-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This will allow architecture code to print out this information. The format of the string is '[condition]', for example: WARN_ON_ONCE(idx < 0 && ptr); Will get the '[idx < 0 && ptr]' string literal passed down as 'cond_str' in __WARN_FLAGS(). Signed-off-by: Ingo Molnar --- include/asm-generic/bug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h index af76e4a04b16..c8e7126bc26e 100644 --- a/include/asm-generic/bug.h +++ b/include/asm-generic/bug.h @@ -110,7 +110,7 @@ extern __printf(1, 2) void __warn_printk(const char *fm= t, ...); #define WARN_ON_ONCE(condition) ({ \ int __ret_warn_on =3D !!(condition); \ if (unlikely(__ret_warn_on)) \ - __WARN_FLAGS("", \ + __WARN_FLAGS("["#condition"] ", \ BUGFLAG_ONCE | \ BUGFLAG_TAINT(TAINT_WARN)); \ unlikely(__ret_warn_on); \ --=20 2.45.2 From nobody Fri Dec 19 10:25:41 2025 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 6A8071AA1F6 for ; Wed, 26 Mar 2025 08:48:07 +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=1742978887; cv=none; b=cYWb31sIxktLdQNHnJMVRMH0/5z5Sb4tIWfh0gvWrus9pZYkHgmk9KCLCxKxrQUcuofL0O1SPP89oiJSshzkeXnvlTZP92hKG2eMW2hy/KaGSB23zHE8MG0hGdEybnJY1DkFHhim7430/r3lnl+BMBUI6Eje8/h7eZjeUFvzTXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742978887; c=relaxed/simple; bh=dSstgYB77qBPQJUZCAejs0eSom8yR3UEykjpoTiOVIw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tfO9/7k2ZTuGXbEBQZ6cElWzmlgirUglPNWIK3khBLX5juNotxrkrx7tRadEt121mYNS1+GYzdKznZK+aLx7SCYWkgWGLLF0gYMotGaQ1thKAHv7MtjmZd9mhB8b7U8FY+FisiJuN0XeSiSKAzEaFghQs0MevZs4QB1xstAF4jY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bC/uzs+Z; 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="bC/uzs+Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1E669C4CEF0; Wed, 26 Mar 2025 08:48:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742978887; bh=dSstgYB77qBPQJUZCAejs0eSom8yR3UEykjpoTiOVIw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bC/uzs+ZgGAGidK4M6uBlnPQ1RbTtJ+tLYTK2TPpRlD/pI5w0gqvaidSTtp2wP84e 0voZcBu1KvMcbAiEczXAniSkO6Yq4rPqbEj6HwZ8kvyLtnN0GNyZaGe1ZnmilFiVbW XI5cOM7Acbmns3WMDMrf3HqLroRJuWIO2Oi7GFrZKIpxF+xouhBUPuRYxfhZzvyEgR TxdmtBuI/h5tTGu/Gu6qlIEKnHzdAyWbRNb/Co/Dl1g2dIHzQW8irMKIZvzCsCZ7yE /TjzNL9sDmtD3xgAwLRJccOaB9rb64N1lDCTTdxU7zP4lSyJuWkcwEx9bcdnx1j7O+ c7IXy9+0b6pqw== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Peter Zijlstra Subject: [PATCH 3/5] bugs/x86: Extend _BUG_FLAGS() with the 'cond_str' parameter Date: Wed, 26 Mar 2025 09:47:48 +0100 Message-ID: <20250326084751.2260634-4-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250326084751.2260634-1-mingo@kernel.org> References: <20250326084751.2260634-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Just pass down the parameter, don't do anything with it yet. Signed-off-by: Ingo Molnar --- arch/x86/include/asm/bug.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index 413b86b876d9..aff1c6b7a7f3 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -39,7 +39,7 @@ =20 #ifdef CONFIG_DEBUG_BUGVERBOSE =20 -#define _BUG_FLAGS(ins, flags, extra) \ +#define _BUG_FLAGS(cond_str, ins, flags, extra) \ do { \ asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ @@ -57,7 +57,7 @@ do { \ =20 #else /* !CONFIG_DEBUG_BUGVERBOSE */ =20 -#define _BUG_FLAGS(ins, flags, extra) \ +#define _BUG_FLAGS(cond_str, ins, flags, extra) \ do { \ asm_inline volatile("1:\t" ins "\n" \ ".pushsection __bug_table,\"aw\"\n" \ @@ -74,7 +74,7 @@ do { \ =20 #else =20 -#define _BUG_FLAGS(ins, flags, extra) asm volatile(ins) +#define _BUG_FLAGS(cond_str, ins, flags, extra) asm volatile(ins) =20 #endif /* CONFIG_GENERIC_BUG */ =20 @@ -82,7 +82,7 @@ do { \ #define BUG() \ do { \ instrumentation_begin(); \ - _BUG_FLAGS(ASM_UD2, 0, ""); \ + _BUG_FLAGS("", ASM_UD2, 0, ""); \ __builtin_unreachable(); \ } while (0) =20 @@ -96,7 +96,7 @@ do { \ do { \ __auto_type __flags =3D BUGFLAG_WARNING|(flags); \ instrumentation_begin(); \ - _BUG_FLAGS(ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \ + _BUG_FLAGS(cond_str, ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \ instrumentation_end(); \ } while (0) =20 --=20 2.45.2 From nobody Fri Dec 19 10:25:41 2025 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 753CD1ADC7C for ; Wed, 26 Mar 2025 08:48:09 +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=1742978889; cv=none; b=IPzC3DkV1hEkAZsRQuHDYfUbN7qUov8NslCM3nFvFuxD4PTsnq56UknxP+Gjp40G9yWTRz5Hf5NkRcPs/IB+LaS5iejodU+7DiG+oPgccOJ0gXjZnBWr2OiNQv99/fxZQu8LFr+8/5X2rQdB+NDHPTPGQFc7LdrnQqW6JN1sKMI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742978889; c=relaxed/simple; bh=s46mndiCDgBdGhU9v0W8yDZxe+ObIn5yW8f+r+yfxwo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GXWOlYVk626jZYryzXjZN6AXTQr7loFCtqG4aPKCX+JBPF1MOMUwOVkJpkHa/erQB90Hlmz3gGK/6FStlG9CdrPah8pks7DX2bs3SVrPgUBJxL/I+7lStK7sqSIXbTnC+/gEB4dic4liMWmP4adYsDguxW/hVTxYJwyuWsaOh5I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LwuQkIxG; 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="LwuQkIxG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C4211C4CEEA; Wed, 26 Mar 2025 08:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742978889; bh=s46mndiCDgBdGhU9v0W8yDZxe+ObIn5yW8f+r+yfxwo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LwuQkIxGUtVSzU4lh60VqKlv0r1/vcs3nzX6+RtyLlx10mo/iGrrm8i9r4RJepM1f 8SPhkjnBRIh3C/UpwRusgcZsW/Fd90HOPnt9mAPJSGdld86KN/biPUYtnc2Uy2BlJ6 ENjuJSHdc0L/Q7HJ2kciYcJ9R+Ut2Y+zwZd22W5EGhuhfzTtl3Es2OGotnUzgKaImC KhQCx3oLJ+U84UBcAuR4MgospsxBWaeuIv6JF/L3uu8hTKRmUTR/3slpdknnqPTM+e oB0FOArvsshEo4HP35J04MKe2YCnVt0aL/6/A4W3v3avEkMKjbK84c1SWQK3WMFSmL 7JgKh+L+hhWsw== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Peter Zijlstra Subject: [PATCH 4/5] bugs/x86: Augment warnings output by concatenating 'cond_str' with the regular __FILE__ string in _BUG_FLAGS() Date: Wed, 26 Mar 2025 09:47:49 +0100 Message-ID: <20250326084751.2260634-5-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250326084751.2260634-1-mingo@kernel.org> References: <20250326084751.2260634-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This allows the reuse of the UD2 based 'struct bug_entry' low-overhead _BUG_FLAGS() implementation and string-printing backend, without having to add a new field. An example: If we have the following WARN_ON_ONCE() in kernel/sched/core.c: WARN_ON_ONCE(idx < 0 && ptr); Then previously _BUG_FLAGS() would store this string in bug_entry::file: "kernel/sched/core.c" After this patch, it would store and print: "[idx < 0 && ptr] kernel/sched/core.c" Which is an extended string that will be printed in warnings. Signed-off-by: Ingo Molnar --- arch/x86/include/asm/bug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index aff1c6b7a7f3..e966199c8ef7 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -50,7 +50,7 @@ do { \ "\t.org 2b+%c3\n" \ ".popsection\n" \ extra \ - : : "i" (__FILE__), "i" (__LINE__), \ + : : "i" (cond_str __FILE__), "i" (__LINE__), \ "i" (flags), \ "i" (sizeof(struct bug_entry))); \ } while (0) --=20 2.45.2 From nobody Fri Dec 19 10:25:41 2025 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 2B9331A4F2F for ; Wed, 26 Mar 2025 08:48:10 +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=1742978891; cv=none; b=taGek/RTOVl93aciAfTJD43q7sFMoMp8g+p449RM5tigoCc0F75iw4W2ducLfuGxr8fQtSQuDIWvU3w5vLMEn/f1e+Es2Qmygw59qU/RsD/HIcshJNuHdJriH+roBOpQTb1J9+EhMkgSiDbzsid4ZY+RSDnVQl4P3EmqOwr6vq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742978891; c=relaxed/simple; bh=rM1fgvuZjHgchIiNVtEtSB8H8tN6AbjiUueRZ1K9fWA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q9Cy/fikFn/jQYDCU0FUOqubYcfxgVs1iTL7+c3ymFwmCf2oaNi7s9CMst8eIrQ6h0Nm35CvEX/rC+0sZ3/zNlzn3GJTs9+RCBIsApWb3yxY23MsjGOWM+zJspxWJMJwCrXlk0zdaziJZ5dHELqVn0LOQKeUzsxBEeWK2qpdiZ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HmxJhTwe; 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="HmxJhTwe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74AA4C4CEEE; Wed, 26 Mar 2025 08:48:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742978890; bh=rM1fgvuZjHgchIiNVtEtSB8H8tN6AbjiUueRZ1K9fWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HmxJhTweFAcarxcmnxj1toiUfd+c5nhXRDHHakb/+RmbLJUm5cljov4YpNlQFNLWP +HD9IptfqDokqtmP9DyTASPMuJZCBtwWZUOxCqe5rdbgrWoCKM6AMyCat0YRr+KEBf L8zT9krFy0Nr/sON/EQg1l1/ILwwRkNGK7qCpwezZNsWE5XPUZ1EYdJ8Wf8IegjaTp 5ZYvt/ZeLje06sB7+hmxaRe0ODoACkdn7ZrpvlD8hJOwVN5RlyxT36w8lY3VsJE3o0 jMMvZQK8jnFF3uK5/v9HGBIgP9yBT3cWlmYQaZHZrVBKT5E7b2WCxGLLpmCC3NnAup ERVD0wwBDboNA== From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Linus Torvalds , Peter Zijlstra Subject: [PATCH 5/5] bugs/core: Do not print CPU and PID values in__warn() output Date: Wed, 26 Mar 2025 09:47:50 +0100 Message-ID: <20250326084751.2260634-6-mingo@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250326084751.2260634-1-mingo@kernel.org> References: <20250326084751.2260634-1-mingo@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" For most warnings it's repeated anyway a few lines later, as part of the register dump: WARNING: CPU: 0 PID: 0 at kernel/sched/core.c:8511 sched_init+0x20/0x410 ^^^^^^^^^^^^^ Modules linked in: CPU: 0 UID: 0 PID: 0 Comm: swapper Not tainted 6.14.0-01616-g94d7af2844aa= #4 PREEMPT(undef) ^^^^^^^^^^^^^^^^^^ In fact the later dump is richer, as it includes the 'comm' line as well. As a side effect, this makes some space for the 'file' field to be augmented with extra information (the condition string in particular). Signed-off-by: Ingo Molnar --- kernel/panic.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/panic.c b/kernel/panic.c index d8635d5cecb2..3101c21ca39f 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -725,12 +725,9 @@ void __warn(const char *file, int line, void *caller, = unsigned taint, disable_trace_on_warning(); =20 if (file) - pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS\n", - raw_smp_processor_id(), current->pid, file, line, - caller); + pr_warn("WARNING: %s:%d at %pS\n", file, line, caller); else - pr_warn("WARNING: CPU: %d PID: %d at %pS\n", - raw_smp_processor_id(), current->pid, caller); + pr_warn("WARNING: at %pS\n", caller); =20 #pragma GCC diagnostic push #ifndef __clang__ --=20 2.45.2