From nobody Mon Feb 9 11:01:56 2026 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD91A23372E; Wed, 5 Mar 2025 11:10:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173016; cv=none; b=dULfcU3HkW0Qu2l7NxQNKLzpHED/uJqe491ElSLEz1HuGgZEjd2YvlU3zSG/IXHpT1+XFg25nfUwxzTSnr0PQuB7sJ2XGiJcGP2qNblp9vF+YT5jjLD6E9dofg1YSr4sdmHCbT6LvT4R8+ivvjvBt9HnyBy0HIPTlXRMv/WJL1c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173016; c=relaxed/simple; bh=h/3P2KY8vDMPXX5OJwI4gjMRRH8LzIOf17+FXLQKEXs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HWydlrJ3YKYCucBpGPchMBeG1O++nAy8tv6fWOVVelIskNspol6DJVUi/h3D6NO+3HIPLL9XU4G2be3a7aKkQw5thW5vQ0DheZ9xOq5+Oiwn3eNA6gDSLgaS9kGMj3A4xB4stEjnqIx5M71FXTSibY6nfSJZqTASSyLdQDh6/ss= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Aiuv6em/; arc=none smtp.client-ip=209.85.216.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Aiuv6em/" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-2fec13a4067so8226681a91.2; Wed, 05 Mar 2025 03:10:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741173014; x=1741777814; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gg/V+lwtqWQq5Y/Ly9J/s6hUNho4JthxgdaqasfoAcA=; b=Aiuv6em/bRJ7cH/JhqbDZDB0KZ27FUq7BOiRxB4bHaqce+l+SfUmkN8VKPSXMcTQsU 3zQ8vgrGEvh2xZaPR2uveQXn+TUqzHXhkJMpKiEbkmRNg1ZePiyq2WBh1yws9udi4kAU ugIgt9/JEXKHD82qs1MLag+DDftUXUL3Im3oD6SCFNu8bBhB1uQsll/Z4odgTQGRGdFs dVaWNo/Rf6UhXpBVOUunoMXcE8EEcM1YnZytKpgnYFD0xJTsaoDMgVQcGqcYi7hy7DsG jpmugPfV/SXfFyLekI+UiTwMPxwl+djjm5q2fINdpT3DLKBskNpWWmF3I0tijheM8R+O fLGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741173014; x=1741777814; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gg/V+lwtqWQq5Y/Ly9J/s6hUNho4JthxgdaqasfoAcA=; b=jj7cAMsWZhFQJ2eJmCGHvTJkdSQBLCyfvpbr3R3lktCY3vtDnb1jovLQlJnY843tx+ +hekIvXoX2x72NrcxspDFMovn+2qrKsDejvhyKoJ4eWSPmdqtsnk84ZvaP/lyTs9FCqd S840NCPkVrNTmci/RpVHdB4LpsUNPVwxyLY8zqxnNtOLddvbX2ixXxzlLPgladEeGYf2 giT5vp2q/hlAR7iikN1BwiRQPKg6ytaBfnsipKnPOkyEftq7a5pyGXiD7a+oPXk2syS0 1szytgjcGrwsYZxBPFvoYnz3N3zD6QF2Miugv9BV1r3Pxdef5mcvqZpiO9GD+cNnmBzA DqbQ== X-Forwarded-Encrypted: i=1; AJvYcCUD/OBLFek8modYOSbOp1zWqPZ6AKuIgiExs2RhWMHMlbyVksoEmZQ8j1UvoQdX5cW1fh/frPzbzarOcoDk8g==@vger.kernel.org X-Gm-Message-State: AOJu0Yylqy2bmuq4oC2eP7eNE0hrMHYun2Uv/4UdmMaEHOvuMji7/qi1 HGmI30VfosvDTLWERlZTMZAa1gD6+TW5hNo6/2YU4rsTleMHUuls5tyOLwRA X-Gm-Gg: ASbGncsqhv1TwUcgDHnYAzgBIx5uj34foOWIUg/Qs1wdVe2w3wQIEBTHnsA4KUghI2K T/4XFBdRHW0HwmBF0S7CWkWbHBI+koYSos/OodlGHe5PbNhNnT9+pYlwCkuLzq04q1HUwNtueVn znLQU0m0HLmd4kEvptUaz8GXBCXm/mhmg0ov6zl1wIEiyjV7iIejcc+bzvhyzf1e+zqBB/zp5EU 5t+wA1ScbxQGPAU8NUVNPjK7pwsJHJ9RfGiI0HOioP+4ycXa6zBz3KYsUxBpNNkDv/afjZDhcLI fNm5Zjo55aXiiP9xDAiIIJNNhqMw/J6V+KOnGQysGSDIjZ6iBkj/PLO7pOwxv1pSFGqeloaBkix rrT4r1uREUAErn9wdZ/bxyA== X-Google-Smtp-Source: AGHT+IGT4sqxYXWLlVa8YluGkM22xVpQMVO/t8msCjLv92geQSngVV+IoJoiRn7vgEXbNQJrnp5b6w== X-Received: by 2002:a17:90b:2405:b0:2ff:58c7:a71f with SMTP id 98e67ed59e1d1-2ff58c7a78emr497795a91.32.1741173013960; Wed, 05 Mar 2025 03:10:13 -0800 (PST) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e7737a5sm1060925a91.13.2025.03.05.03.10.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 03:10:13 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: Peter Zijlstra , x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v4 1/4] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 5 Mar 2025 20:08:11 +0900 Message-ID: <20250305110814.272792-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305110814.272792-1-fujita.tomonori@gmail.com> References: <20250305110814.272792-1-fujita.tomonori@gmail.com> 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" Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Acked-by: Peter Zijlstra (Intel) Signed-off-by: FUJITA Tomonori --- arch/x86/include/asm/bug.h | 56 +++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index e85ac0c7c039..61570ec9464c 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -28,45 +28,42 @@ #ifdef CONFIG_GENERIC_BUG =20 #ifdef CONFIG_X86_32 -# define __BUG_REL(val) ".long " __stringify(val) +# define __BUG_REL(val) ".long " val #else -# define __BUG_REL(val) ".long " __stringify(val) " - ." +# define __BUG_REL(val) ".long " val " - ." #endif =20 #ifdef CONFIG_DEBUG_BUGVERBOSE +#define __BUG_ENTRY(file, line, flags) \ + "2:\t" __BUG_REL("1b") "\t# bug_entry::bug_addr\n" \ + "\t" __BUG_REL(file) "\t# bug_entry::file\n" \ + "\t.word " line "\t# bug_entry::line\n" \ + "\t.word " flags "\t# bug_entry::flags\n" +#else +#define __BUG_ENTRY(file, ine, flags) \ + "2:\t" __BUG_REL("1b") "\t# bug_entry::bug_addr\n" \ + "\t.word " flags "\t# bug_entry::flags\n" +#endif + +#define _BUG_FLAGS_ASM(ins, file, line, flags, size, extra) \ + "1:\t" ins "\n" \ + ".pushsection __bug_table,\"aw\"\n" \ + __BUG_ENTRY(file, line, flags) \ + "\t.org 2b + " size "\n" \ + ".popsection\n" \ + extra =20 #define _BUG_FLAGS(ins, flags, extra) \ do { \ - asm_inline volatile("1:\t" ins "\n" \ - ".pushsection __bug_table,\"aw\"\n" \ - "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ - "\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \ - "\t.word %c1" "\t# bug_entry::line\n" \ - "\t.word %c2" "\t# bug_entry::flags\n" \ - "\t.org 2b+%c3\n" \ - ".popsection\n" \ - extra \ + asm_inline volatile(_BUG_FLAGS_ASM(ins, "%c0", \ + "%c1", "%c2", "%c3", extra) \ : : "i" (__FILE__), "i" (__LINE__), \ "i" (flags), \ "i" (sizeof(struct bug_entry))); \ } while (0) =20 -#else /* !CONFIG_DEBUG_BUGVERBOSE */ - -#define _BUG_FLAGS(ins, flags, extra) \ -do { \ - asm_inline volatile("1:\t" ins "\n" \ - ".pushsection __bug_table,\"aw\"\n" \ - "2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \ - "\t.word %c0" "\t# bug_entry::flags\n" \ - "\t.org 2b+%c1\n" \ - ".popsection\n" \ - extra \ - : : "i" (flags), \ - "i" (sizeof(struct bug_entry))); \ -} while (0) - -#endif /* CONFIG_DEBUG_BUGVERBOSE */ +#define ARCH_WARN_ASM(file, line, flags, size) \ + _BUG_FLAGS_ASM(ASM_UD2, file, line, flags, size, "") =20 #else =20 @@ -88,11 +85,14 @@ do { \ * were to trigger, we'd rather wreck the machine in an attempt to get the * message out than not know about it. */ + +#define ARCH_WARN_REACHABLE ANNOTATE_REACHABLE(1b) + #define __WARN_FLAGS(flags) \ do { \ __auto_type __flags =3D BUGFLAG_WARNING|(flags); \ instrumentation_begin(); \ - _BUG_FLAGS(ASM_UD2, __flags, ANNOTATE_REACHABLE(1b)); \ + _BUG_FLAGS(ASM_UD2, __flags, ARCH_WARN_REACHABLE); \ instrumentation_end(); \ } while (0) =20 --=20 2.43.0 From nobody Mon Feb 9 11:01:56 2026 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7BBBF235BE4; Wed, 5 Mar 2025 11:10:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173022; cv=none; b=BgI3C7xTzNp0WbPEOIRxf8n7snYKGhClOEH0ImgSoGuCRvTFcMPDHgBMZkS3Kx3hOaYh62VTtpv4LeEZShU0/dq2lsefPa4fWxUwVPGNBkrBYMJrPCq0L5Z+RJ5qwQuLD0qaG0F/Fgoth358rOP3/QgbVZZoGodkBrTDjpZc2WY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173022; c=relaxed/simple; bh=+7XITjewWSl80gT0zr6uyJXg8p1d67Yg7lRhbz4DBTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WZn3twSmRSCkciQfZQS8gfowCH5i0dxmpqWFgoRQnG4Qy5ansYhB3f0Js7K/g7JzGROp5aS0Y9P9fiAsO/g2aGJIKAZcH/R+WGJPTJtuES7z9dJA6rZkXXsFASmunTo4/Gwv6cco5RtvtdRG7j64/ZpWWG8f9C9/PayVs1QB3Ro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KQVzgAaS; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KQVzgAaS" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2fe848040b1so13649804a91.3; Wed, 05 Mar 2025 03:10:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741173020; x=1741777820; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qp8W9ben9rFX3CxZ0d32TQyshtC6obDRIzvh0yrVOfk=; b=KQVzgAaSRMJDTsv9NUHTKGf8KLkeTfwCLJzemWuu8/zFdtOMFFU6J4pxhzDDrLzk96 /i3i9itNbZxy/3zxt0y894Ma3ky+EP+KwrS0JvQh+kY+CVIh2H6M9OowOhn6Ewbd3Qt4 QFnonUHHlQpnw/5/LlBLq7QbUqJdxwgYF3rYrlxdkCyWxe/XgKZ43fCJ1Y/tKA0IakSn eOR1B015CH8ZP189th4bicmRXHlfL+1b4TGzz50hYG1WB413fSzAsiScT9EA1nG3Re9J mXfCkwWgHCO90ljRuZMACzlPPtgZ29JnWNX6DvP+ApYwjXJSQyTqy/8sQEjk2xV998bC I1ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741173020; x=1741777820; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qp8W9ben9rFX3CxZ0d32TQyshtC6obDRIzvh0yrVOfk=; b=KMz0yTjIaFty6KCsGxp7EEGjhEXByFBmeuSBlA9ILJY9qSnZfj5g2wZ50dhW3POrBG WHB6XolpP5sh7fL7912VmtfZXnbaqp1e1QHqY5KMCxnH27+uyv1n2n+A3115TO5ZuChZ cWq0vJanygud/ZkZ4Nna+V4hGmZVmFi5eVWnXw/OfLuxgazbBmHbonhUT0d6vD39Tm+T fHxBdeT4HKopzjoppsvSHHxPrk4V7pssFJoGams9JlIvYOJvtv9cVCUd20t4zexbeA3X 7bu1fRQehYVR1x+ylhyRC3e5FhI0Uqoxzrm6QqE/n0ZJyziDdJIfGbz6NkxHHBUXjJWu Orug== X-Forwarded-Encrypted: i=1; AJvYcCUSKHei20HP/mb0/gmfP5wgG9QdwmaNkYQn+4m16vLKYtrS2FJ212/pSbTCwqeu7J+b0XH7o3rR2zFwt4s2dA==@vger.kernel.org X-Gm-Message-State: AOJu0YyNckrtSf7wRvguGEslFGRzrQOw5seCUGDREsGskXnqLJBd6BS8 Fk2KXr/uhu+2HJRB2j26Tfb+tSMbqNvPvL4Hw7cmdXJkG4ypx23YN+GResu1 X-Gm-Gg: ASbGncsEvgnmFQRjPkoOIesXJO7sysIWWKdaVsU5rCjtwbZi43FblaUoW8PshZEOiR7 zYz2ZSWAk3XB9r8cM/8ZAJRXglfsRvVt5uQubxAx/9p2QKwE7nDW3BEm8hcslq461Nf+aUi8mk6 RBlXyaowyOXGWGZtmChCBO+YhR8Ca9zinzAgly/IGPudberjDTccC/G9cmaZOy0b6DQzyUMvUDD QM0n+bE68nCLVEpsYd6pBGCG/4JCl/wVXIHFXC7sDlm2Z70kqFLRUW3Kc5lUDmjH/QqAiQeVeSb +VT/2pG8A/cTB4l7G+YVVH1eUIrWIQ1b0Mz467b2JWnzjB4LZMa2FQIVk/L0V7nOa/RGA+VNycX 7fA3CUfRnwJGEX+ZtjlSV9A== X-Google-Smtp-Source: AGHT+IH2eSO5dVRpZfQrO0mycl+1zvAZDwU3KlrIDKDzNpcS47TGnHWji2K5rHzupBDupL/ugdamUQ== X-Received: by 2002:a17:90b:524f:b0:2fe:ba82:ca5 with SMTP id 98e67ed59e1d1-2ff497283aamr4865930a91.11.1741173020419; Wed, 05 Mar 2025 03:10:20 -0800 (PST) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e7737a5sm1060925a91.13.2025.03.05.03.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 03:10:20 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: Alexandre Ghiti , x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v4 2/4] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 5 Mar 2025 20:08:12 +0900 Message-ID: <20250305110814.272792-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305110814.272792-1-fujita.tomonori@gmail.com> References: <20250305110814.272792-1-fujita.tomonori@gmail.com> 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" Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Acked-by: Alexandre Ghiti Signed-off-by: FUJITA Tomonori --- arch/riscv/include/asm/bug.h | 37 +++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/bug.h b/arch/riscv/include/asm/bug.h index 1aaea81fb141..6ab13b56feb0 100644 --- a/arch/riscv/include/asm/bug.h +++ b/arch/riscv/include/asm/bug.h @@ -31,40 +31,45 @@ typedef u32 bug_insn_t; =20 #ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS #define __BUG_ENTRY_ADDR RISCV_INT " 1b - ." -#define __BUG_ENTRY_FILE RISCV_INT " %0 - ." +#define __BUG_ENTRY_FILE(file) RISCV_INT " " file " - ." #else #define __BUG_ENTRY_ADDR RISCV_PTR " 1b" -#define __BUG_ENTRY_FILE RISCV_PTR " %0" +#define __BUG_ENTRY_FILE(file) RISCV_PTR " " file #endif =20 #ifdef CONFIG_DEBUG_BUGVERBOSE -#define __BUG_ENTRY \ +#define __BUG_ENTRY(file, line, flags) \ __BUG_ENTRY_ADDR "\n\t" \ - __BUG_ENTRY_FILE "\n\t" \ - RISCV_SHORT " %1\n\t" \ - RISCV_SHORT " %2" + __BUG_ENTRY_FILE(file) "\n\t" \ + RISCV_SHORT " " line "\n\t" \ + RISCV_SHORT " " flags #else -#define __BUG_ENTRY \ - __BUG_ENTRY_ADDR "\n\t" \ - RISCV_SHORT " %2" +#define __BUG_ENTRY(file, line, flags) \ + __BUG_ENTRY_ADDR "\n\t" \ + RISCV_SHORT " " flags #endif =20 #ifdef CONFIG_GENERIC_BUG -#define __BUG_FLAGS(flags) \ -do { \ - __asm__ __volatile__ ( \ + +#define ARCH_WARN_ASM(file, line, flags, size) \ "1:\n\t" \ "ebreak\n" \ ".pushsection __bug_table,\"aw\"\n\t" \ "2:\n\t" \ - __BUG_ENTRY "\n\t" \ - ".org 2b + %3\n\t" \ - ".popsection" \ + __BUG_ENTRY(file, line, flags) "\n\t" \ + ".org 2b + " size "\n\t" \ + ".popsection\n" \ + +#define __BUG_FLAGS(flags) \ +do { \ + __asm__ __volatile__ ( \ + ARCH_WARN_ASM("%0", "%1", "%2", "%3") \ : \ : "i" (__FILE__), "i" (__LINE__), \ "i" (flags), \ "i" (sizeof(struct bug_entry))); \ } while (0) + #else /* CONFIG_GENERIC_BUG */ #define __BUG_FLAGS(flags) do { \ __asm__ __volatile__ ("ebreak\n"); \ @@ -78,6 +83,8 @@ do { \ =20 #define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) =20 +#define ARCH_WARN_REACHABLE + #define HAVE_ARCH_BUG =20 #include --=20 2.43.0 From nobody Mon Feb 9 11:01:56 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 760CB23875A; Wed, 5 Mar 2025 11:10:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173028; cv=none; b=VSaUZU0vRc9ONLlaLy6sHAH/2OvjtJYZcXZMhUj/W3mDIPl5qQfk9LNg7krLtb2H7OOr6UvINGVMWBof6xd164PJcd1l9Linn/hbOe/F5qg57bxYamFDt1BpB0IlPDe3MY/35LfpIhAnr7VL/wzuWe6FJDb1clBWNtXCMFxScns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173028; c=relaxed/simple; bh=mdMjqDgKLmfSj3Eltmr/eklydzSfhT7tfE+JI7T4puc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=baITr5WgBe9lkqFYaiiyy5zq2ETDK/9WUiRf4UpCm/CkKc6jMSz6p+28uOe3U9SjZDz9GK7Cf1PXgy8b0a/kLcFR9MrOq0HylvW1jIPoNKJ6fCv2BbbYxLDmwIpjOu9NsBfAVFu20FrzcRc9Gxoa6xHnMPGzhTDIjHw3JJOzc/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b1RRQbA/; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b1RRQbA/" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2febaaf175fso8609959a91.3; Wed, 05 Mar 2025 03:10:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741173026; x=1741777826; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t/DonzYY8ky0NPr6wCGSqroH7cDtAqrs9o10+/q7fXY=; b=b1RRQbA/bRlQvPauZXsRdoPbN26wO9WPghhtQDqJ5VWY4HM+3pwKPwUzQ0aqAVxS+A ivDX2tjyKhSTLj/996rokeC5LGYh1mHUA7sPmDQcmm6kSskwSW9a3W0LnY7tsWeM6l2O gG7Ue/U8zn28gF2OTT4UjzSkz/AsYtj/ggl4I+uDHPUGZMipdEf6l18+L6Gh1PG3R1sn b8S1wiyM6OTywz0CJCu0jtOzhfFidy1PRCQSfLlCeQIB88dyxzrhSJ02yhbXlzsRsqFe k/ctWJJ6PLXHyaSn73g5CSu+7AT7eSquRlQ88CB6TMlh3v+3gxJ8qWjO3JA4u2Zq68+z ITFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741173026; x=1741777826; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t/DonzYY8ky0NPr6wCGSqroH7cDtAqrs9o10+/q7fXY=; b=gHGkFoSfduzL+oakuZnRMKlNBEfrWHE+6GydtC74ZnNAsZ5t52+B+r9NyWclAffJzd nXty3LVdemTpz041P+HRsIRfqm1Puqnip8Dj7sRhjr1WttcgcbQDNhIHKqxWJkYx+wLd TRybfHdTAkJCQV2fIA4ehuwX7KpsjiJMkVVo8b635Py0djrebHqAehRXl+DhnpK2xikI /DaqEXnXmajGO5Q0qVKnzSiEBOm7ntSd/qUN1LLLjAWytKIbesK2YAxRTbRbHjpT9/dB QJ/EpsH6zoWe6VwRdMm18kMeofUzz/oXYNla+zoUmTuK6HhCIkDP62C7v1fnpOjMGTf1 1mIQ== X-Forwarded-Encrypted: i=1; AJvYcCWiLSEfaUjI97zxa/XZbxei/3JuKHPueYxo3LN2HFoVbxgkJaYGT4d0WCu70/XRG8XVPQUpuKzirmIWma+6Vw==@vger.kernel.org X-Gm-Message-State: AOJu0YzRr34ED2+MrUUX2ILPvqcDiyv3Lhy7oazhQav1l4ysKfRvuu79 G0ugWT1cwQM+ahbpO37ntFBpaaI36aFq2Lhn5d3k5RDQN5s54y+G2i0CxTOR X-Gm-Gg: ASbGncvr591uHnClaMqp9I2NthUPkvw0eLzuaBPWMW857412y+s/J2Aq5pa2cTzZw3z kkaqQSLaKvHJcyvN57Jl9FX0lNKJ1TAThPktT7IuAiKXaOglY0MgROk78hvzrF9qYkoq7m5Td4J txt1hqn4VlOofac0/pHg4o5ZHxicplBaQzY5+kxTXcqxsdo00kc5sTUj7hkeoyFlHvBl9pWPqhV UyvD7gy8tk/Y9YRYLiN5pi+TFISThK5tK1gy657K1hEOTxkfAh0zeGWypBY9QHPeLPyy/Hy7HQc uwl0PYa1lVp53rzmHk4+hSOShjSDHQJZbVPE5jJTDyeXppvbg1jadskPvl5vYViP9nFV3rM0hdr V48y+T/rH9XsDTf47ZpOm7g== X-Google-Smtp-Source: AGHT+IHP0xBykbnwKXKfbmIat/96KZep+usQi4KEOXfaQ1XfgMnIYfTVt4U0//4lVI6PNsYEyT+Ccw== X-Received: by 2002:a17:90b:1d45:b0:2f5:63a:449c with SMTP id 98e67ed59e1d1-2ff49840804mr4412875a91.28.1741173026565; Wed, 05 Mar 2025 03:10:26 -0800 (PST) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e7737a5sm1060925a91.13.2025.03.05.03.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 03:10:26 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: Catalin Marinas , x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v4 3/4] arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Wed, 5 Mar 2025 20:08:13 +0900 Message-ID: <20250305110814.272792-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305110814.272792-1-fujita.tomonori@gmail.com> References: <20250305110814.272792-1-fujita.tomonori@gmail.com> 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" Add new ARCH_WARN_ASM macro for BUG/WARN assembly code sharing with Rust to avoid the duplication. No functional changes. Acked-by: Catalin Marinas Signed-off-by: FUJITA Tomonori --- arch/arm64/include/asm/asm-bug.h | 33 ++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/asm-bug.h b/arch/arm64/include/asm/asm-= bug.h index 6e73809f6492..a5f13801b784 100644 --- a/arch/arm64/include/asm/asm-bug.h +++ b/arch/arm64/include/asm/asm-bug.h @@ -21,16 +21,21 @@ #endif =20 #ifdef CONFIG_GENERIC_BUG - -#define __BUG_ENTRY(flags) \ +#define __BUG_ENTRY_START \ .pushsection __bug_table,"aw"; \ .align 2; \ 14470: .long 14471f - .; \ -_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ - .short flags; \ + +#define __BUG_ENTRY_END \ .align 2; \ .popsection; \ 14471: + +#define __BUG_ENTRY(flags) \ + __BUG_ENTRY_START \ +_BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ + .short flags; \ + __BUG_ENTRY_END #else #define __BUG_ENTRY(flags) #endif @@ -41,4 +46,24 @@ _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ =20 #define ASM_BUG() ASM_BUG_FLAGS(0) =20 +#ifdef CONFIG_DEBUG_BUGVERBOSE +#define __BUG_LOCATION_STRING(file, line) \ + ".long " file "- .;" \ + ".short " line ";" +#else +#define __BUG_LOCATION_STRING(file, line) +#endif + +#define __BUG_ENTRY_STRING(file, line, flags) \ + __stringify(__BUG_ENTRY_START) \ + __BUG_LOCATION_STRING(file, line) \ + ".short " flags ";" \ + __stringify(__BUG_ENTRY_END) + +#define ARCH_WARN_ASM(file, line, flags, size) \ + __BUG_ENTRY_STRING(file, line, flags) \ + __stringify(brk BUG_BRK_IMM) + +#define ARCH_WARN_REACHABLE + #endif /* __ASM_ASM_BUG_H */ --=20 2.43.0 From nobody Mon Feb 9 11:01:56 2026 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DB40422D4E5; Wed, 5 Mar 2025 11:10:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173035; cv=none; b=XYgBBKae+xNDmRaGwbV927CvAsB9YSRnPpaHPrjG2CIEpd5UJU9gsp+n4K/zJkcSa2V1BUav3iL3iz4qqeNqKa63tBYuazPSZvapVYoIsvDCvW9UhPRyrkqk5Pj2Gp50jN8msOSUYff8O/wsCwFxCaj3ixCtWZ3zc1aECBgmX+Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741173035; c=relaxed/simple; bh=mUCIiJMFdRqa4UAz/nNpJz2MgPI0oX2+OeDuzzGcydE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OKeeGYqIHgT+49OLbTYYghr+qTHfcmrqetqIPZ4apCc/IswjhrfCFMIxXeuH0KPUXOsTQ/SgMSeOJvNV3T7Ge6UtguUtI96A62mCIHDpjWsc6VI2EeQofXwK0bTk5DRu/mIEWg+bgxBKwy0MMmvHtY0ulRmhr9Zmi1vKoPGjGSo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MFbd3KHI; arc=none smtp.client-ip=209.85.216.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MFbd3KHI" Received: by mail-pj1-f46.google.com with SMTP id 98e67ed59e1d1-2feb9078888so11197067a91.3; Wed, 05 Mar 2025 03:10:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741173033; x=1741777833; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kZIVwfRNHK6kNeOdoFYJVwWZHHm2mKiUA2qVfu9IUvI=; b=MFbd3KHILPK0WQQFsQUR6M1+LbhPQfGSneG84iIa0i7aQ/s8zLuURW0uWsEOLkuoBH k44s8eguSJQd38MFIqImRbsu//h6oj8EDZ2dLcprMcgX3wjVoYU5KINk8oygV6TBA4Db G72FZX2JghnXsFCbxbXD4oR+9ItYm2l6PAz2bA8LyYv1IjJVMMbXBDNaTFcmKDbRfsCl mhVlOJXIpk+j7DifrVrxmce1IY9NRrpaptWM0KUGDm6ZCFvL/PrLYtRMKR0v2kl/m/vc CpaA10IEDXa/y9Jz3D8ICRBHGbZ6zTv/e6mgLCGTIkHP/KWXPw1TyIQpvzSkrHGe+mY6 dH2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741173033; x=1741777833; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kZIVwfRNHK6kNeOdoFYJVwWZHHm2mKiUA2qVfu9IUvI=; b=LVbN3Sg2YjfvSULDwutjIkTCqTRX5oPT/nMZ/HXZG9enash61bOi2y2ci2g9rsm+jq mZbCjFJNUribmJxpX5k1wcgmJ9WdqCNgfHB6ZSA4b9b9nVOxcG9t9Ulg/lByDiGBqKWe a0Pm5U/2to/XG4EdTdO87BqdWUQu7/38HlJWhrLGjv5NLBRRloj9XFx8n4GxDtzSCXP0 Z217p7QvmusK/AZkEaP3iiqbMhUf1KB8hOZX/99zQP/yqXNODpiUUmG8Oz3O4nM/kxSu x433sdBxh7BS+NCaN565/PND4GOETLvFWGJuDdA8ofEIobHY5H+7VW1iVm0mihPk2lTH yiqw== X-Forwarded-Encrypted: i=1; AJvYcCW5C4WJSiP9diQJVL/jNqWmJmNj7EanDgDwxqE/+jQ/NTQ2H6h18XUSY9hsZUgPE48DDI5bXFV99J2MfZsQqA==@vger.kernel.org X-Gm-Message-State: AOJu0YyCzhw5fT1DVE4QMvs9NlOXGhOWTm7Is32K4lPreTZD0rddW6vU athlTxV9b16//R3SkjpWGI5+bnmp6jjIxeAWHFlz446mqy/h8JCUgLq5f6NB X-Gm-Gg: ASbGncs6NWCsE35u6UcZJu1CL3l3g+UZpfMWbyQhjZ2c49w+toDOQ+sPYh0Gq+sq9JM ncH0xlwv8ZH5++o/16yIS5qqxLwZGgRGU44xTt5sMFo8RIo3zw/YH2CF8Gnyl2jG9fb/K69YU1n PpTiPkVMRrqWrMgEjh2NGHVrD9X2QvvzuXmPpdSPOT0Eox7XJJXQPRS4aH6YpG3la0Snc5GPckn DwQTiUKP30oz1rjS4JlGOuyJwAcCHUE93acD92y8oU3kd5UiA3D8zb1tIp0kUGshXym+AbsKcqS Ga0r5rKLAewlrlU2MARlIkA/X/r9dBUzSrYO8+T6tsLCom4cyP4BqZRt6iq9GMsnWBxPTzP+jWf fOmaS52cAm4tx5IQfhHY5eA== X-Google-Smtp-Source: AGHT+IEVpBJoZMey/oq7KQx8VoCm5/CPecSnmaQRffQchUbmPSyo23fN5Nngz82dlmdkqtYGVJHxoA== X-Received: by 2002:a17:90a:d648:b0:2f8:49ad:4079 with SMTP id 98e67ed59e1d1-2ff4978a5efmr4417181a91.6.1741173032744; Wed, 05 Mar 2025 03:10:32 -0800 (PST) Received: from mew.. (p4204131-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.160.176.131]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2ff4e7737a5sm1060925a91.13.2025.03.05.03.10.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Mar 2025 03:10:32 -0800 (PST) From: FUJITA Tomonori To: linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org Cc: x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, peterz@infradead.org, hpa@zytor.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, catalin.marinas@arm.com, will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name, tangyouling@loongson.cn, hejinyang@loongson.cn, yangtiezhu@loongson.cn, ojeda@kernel.org, alex.gaynor@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@kernel.org, aliceryhl@google.com, tmgross@umich.edu Subject: [PATCH v4 4/4] rust: Add warn_on macro Date: Wed, 5 Mar 2025 20:08:14 +0900 Message-ID: <20250305110814.272792-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250305110814.272792-1-fujita.tomonori@gmail.com> References: <20250305110814.272792-1-fujita.tomonori@gmail.com> 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" Add warn_on macro, uses the BUG/WARN feature (lib/bug.c) via assembly for x86_64/arm64/riscv. The current Rust code simply wraps BUG() macro but doesn't provide the proper debug information. The BUG/WARN feature can only be used from assembly. This uses the assembly code exported by the C side via ARCH_WARN_ASM macro. To avoid duplicating the assembly code, this approach follows the same strategy as the static branch code: it generates the assembly code for Rust using the C preprocessor at compile time. Similarly, ARCH_WARN_REACHABLE is also used at compile time to generate the assembly code; objtool's reachable anotation code. It's used for only architectures that use objtool. For now, Loongarch just uses a wrapper for WARN macro. UML doesn't use the assembly BUG/WARN feature; just wrapping generic BUG/WARN functions implemented in C works. Signed-off-by: FUJITA Tomonori --- rust/Makefile | 8 ++ rust/helpers/bug.c | 5 + rust/kernel/.gitignore | 2 + rust/kernel/bug.rs | 113 ++++++++++++++++++ rust/kernel/generated_arch_reachable_asm.rs.S | 7 ++ rust/kernel/generated_arch_warn_asm.rs.S | 7 ++ rust/kernel/lib.rs | 1 + 7 files changed, 143 insertions(+) create mode 100644 rust/kernel/bug.rs create mode 100644 rust/kernel/generated_arch_reachable_asm.rs.S create mode 100644 rust/kernel/generated_arch_warn_asm.rs.S diff --git a/rust/Makefile b/rust/Makefile index 8fcfd60447bc..a295b65c43f3 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -34,6 +34,9 @@ obj-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_g= enerated.o obj-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_generated_kunit.o =20 always-$(subst y,$(CONFIG_RUST),$(CONFIG_JUMP_LABEL)) +=3D kernel/generate= d_arch_static_branch_asm.rs +ifndef CONFIG_UML +always-$(subst y,$(CONFIG_RUST),$(CONFIG_BUG)) +=3D kernel/generated_arch_= warn_asm.rs kernel/generated_arch_reachable_asm.rs +endif =20 # Avoids running `$(RUSTC)` when it may not be available. ifdef CONFIG_RUST @@ -481,5 +484,10 @@ $(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/build_err= or.o \ ifdef CONFIG_JUMP_LABEL $(obj)/kernel.o: $(obj)/kernel/generated_arch_static_branch_asm.rs endif +ifndef CONFIG_UML +ifdef CONFIG_BUG +$(obj)/kernel.o: $(obj)/kernel/generated_arch_warn_asm.rs $(obj)/kernel/ge= nerated_arch_reachable_asm.rs +endif +endif =20 endif # CONFIG_RUST diff --git a/rust/helpers/bug.c b/rust/helpers/bug.c index e2d13babc737..a62c96f507d1 100644 --- a/rust/helpers/bug.c +++ b/rust/helpers/bug.c @@ -6,3 +6,8 @@ __noreturn void rust_helper_BUG(void) { BUG(); } + +bool rust_helper_WARN_ON(bool cond) +{ + return WARN_ON(cond); +} diff --git a/rust/kernel/.gitignore b/rust/kernel/.gitignore index 6ba39a178f30..f636ad95aaf3 100644 --- a/rust/kernel/.gitignore +++ b/rust/kernel/.gitignore @@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 =20 /generated_arch_static_branch_asm.rs +/generated_arch_warn_asm.rs +/generated_arch_reachable_asm.rs diff --git a/rust/kernel/bug.rs b/rust/kernel/bug.rs new file mode 100644 index 000000000000..a010033be5a2 --- /dev/null +++ b/rust/kernel/bug.rs @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: GPL-2.0 + +// Copyright (C) 2024, 2025 FUJITA Tomonori + +//! Support for BUG and WARN functionality. +//! +//! C header: [`include/asm-generic/bug.h`](srctree/include/asm-generic/bu= g.h) + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML), not(CONFIG_LOONGARCH)))] +#[cfg(CONFIG_DEBUG_BUGVERBOSE)] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + const _FILE: &[u8] =3D file!().as_bytes(); + // Plus one for null-terminator. + static FILE: [u8; _FILE.len() + 1] =3D { + let mut bytes =3D [0; _FILE.len() + 1]; + let mut i =3D 0; + while i < _FILE.len() { + bytes[i] =3D _FILE[i]; + i +=3D 1; + } + bytes + }; + // SAFETY: Just an FFI call. + unsafe { + $crate::asm!(concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_reachable_asm.rs"))); + file =3D sym FILE, + line =3D const line!(), + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bug_en= try>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML), not(CONFIG_LOONGARCH)))] +#[cfg(not(CONFIG_DEBUG_BUGVERBOSE))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + // SAFETY: Just an FFI call. + unsafe { + $crate::asm!( + concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_reachable_asm.rs"))); + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bug_en= try>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, CONFIG_UML))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + // SAFETY: Just an FFI call. + unsafe { + $crate::bindings::warn_slowpath_fmt( + $crate::c_str!(::core::file!()).as_ptr() as *const ::core:= :ffi::c_uchar, + line!() as i32, + $flags as u32, + ::core::ptr::null() as *const ::core::ffi::c_uchar, + ); + } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, CONFIG_LOONGARCH))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + // SAFETY: Just an FFI call. + unsafe { $crate::bindings::WARN_ON(true) } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(not(CONFIG_BUG))] +macro_rules! warn_flags { + ($flags:expr) =3D> {}; +} + +#[doc(hidden)] +pub const fn bugflag_taint(value: u32) -> u32 { + value << 8 +} + +/// Report a warning if `cond` is true and return the condition's evaluati= on result. +#[macro_export] +macro_rules! warn_on { + ($cond:expr) =3D> {{ + if $cond { + const WARN_ON_FLAGS: u32 =3D $crate::bug::bugflag_taint($crate= ::bindings::TAINT_WARN); + + $crate::warn_flags!(WARN_ON_FLAGS); + } + $cond + }}; +} diff --git a/rust/kernel/generated_arch_reachable_asm.rs.S b/rust/kernel/ge= nerated_arch_reachable_asm.rs.S new file mode 100644 index 000000000000..3886a9ad3a99 --- /dev/null +++ b/rust/kernel/generated_arch_reachable_asm.rs.S @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +// Cut here. + +::kernel::concat_literals!(ARCH_WARN_REACHABLE) diff --git a/rust/kernel/generated_arch_warn_asm.rs.S b/rust/kernel/generat= ed_arch_warn_asm.rs.S new file mode 100644 index 000000000000..409eb4c2d3a1 --- /dev/null +++ b/rust/kernel/generated_arch_warn_asm.rs.S @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +// Cut here. + +::kernel::concat_literals!(ARCH_WARN_ASM("{file}", "{line}", "{flags}", "= {size}")) diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 496ed32b0911..c0720846b249 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -38,6 +38,7 @@ pub mod alloc; #[cfg(CONFIG_BLOCK)] pub mod block; +pub mod bug; #[doc(hidden)] pub mod build_assert; pub mod cred; --=20 2.43.0