From nobody Wed Dec 17 14:23:45 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 33BF01DB127; Fri, 2 May 2025 09:46:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179212; cv=none; b=ajwp8f3fM8uVB+E2h96uullXGaVk0ocksdm/Rag0UbX59KzIHJhF2iQZILgb0ZmLsxTis6YkkWhC4yYFJSf4YGhcYgLwFYEA3VfvcuNTlnCHJZwfvt4miLGzv+I8YqxOD4+vM5tDl2TmywRAKUD29Lln4VAtpDtci9Oz6oggaCM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179212; c=relaxed/simple; bh=bS8Ebl8McHMwQRP2b9+9bPhRqECSzCU5b02fcngqsqY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=glhil5KrY9K33y/KbTs56rvpyeCOHK7ElBnFQ/wAjUWBVyOaXmRrC9pIYg3XJr2q8aXz444CBM3Uf31OkFctS2WtzY44EPl9SO/vjtM24YHr3PyBQ9vLMx1mZF0E3zGWE+TXSS9oU6DSoeoNYH+IYjBYmdA2qvcqSEFX8HTz++k= 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=fN5s9ElW; arc=none smtp.client-ip=209.85.214.169 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="fN5s9ElW" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-224100e9a5cso24444585ad.2; Fri, 02 May 2025 02:46:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746179210; x=1746784010; 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=RIfDOjq9qhHckyXryae5MbYL+xPZ6FAVHhgspJGsYWI=; b=fN5s9ElWI/WGJu4wUclfCdAdMTRoJ38GkEkVscLWTkI7pEQXDOptXvmNlluM166+w2 aZGhFQkcR4Oq4ZRr3jatjq8R3/FfT60hjiqYGtMOqYMWpJP0MKHZJLFEOANeM0U2ydXy I4L+OQQuO09K6VYgzOGsz4xyK0rgiK375y8/2v/cu6lFY2Fl0g0nU/PW1OShb8HOwJTI eNpPAha9QwLHdcvkkI1SktA1iCcQUcP20nUdSSA0OhnwKqqeC+9ljKGb8gVS0oaaR734 Bv8P7+yZ8WYNGcXhDSEWiwqfinWcaTlzwJudI4iOIcompBon/IZ+XkEGOZzm1JaWQ5Di bdGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746179210; x=1746784010; 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=RIfDOjq9qhHckyXryae5MbYL+xPZ6FAVHhgspJGsYWI=; b=lFLkNdye/eyTezitXGgWhxdAucVtjtRfYEDknhsCn6pizGpmj1lA9OZcVEDKWNttbK wmTq0vA59cSrLkmWDJMl16vdDiOk1rTPpjnHEhHzgWEbTLgvZPraZp8TWpdlVqr/ISY+ OFZZ1p9o83yvAe+zGY6qhJ4VaFr0qvH3W8Ekqs3y/vtUAuBMhHlk7iWOH6hggaoQXDNW XWiFd6AHnuVW8uqIOW5jhVzEQ1qYa2JjaLQHzfgWAw+HXOxKNyIc1M+Lk6LfKkjepyya bMsnJET4JAgjCpspenTh28W9RvlT+9ukZ9dBSCST6MG2fItnRTu2FxynfYQL/6LQN/Uf JJFQ== X-Forwarded-Encrypted: i=1; AJvYcCWv9B74rEikBil++1PmsFDxlumL6hiYX/hVFmVZ39QfZSV6sONhuDms2k1S1vjlsAWAp4ZGXpxpoG+v9yx+Xw==@vger.kernel.org X-Gm-Message-State: AOJu0Yxkw1OsOMvx35VCxLFUNgK2WLzOtnc3FFGJN07CMMuGBcsgs/iD 3CR1OA5Ic8A4iGN9RVEQ/vJb+Cc6mvNT93iVSnU3pzGXaXXUJZPDE1BPmtVH X-Gm-Gg: ASbGncvOmiRH2o56+3vh5nS/Pdq0bO9CJXVT+zEuXdFg/cpny7ugD3BEo2+dZYu/jJW pT0OqtsrbMQxdOxliDAPOYhrvtAOEG8X9aVpGpegdxrl3k+/Y6wMO2tGuOHAE4aGVHS6H4fDOI4 wDx5Dv2pUKePrdC2MlS9KUQq/i66QBOu3eA77xRiVJdJ0LCBDu1mjXQI4pDIOus1nZduUYRs4v7 iM88a8sopiZs2QStSDld6p/3yllUHiCNQyrZrZb/ofmuI+MGIPhKN6SpVfDIfpWYJ29ltNc7A3k KfG2i4isbZYGjTtfI8sqWeAw4BCVakTN14/9btZrDNJfgs2uTsG2/7nr7v9h5HDHj3q+MdBrTV7 XtHbYXUfK/QkfjoYHTw== X-Google-Smtp-Source: AGHT+IGNrYRWFIFxS/SMvu1kN7DhVaABG7vkSf2FsbbxwbcCnEdTvQrlp1ORF1H2Cyveec3KLO5zKw== X-Received: by 2002:a17:902:f608:b0:223:432b:593d with SMTP id d9443c01a7336-22e1039ef34mr38688315ad.42.1746179210153; Fri, 02 May 2025 02:46:50 -0700 (PDT) Received: from mew.. (p4138183-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.129.206.183]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e151eb166sm3273565ad.96.2025.05.02.02.46.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 02:46:49 -0700 (PDT) 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, dakr@kernel.org Subject: [PATCH v6 1/4] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Fri, 2 May 2025 18:45:33 +0900 Message-ID: <20250502094537.231725-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250502094537.231725-1-fujita.tomonori@gmail.com> References: <20250502094537.231725-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 f0e9acf72547..be5aef1aff9e 100644 --- a/arch/x86/include/asm/bug.h +++ b/arch/x86/include/asm/bug.h @@ -32,45 +32,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 @@ -92,11 +89,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 Wed Dec 17 14:23:45 2025 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (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 81E3522A4CD; Fri, 2 May 2025 09:46:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179219; cv=none; b=DxSlKOK1jdURQHk1t2dpDPA6s+SNwVTRjJI1aOIpmT6fA4QzZB8Bbnqhu8j6nkNnjgTj5TH8jSFG8GsbUTQlFYKeAiV6ysFNyA0LTeNR0FyzTnLyyqQcnL1LH4OpxV5Xw44Yd6nGDSzYPsdt1/1hibd/NRtsnq9EmTDdIE0OkGs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179219; c=relaxed/simple; bh=+7XITjewWSl80gT0zr6uyJXg8p1d67Yg7lRhbz4DBTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hVa5qpYoSgjrxa28QITn0VyjhRZPGrklx8ul7xfrLrh9t135jRMJmDHAf7keBnC9kE7Sp4vJAftHZGzNxrnXA/yhfgArbaZLXJr1lF/wlvgXW4sUlSzYurcu5gQFwgiayYTsYjdmQqRSXVuNrCM5qblzNO4NLweVMd4qgyfrI9o= 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=IZIXOho+; arc=none smtp.client-ip=209.85.214.173 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="IZIXOho+" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-224171d6826so27533665ad.3; Fri, 02 May 2025 02:46:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746179217; x=1746784017; 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=IZIXOho+OMZPO1ErWSYQrt909bFHk0eww5yRS7TI22/ZrOHayoDNuBbZjI5IRmbNVK Wmtna5cL8KBlmabyIOtMYTKgC8BlhgsqG4VUvLc5vF/MwcG7BnIt9HNqEyHYHwtrp7WO ahyEhO58r8AtSUuHUF/wOdHB5qBe7m4/kqLYuwHD/FnRKIp60PlGONIAe0rwSIPJF6PO 2qVu3ZRbME5myeX9rovlVhCKfpDPhQR+xvDIEfmPTFrQlDK9HvqQ40nLle/TEq2yIQlM cTQQHMphvonljQ48XC+Ik2fclWlO39A63LDQVPIg/o9o3hVpJuQnf/2SYFlym5IDw4MY egkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746179217; x=1746784017; 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=GlfCkofxSB7fSCZ4EuMC/KuH+rBEdWvLdCGhlgHXCD2VnTAU1RlHzal6sML6r8Stdw goiEHuPIgHFRLk0eVEANwxgAA6+rfdGdRExhykV9YuNRKu8QQcBjqsiI6yJ14YqK3/+b mch5K7UO4a8a0Vf3u/qGrdBiJzLLaHD8l8A3t8vHWYrILx7qGI+/SKnrLmZA60MRtQ4z G6K5nQFIBG3P2rViSNaej1Uy7PbdrenRmr9c+zmChh4TRwAq0e4bLw6iyqvHKx8BNVUd H836Lb1+OSXYqSSZ9K5/4bLZ41vXCCTdFpFaIwqOzXVcFEfwFXt+YajKNaHMyY6HHUe9 d5KA== X-Forwarded-Encrypted: i=1; AJvYcCU4z8ioupqtUhcvTCvEOw8Xs32MYht1BUbz4THitsnk2rFVEjDAH3WkOS38nhS7qBXTCLmyhPuNEPxt/p+9rw==@vger.kernel.org X-Gm-Message-State: AOJu0Yy8wcleNEHSDxgQPJ29bzOiYLThW26xKiraw29BUwddsY5EmH8B TdhAoQOwua7UTu598bNjMFFYbb/s1Xihx+FSa039qp+Z02hAvWlkhMUpmSWC X-Gm-Gg: ASbGnct4s9hpwBMdBzD58rsyO0EIGkEf+ITBnbSPP7p1V+ErCDhnwhnVqi8DGbRiS21 GUwD3pq4s2QSPzZt91EJ+h0IK3WgKy3MvXCqWgu5RosVYBpopudi7voRx9l3TqCH3G4bZ0Gy1Rb oOJCubXR772bkIDYQbS+IZUV6iNhU5W8XpcDyfumldr5fzaJWpJFivVh3PO+6s2crtq6MLjl7G1 cUy/aquX/NFMkPwRU/vcgsb/yUxkbvLMlMgXEXHGtDVgv8FsqYG1PzTmCEWH/YbKFF2YrGy5d9v QKrPO+K1uU/xvwtE+kz9NiSIHCasuO0y3CtbL+I7DaoGe1OXe0rLcBvSo4jsvIc6SuVhvyj74bO tDWck6okKiyen5foI5A== X-Google-Smtp-Source: AGHT+IEhuS4VGYIBGVglTshr93vZldL1f6oYsKTf904LeEzffsUEpPtdIRnpOF3hALskrUWmu2hnrQ== X-Received: by 2002:a17:902:cec8:b0:223:fabd:4f76 with SMTP id d9443c01a7336-22e102f707dmr33312405ad.30.1746179216668; Fri, 02 May 2025 02:46:56 -0700 (PDT) Received: from mew.. (p4138183-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.129.206.183]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e151eb166sm3273565ad.96.2025.05.02.02.46.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 02:46:56 -0700 (PDT) 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, dakr@kernel.org Subject: [PATCH v6 2/4] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Fri, 2 May 2025 18:45:34 +0900 Message-ID: <20250502094537.231725-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250502094537.231725-1-fujita.tomonori@gmail.com> References: <20250502094537.231725-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 Wed Dec 17 14:23:45 2025 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (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 E913222E40F; Fri, 2 May 2025 09:47:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179229; cv=none; b=NhQ5QyPTy112kg3xGwB3AaKq+b8WjttK+dtVQSln4KiP43dkdSpqUDoG7I5S+NyVIAWeq8hF1iezeQ8mGb/WjjzuemQEDpcJ41eM/gPlDHFcdCuQ/2flE/gGIyFT5o/LIqnsvLimzaEysQrECqmW1P/N3AH5ofBOsNbaRUsYin8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179229; c=relaxed/simple; bh=mdMjqDgKLmfSj3Eltmr/eklydzSfhT7tfE+JI7T4puc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T1QMVL/ufUOIy49YfS6OAspfpXQdABWkqmtgptxt026xzqTxADa/nOPZmj9HdK9d3jxCLzSU2FvwQaBAc+24+/iN3uOPUjDYQdlkkWAOKWuCXZnow/FElRAz/uIuDrao9eAbyby7B4ZX+0Fk+DxJlKdJPvWOIk7AkTjs6v4VJf0= 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=bkxk201Y; arc=none smtp.client-ip=209.85.214.177 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="bkxk201Y" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2240b4de12bso29820195ad.2; Fri, 02 May 2025 02:47:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746179223; x=1746784023; 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=bkxk201YH3Uut5tb+1fPuBIHz3CUr7XZD2WJpzZdQY0XWOQCUbghYi6+URTmlsraOG XSSl/WP5a6V2lrcWF+qPguFnne4/8GzSloH0xafSZanixseUV31iQKSwtyMIRi+5ibdg o8/s2JYokGz5nZr9P5AQ5jdhAp4onY2kNU/CzpxA25Dj7IzrdWKIRUABCu39JLGVGmU3 Mz4xMU6j5r8HUI1gI6TuMYaNR0SehwSrizbscOxToPnk5c/tATUtRTb+Q5UFP9PVfnTg YpXM6lSFXyOMieHd/Tj1xbeCpmkxvdjAmgeXtmAsnEPWG7SFYU3WQ2DIIpJbyc4Bqx+X v3nA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746179223; x=1746784023; 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=Bs5awnuDcnr0eRpcxv2mxgZAuAXL9RKZyrQ9zBmriVDWwBCwq82IR3COObgByloRq/ CU4mor19nZdMe9Ev8tnO51JV5zAZB1naQ0FlESPKaOl1dG8Iax1anm5BssZeiuCNNaI4 RR1EMWXH6wfGvVxacxiL0p2Cg7uHWkXTZ97uigRLTRyRkkbzB8zvfJ23xyp/q7SNXHRZ WZhmJGhoKjCYCQNwr87ktWI8N25Qw/uvyO4s15FzTeBzXbi29PPo/7P+/xFoV1hYQGjS jlfXiYQuuZIZPT6Jp3ypQBXQkO1WtRFh1NIXnPIiM3cLH415FI+wLwUdEqvCy8Yv4b4p a3+g== X-Forwarded-Encrypted: i=1; AJvYcCWENypMhtsplhkQGPjex7HUCnUOy3fbmLGnTk1d4uyIondpD76pW0zExK4zTEJQR05GkAtA+13lSpONHF8byw==@vger.kernel.org X-Gm-Message-State: AOJu0YxC/g5R3kA0isMbNMT7P+k9pDEvU6SwDJguyXh/w9KsosnKTlNt xxdLAu5JkS5Zm2RUS0brXPYtY0ysGJyvcq1Py5YEtGLlKHz4GOGXm6iTg0sA X-Gm-Gg: ASbGnctWsB8DJDC7g6xAS2MbALsnQULwZjAG6jpsOtD7QeQ+wBYvw5Cf0XkDkB6tpkk zB4R6T+O1Fkza06FRG4NvjLgQj8ubQBqZunIUfgbj+BiP5ssLPvrmFG/jRN1KuE5qZ9Ek7zo5n5 bJxd0V/tgyxF8bLf/uoxhD4rnfioUS3VrYtIJqUH6tJId3UK2fFfwKK0BqOyGTU1nsGMTyRwr5x FqE0QejQUBGgmF1OrA83OzqMMT+bQ0gF2fCuTbI7UyZ2SUlrBBnIjk9dB02zu1jHWPSZZkdSyzH ExtbXF1ku7nbYmp45e2tU2smnaHWrXwBffhEj8PLHb11tewwduhPqDGQxsv+VBMqQC8U3oCo/YZ 7TrI2aVeMaMmzydhB9eguJkhd1DaR X-Google-Smtp-Source: AGHT+IG7SpxC9CYERKlra1NSwOhm+ZnosVtJEMd3hhbHfc+fF/GyvZa2L0kJpSrWYrENqsswlrl6UQ== X-Received: by 2002:a17:902:f70a:b0:22d:e4b8:7186 with SMTP id d9443c01a7336-22e102dc24bmr40114995ad.22.1746179222992; Fri, 02 May 2025 02:47:02 -0700 (PDT) Received: from mew.. (p4138183-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.129.206.183]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e151eb166sm3273565ad.96.2025.05.02.02.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 02:47:02 -0700 (PDT) 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, dakr@kernel.org Subject: [PATCH v6 3/4] arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Fri, 2 May 2025 18:45:35 +0900 Message-ID: <20250502094537.231725-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250502094537.231725-1-fujita.tomonori@gmail.com> References: <20250502094537.231725-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 Wed Dec 17 14:23:45 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 9A373239099; Fri, 2 May 2025 09:47:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179232; cv=none; b=kOwpPizn1ZK49G8LbE2ZXId/b9w7J7EIUe/Z0lgMwmXNCQ8wqc1PUinnYAFiiVHjNU/vZSFaDYXHuE6cr2jKqkuBYTRT3ujOxs3u4kiYA6qhMSyqSJlAyE1lrB9M9HZc36p8QtLHqANQlNY7XkN4lyhK5p35kiSLZRMLR702q3U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746179232; c=relaxed/simple; bh=F/ioxLkwrGK5uM6SqQFmwcOuoVcvbM8a3k5uGh+UdI8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kutSFxxiI4jHJYHDqabS8eWjhlvscaL4mMxhxmqdha/oyGW8c2iXp4RPpRu6GecydCpSyksq7Di6HeqCkeD2Eb5a86lOeXlCFo8IQM/GAO0/3La1I61UwLXWcSafKjoIQHYqHjwUzK6jnLCkXmRyXOxVaQQPep2ddHblILT16WE= 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=kMyPMiAE; arc=none smtp.client-ip=209.85.214.175 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="kMyPMiAE" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-224171d6826so27537235ad.3; Fri, 02 May 2025 02:47:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746179229; x=1746784029; 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=wWwTYv3OuQyqBw6PFnlRc2w3UN+NoCmVRkA1ASlyyn0=; b=kMyPMiAErFfV6R4KB94TRotG5wLyFUhwQJbbYaefjTz5bpzrlQwQPLNvThxrzpnUuV neeWUpwKnPpzepJmU5fMipMCAvbost3ETbZclQNPvLenlQVBj9UQGBpcSNKp3pzxaSdn eirxCU3sh1TZLCExyurJt5oOBaSX0V01aMSRNdLqf7I/vSFshKD3C8w1jrOIajZqierX PAIp4ChrrPzoUHOo8QlyedGx98wvnUdPwC9UHyaH0KAcNhW0THLKwXyvQvRUPlLB1QuR pLPRJBDFAWU94xFv1/5fMdcUxfJetGIiiEs1HSPFbomxStdyxboYziCkg8M2n7TZaruY /9ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746179229; x=1746784029; 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=wWwTYv3OuQyqBw6PFnlRc2w3UN+NoCmVRkA1ASlyyn0=; b=Lq6x6PFKmvgc6QLeNe/vkxM1TT4PCpteefJA6s/sU1bOmSg1MtUsdY46IjwlKhRjBp qumsdisH8QgUgcA/2sOc7SaGe8jIaGPfQ0FrDDDM2+thzdP7B/x4NWqAEu4wjN53swN7 MB/7kS5p/PS487wRLBnul8EVbAuTS0/Y+RPbBC6uOvLWKWty+NUFIO1Ctm3zhr66se8D OpcYGrUeyd5GkOqldXQuYAf3XkTOR3bUkaVWhcK7zF6mAtbtx+KWldVKl9fPetcpxD6V 20KRDtzgOQKnPSJIRVf3dr7VMv5ZUviLb/OhmwNBpltHWHmc6GX5kt9LdJAe/55JMqhE sVRw== X-Forwarded-Encrypted: i=1; AJvYcCVfT7Zge59MZ+gSuXbXzmEeiBi6pBQSpsUApPdEdpwRJkOlCrrGwG99kb/nWKqM3901vjWDwQwgiBvPbOg//w==@vger.kernel.org X-Gm-Message-State: AOJu0YxHVe1T7XOZtRWIDwGqZBt7fv6bdZ1L1Nmv0U/VR67JaJLzWaB/ 1TzKphJtfjfLy64gs+Z7JbjEkJxalD1fXUrZuKto13sOzs+vLxPKvakvnIHR X-Gm-Gg: ASbGncvvFcMlvdoihskpl6EgcShYYov6xY7W5Gy1WGqrDIJQmaa870LKbiE3Shk1zEa AjhehrpqfMTvdSgVkSj+SqUhnXNhJP+BZBzGouICFB4BGLLbHhm139piEsqrMzDgDTCHs71WVw4 dASdkJWPISPKXiNOISYtb91LgDc1/UUJMzGzPrJUKP0OnV78LtBevk7SKu3q3mH9/S84gL6siY6 Xuro68S/OhUKHWS/EhJeckx501CpV/BgURFtbYOnAPKa8+ZRM1iPpDQXa7wrWgJf0wvj4SFKMMo Z/H0uusTJk5zhfapaG/dYdoPN4cZZWD0OnAMcYeeeHR4Q748KzSIxrQu46eDKlhIq51DlVfWEAa YYwdeHUmqNCUk5e5qeg== X-Google-Smtp-Source: AGHT+IGbwIKmjfJSvIlalpwpU81DyeocVw//dhZVAVqySp6/OCnXJS9YDEVoTaJ2tYPhS7J096/sbA== X-Received: by 2002:a17:903:40d0:b0:220:c178:b2e with SMTP id d9443c01a7336-22e102c722bmr39746555ad.17.1746179229387; Fri, 02 May 2025 02:47:09 -0700 (PDT) Received: from mew.. (p4138183-ipxg22701hodogaya.kanagawa.ocn.ne.jp. [153.129.206.183]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e151eb166sm3273565ad.96.2025.05.02.02.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 02 May 2025 02:47:09 -0700 (PDT) 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, dakr@kernel.org Subject: [PATCH v6 4/4] rust: Add warn_on macro Date: Fri, 2 May 2025 18:45:36 +0900 Message-ID: <20250502094537.231725-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250502094537.231725-1-fujita.tomonori@gmail.com> References: <20250502094537.231725-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 annotation code. It's used for only architectures that use objtool. For now, Loongarch and arm just use 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 Reviewed-by: Alice Ryhl --- rust/Makefile | 8 ++ rust/helpers/bug.c | 5 + rust/kernel/.gitignore | 2 + rust/kernel/bug.rs | 125 ++++++++++++++++++ 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, 155 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 3aca903a7d08..0b795cf05a34 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 @@ -536,5 +539,10 @@ $(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/build_err= or.o $(obj)/pin_init.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..1191391eb2cb --- /dev/null +++ b/rust/kernel/bug.rs @@ -0,0 +1,125 @@ +// 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), not(CONFIG_A= RM)))] +#[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: + // - `file`, `line`, `flags`, and `size` are all compile-time cons= tants or + // symbols, preventing any invalid memory access. + // - The asm block has no side effects and does not modify any reg= isters + // or memory. It is purely for embedding metadata into the ELF sec= tion. + unsafe { + $crate::asm!( + concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_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::bu= g_entry>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, not(CONFIG_UML), not(CONFIG_LOONGARCH), not(CONFIG_A= RM)))] +#[cfg(not(CONFIG_DEBUG_BUGVERBOSE))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + + // SAFETY: + // - `flags` and `size` are all compile-time constants, preventing + // any invalid memory access. + // - The asm block has no side effects and does not modify any reg= isters + // or memory. It is purely for embedding metadata into the ELF sec= tion. + unsafe { + $crate::asm!( + concat!( + "/* {size} */", + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/genera= ted_arch_reachable_asm.rs"))); + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bu= g_entry>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, CONFIG_UML))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + // SAFETY: It is always safe to call `warn_slowpath_fmt()` + // with a valid null-terminated string. + unsafe { + $crate::bindings::warn_slowpath_fmt( + $crate::c_str!(::core::file!()).as_ptr() as *const $crate:= :ffi::c_char, + line!() as i32, + $flags as u32, + ::core::ptr::null() as *const $crate::ffi::c_char, + ); + } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, any(CONFIG_LOONGARCH, CONFIG_ARM)))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + // SAFETY: It is always safe to call `WARN_ON()`. + 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 de07aadd1ff5..bc13e92bdb1e 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -40,6 +40,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