From patchwork Wed Mar 5 11:08:11 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 14002606 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 07411C28B22 for ; Wed, 5 Mar 2025 13:03:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=4L7yH+oSz3zh/yqHuoQx7o2AyOsmmFhtE7jhLVDJj+8=; b=PwguEk7tjgobNO vmM8J7IpPLk+Y4aAnUrSmUMDIuouuGmwHZUZ3GB8aWYm+vNMuLSNosJe7ax6nbhNnrgVI0br8yij7 GUiAjQT2ls+F5aQtdGJQlV79xxQypLszAUH91gVaFyNAHAfvkAZZu/b0tlEMNfQwvZ+DrwblBqjlr JKxE6XZ+UO4jR+rtk1JBR1jUK5ZG4yJUPZZ9otXOQc5JeQl8QsWqwlNk+kwWtySRLrHDFtkERAYbx gpqLhsjwcycPr7Qr5QSCZpb/swswN7FBsBhUhwff91FU9Z/uMczMtkHQ37J3OW8KUmvqMnHOXZpFv JOBlQzPzCGPNe/4k+ohA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpoPX-000000086nY-1lf0; Wed, 05 Mar 2025 13:03:43 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpmdi-00000007oO7-3ayY; Wed, 05 Mar 2025 11:10:16 +0000 Received: by mail-pj1-x1034.google.com with SMTP id 98e67ed59e1d1-2fe8c35b6cbso10575633a91.3; 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=lists.infradead.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=k1KU+WNHW3r5m9zw5bMJ0Nc44+AtNAbYdMdsjpgh6MJwsDv40I2qG/EVu5UJka988c yvm8oQwOXyKuwfQHlDWpiNioiC/+L/TeM52diBuXBJaTkiFiLxoDNf9DgJPhTVhNZsBs a3jRfIUt1RdlSG0yYRgb3L/QTftG75cRlfjyuTNTzqzNvZlSmNZY+mzRT5nbiHPN3erT xhHAX7MTY+G2snFg16RbKR4wOXN1wHLv0Ll1KNqy8AXrM7FxNZ6QZBqfTUJyc+ZQr9Hp UmLy9+l3XKZnJZYHRlW/gTDFu78+5qucGNputDQ1ylQTrVvfOSeYG3ukoBcreGL+5Ss9 9Scg== 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=jVb6c41xqefj2RK8olcTpIMou1e97YW8lctU0KjAB06HDDygP6cJvNAfA+CoyPMZ36 t3hcqXOVZiLThlLqTT0WS5Nd/KNHzsmW6Y/f+n55uh8zz/FMgk05nHQM2FthSPdwN0ve ZckSybyN1U+KYrGWral7i4PqcRzNfcYt8D4vT9ylchz+pUeKXR9jty1efMD7KfHo3CXT rb6B/tdhxoQN9xkf7bFeuRvHyPze6Ot+9RuvMNzuTh9si/AatRd3WClIVQZWyph3AhWe VtwE+yzMnkZXUCvMxXMXLLVV9i/anGbxZbRp0TynDHR9TbeYvcqabiEPiM1dT31Wh3dT jGEA== X-Forwarded-Encrypted: i=1; AJvYcCWYrjTMwhcyCL9l25hg1IrV5y1i6tDbQsAekLuCu3MjjBaRmxP6GZxJ9psmQsc7TQlm2TM9eBTT+Waj/tc=@lists.infradead.org, AJvYcCXUGFOyhVPEHtizRKpddsdHy4I8IE4PLWMq3ClbnM9Bkw8jl43JgtyxvU6EOWzhxp5TX5P8S7wRXB1WSCWqB9c/@lists.infradead.org X-Gm-Message-State: AOJu0YxObU2u7m0LKltS6ucKnkgbHmsE/t1ChDXaYTQB+HjadfYxDdWq VXxyFGPr7tqxqGWJAyO7ZTyjeWl82ivNH7ECGE8rTC1brrP51poS X-Gm-Gg: ASbGnctAFFJAckvSjDeh4B0DPsCCR0WHiijVd/tI4XLSmOHCY4MjxUKlJ62PoDwNrFp YEqYNZljmTR6yJx1z1HVpgpMQ3yBK07CfnCxLlEbKjDyuRTINT0kt7KeyOmF+Qp0zomRiDRFbqI QTIF/f8zrIDQoIVHOzx3WvAzbfBNqjRcMjDksRkxhD/Dp6iikY9r8onAATf+9P4yw0vO67BHQ/C c3QNKdk56T9mSJ9URBwwBwb8+13GIix1VROn1NcOwo0riFgWRLJxvaqmG9Cgr9LZx+IIPe4wV95 6qs6UKAJQh4gP4IB/TKecf0bGV/wvZpKmKj9b7B9M+A7sX94LhEZFFxeqT/yhaa9MicNF6rbIJn JTaJyuxCYTQ+UI+YY3TQhGQ== 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250305_031014_888363_AC83562E X-CRM114-Status: GOOD ( 10.49 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 #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 #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 #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) -#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, "") #else @@ -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 = 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) From patchwork Wed Mar 5 11:08:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 14002527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB898C19F32 for ; Wed, 5 Mar 2025 12:02:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=KGIsw9Ij9YMRjCKvkmAlkOk2T9/+TmX6P+SVLJjxeNE=; b=zl2l3Yd8rJpr81 pBiRo6m9f7I+1BMH3gAHw3hLcU5iNGyLuwAv9gBG3kBJ3Ci+ys0T82ZQ8N5xSAH+18Vf481Fn01Wg ahIzzGFiSdqBa0BbmX0EfokuBXcH+Dyqs9/lI7SzmOK9JI84VR3ki6bttcTFGmu783JRs+Ms1Xz7X LUvS3Xz1Q6GELCC4YxnetHQc1SOVRvr7cHh5q2trYnH1ma2o+feDho4n2M8fjqPgl3uyrSlEEVMiP 2K3a/phZmltuavqG0TRnApM0AvReY+EsZCCCbGcOdb7JSQgvFlpg8H4qjariVzefwwzRzmoencd7X YomvXRLeQkulXQIfINSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpnSW-00000007wNG-0iuS; Wed, 05 Mar 2025 12:02:44 +0000 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpmdp-00000007oQz-08XI; Wed, 05 Mar 2025 11:10:22 +0000 Received: by mail-pj1-x102d.google.com with SMTP id 98e67ed59e1d1-2fea47bcb51so13276435a91.2; Wed, 05 Mar 2025 03:10:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741173020; x=1741777820; darn=lists.infradead.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=hBgbFLNytPY80MT3aeRvgVIJE41vf3Bup+177+xTWtUckfD5I0joxmZnyePWufAAoi ym8UEjSbhcTcqjejJb/Rz3oUyE6aTF4zawLt2bxlmQ2IP1F0viHnHs0coXK59FAy3Bkr Kg+fQ2TAhu3Zt8ODdIaTypCVz3j3vTyjGdQGmZH8Jhw2dsqENfnh8N/f4n5GevrlYSA/ 8fKIWKBLZtYuNV7UuCoUGfVsbHB76WAFAg6tDqgSfFAkyhxcDNkLlYveNOqoz8Nc7k5X nw3xHkX3yQWY54ECDTSekYD8KCJSzyMPMlASXNR0TT1Cv65+RAkC+zdvlSDT8fwsIRpO G7dg== 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=Xgt0jof96PAJI4Ih90UuurQs196TwdZ2crjNElAcnjcIgTBNjmJPccT7AnTSzLO64S VISFJHo6t2qDgBqRgiQHMByfJa3tc9b5EgNDKQtG06oiv+vzUQcW0VzLpdnVyK5N8kyM ogzwQ0mvlCFsipdzHWjJVeRsqfsOMrx/LYFfPQgPZ5gUm9PWLqUMUqwbIHczJMRKGW1Z BxM2iFTi7jPMYGVgaIW8twC8DZbEyDIPRc4CSUsyIzJmh3w3PX/nSAbv3gzxU3pZ/WTC 6N3/MJCAX3FQRxgLy8pv14fC/WFI+oqDLuoi/aejT6FobH7ZkBByqeJKWoNnp6SD2k/8 gmrA== X-Forwarded-Encrypted: i=1; AJvYcCUt3hAOTMZdfe17AoMaz7HmXOqZLG6kzeELbi825pvRhBRR/dnZpT5WYzcixkUZKyuNsLyf0J2bqwQupm68MFDF@lists.infradead.org, AJvYcCW1P+tm3zTAF0TEOrMoAvFJ49c4Hg+9FRefmbNzWJTCWH6jqHitiKtm2lDWVvZJzwME5U78Jt6oyqteU4k=@lists.infradead.org X-Gm-Message-State: AOJu0Yzp1uzmqmny0moVrZx3U9edpo31letsY6gK/M4JiTlUjeQeZYu/ DFgRB+ZN9nDeT8GcDQv3r2u99Z5YbOiz1TMGULFDMtI4TKGbwnpO X-Gm-Gg: ASbGncvEba7sxWgjZaF7EHQ7UJmQCKp5bfrBHYcahihoD8rgEMl0diw2MBbeIbpSAM+ di8smtgvSXJ4v15iWL+47ilYnmCgEU6/aJ/BmDobHnhujfrcM0TPRrUUZwWufuRBXDlXgri1K7k IeQ6wmMr2COsfP8zn4QldLPb0aVYvm9bGY1R1Kwa7hPrzbwQ/tq07pWFjGmxqIdWOfvYerq+y/K 2IK/WSucwTPZzEmP4rRQYNREm0Ky96fq60f8sKZZv13HcesFtiYErOh0TpqSoqZoKJIrxCETaDB 8BkCEF9OvpnUfrmEEXZOkjTav923sL16YOYuf7jALIhZ5KXEv4cz4+NHFu/aDm8isxktIYzKoZM hYGj2U9KVucObheb27fa1/w== 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250305_031021_079619_E30EF136 X-CRM114-Status: UNSURE ( 9.13 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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; #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 #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 #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 { \ #define __WARN_FLAGS(flags) __BUG_FLAGS(BUGFLAG_WARNING|(flags)) +#define ARCH_WARN_REACHABLE + #define HAVE_ARCH_BUG #include From patchwork Wed Mar 5 11:08:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 14002528 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6DC73C19F32 for ; Wed, 5 Mar 2025 12:04:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=km0AG8urv0pB1QL7d8EVl2AnQsbQgWduZlIxCpRh13c=; b=KZEaMhucwAQv2b XSyvUBQl01iABjklip/6zxt3e9EMVsLXFPc60h8+PfzsX3PBVy23/u6l/u0dHlskU7ZoQGskv8THf V0RZY1yMA6WC6gGZIH59lE0nib/i713zeU6XMm0zO8/8wrVoZMaInqR6E6VGWSN20TkGgEHJ5ffQi yki7+SJqM8Kv+v6U2cq59j9y5mPwfPSnP3NUr7ciAJySFjujOXXrHFwbp3E5MWMqDmf3R2ztg9rZw 1LmstsP32Nf5ZkXI78upv8q28BObaTO4Cgkq8/chNQ+9DwbTihfgFIdvcHrsLToMyTLtXc+PCfW84 3BL3PMQJU5HwBH4Lv7Mg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpnU5-00000007wgZ-0D1B; Wed, 05 Mar 2025 12:04:21 +0000 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpmdv-00000007oUC-2CQl; Wed, 05 Mar 2025 11:10:28 +0000 Received: by mail-pj1-x1031.google.com with SMTP id 98e67ed59e1d1-2feae794508so9671424a91.0; 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=lists.infradead.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=JQF1YHrXEo1ASbDRsoZZ27ee2Byuk5hlJT/40F1fX8jX6JRjif2ocCw+H/FH8ZQVVT Yxb46I5og8R7q73i0Ohul03AU4ypaMAE6P5fVc81nMF71Xhz0KNPIj6fBoTuy6sjHosH ecb1dqsrPykSwU5wNENU/fPpiq+Pzq5lImYVUMkFFq7v28tSQVSqr4RYwO/8S0V2pg/q FYShdakkNfq420cwW0Wm4Ew2WwrjZty3hSBihrL07186WQiWOIqo8005MjQDSwu9Vxty rQQm1Xn+3CQDLXSFfJlYaZLJ9Cp8qD+9UGYFGQLAeUYfSxCk4FVf3rurpiiHHH19fO+P i2ZQ== 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=gdcY4EM5hprwRwR3cmCv/VVJYosfrRPrDeAuq4epv0gb61P0fm5sYxOQYFqSpZegvQ 5V96qbXYwUb7L20tqRC54hG8KGn0wmMgsZJ2Yrx23sdfFzF78ZxMka7PnTJJWAnHDf3s 6+iIbKrlh9OR6thdCFVrlz3QbX8gloC5WdbQw1PB+kdriPhoBHkigpnrr3HV+faeOTFO d6r5bSPqj0PiYxuCr013uwxMjkVAhbkZlhoJ3dvUvJaI7iiXqTgUj6t0xPIzE0T0zJso 1pCPnK/UUDvoJ2Jds6occgHMiJc8YIEJwgrl50sVHxwjY/SXJ5SZKX4OCwrJp0QT5tPx jjtQ== X-Forwarded-Encrypted: i=1; AJvYcCULEEX6drL8DEEhPhE7shircgG6rXUAS7uD1/q6CEHaQ2Zlcd7qVczxZa/WVTvgfTvheZizqYpkSNTijQ8=@lists.infradead.org, AJvYcCUNYUr0lycsgX//f7LZuIeoN8natg800vyWfrRRyTQ3UZg171POAh0+TQRa/Qo0fQVxgJNgDe1eu+0Yu64iDkiv@lists.infradead.org X-Gm-Message-State: AOJu0YxKCMzcWeNk/XNuJvTNdrwcruLEPAbXY8bbT06V+p3S9L6EK0/8 gF7v/bKYq9NL1af4K2LnSeJo/z1KdKk+P6bxsBTOtMRRXTLEjjjZ X-Gm-Gg: ASbGnctAp43NWvgeqsYwZ62Gj/IQlNLIinnM7SX/fXnOIl/nbvEQz+zDi6wT35r8T2I rqmYY2SvIfWtUItStPT2RkfiELkDw7DErF+FgIqNeC1HuLmgnX8amgrq1LvLY5zAF/bIIFQLMBQ 5Mw7wVxAG/EJD0FSoC4GHB12MAArYZym+5/PoEoeQthdqXdVjwWGG3UX8qi7U8EHva+a+5hekxz yiujoDawnC89W4oojLlw7uBCthCTiui0DMMc5wNhIjJO1t/QUDb/KgZ5DLVMIeOTgI3x3FfZGNc xd/Sk5hCIh8yrx2rLeV++5K5El11VlzHSrhBhTeApPOgTvR65joKgC/lnYGaUCchTOxQpMsDo7E iGUwwLSV1gzYJB71lvOmqSw== 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250305_031027_624556_3AABFE2E X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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 #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__) \ #define ASM_BUG() ASM_BUG_FLAGS(0) +#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 */ From patchwork Wed Mar 5 11:08:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: FUJITA Tomonori X-Patchwork-Id: 14002536 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D829DC19F32 for ; Wed, 5 Mar 2025 12:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Zuob0KWz+aMXx+SZY7byGgFZw64hS95nLv6K6so94r0=; b=iUQ5vWAWiuj47X QRjKw+UpOcFe4NT781WE+QgDlM8iktT7zHGQHk8BobTs2u8S415yDwRjXA5aP/UMHIsCJDk/xFb66 zwAv7QYUrgIjx30yogcpe32FUxOds2PWmI/R/SjIMx5qIgHwUeapcaB4b63+4TdSNTq1v3Raf7Tox m3DTvm6nsXTtbUzBEPc27zSbeAis1unEfBWGnfltBgw1Byo1h1MI5KU7ZYL0XbYq6dTm7ggy7hAxB uy2IwTTS3Bso2DMXq0cpsJB/m77kTCbvJrf/ai0GPBtw47vuBxvS7LXOg5Vmo5yN6A9lB7onzUL7x O2mbzo6Gtqmql0TJrvpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpnVf-00000007x4s-1tTn; Wed, 05 Mar 2025 12:05:59 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpme1-00000007oWY-1wUG; Wed, 05 Mar 2025 11:10:35 +0000 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2feb9078888so11197059a91.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=lists.infradead.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=E4dinUff6K6uqQBwxTYWW4Yi0MgDSU3rKqN7t8mFgrCR/HBrzYcaSLgL3KJUmo4V1x rsVWsQYEWXxn2ad0Q/MEKR9aDBsYLbeB8Wf4naC1dqwgpF4rxmYXdVZPhDSroIXfjLj3 Kj1lTMFgfRR410uU4p3OUEcss3E8LP4CKmVQBbcyzgFY759CCY/oI43V/Hkvb9VTLF/L rMASMscmQ23ZcsrPimEsVJF3e1HA3EZkDgjcvFNMNGH2OH5i8v2daDwzvHM0bRaohfi9 vg95ZZao5Vkz+zypLlXUzeKYSEU447WbuEFQQaLhQbx/piCzA8BU5kE+FXMqFJWVX7+y HQNg== 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=ibZbl4oVdgNcwa7mOwupnjd5rRLjIoLsUAoVkpx6e/3fTOji7pPhZmNrOCiPVAPNy1 WxRaUJoaFWSjWddZbwN4Exe4vPoVpB7whu12dI3JoybLokdEgbry/zpZEeXOge2QKzcP ZP5Kw2Z106uuDL/RAo7i/qLqkPj6WMS7hEC4zkVcDdc+kixX+HWnSrzHKjFIqBwjXn0k ZC2ljJlw0phab4ad8uvVR84TZ3m6L9VRKErETgumf7PiJo9SQJq647nd8D1MJOk2nyjO KOZuJ7vQqS8ZJFBCDTXCo2VBk+Af580+lQhLhIF3jS/khFbdmf6fxpLlb7UcqqZsK4UH umcg== X-Forwarded-Encrypted: i=1; AJvYcCXG61HLWMelxC1jhW8iKaMt9qvymL1Z+8/1D9bekI+uBGMlPl5fZ4m1Nu3Vsdw4rs/+J3Y+TOzSLqoraJU8xDtY@lists.infradead.org, AJvYcCXwuephuRy8tYmfbnmp2xlA/W9TIvAgJK3mz+TR7niOIidLaChb+vXPXemmVI+mYyjIb/PTk5d+TaIzV18=@lists.infradead.org X-Gm-Message-State: AOJu0YyPk912oTAiQDx1VL3Vddto6qUKKfMoilE/sNmZvpEHgOojQFPZ CNG2DAVr8CPs2o8D+0p2TrcWsWDnTPiuNwZxjAv8unH8/jIwP15D X-Gm-Gg: ASbGncuMNIzo8P5CEv3YN5EPJxWMc9nOY6NqLYRjcRo9+Z7yAhWltTbnTf0OHXd+tIU 3iMevOyaQ+idqXAp5kobvDqTrFJOge3UYepeMmHX9KGQfS3bm0fCq5zENL0hSY2/+ITjBeV/kHv Dt9rD5xAGDbzjmyHOl3kpeqNvvytuiy/LcxJBMaTDeV2WXYZedIiSBnhRDc+Yhdopnc7TISTHtc EKOWlAuyWeRuXqego1HAHN3uq/QgyTnbkYqVjzExrhu/tlG0BiBSqJfDGP68uDpgXWmEP5a97/U 0xZUNnjKCHNSZknNQBD+DwdJx86SaASHUaCayjqSxXq0OogANjl8Y6SFGApyad8bqaZ7b1YOm8S 9HUMqA7xBNyP+Fv+4ewJKJA== 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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250305_031033_507646_C99AFFCD X-CRM114-Status: GOOD ( 18.84 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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) += doctests_kernel_generated.o obj-$(CONFIG_RUST_KERNEL_DOCTESTS) += doctests_kernel_generated_kunit.o always-$(subst y,$(CONFIG_RUST),$(CONFIG_JUMP_LABEL)) += kernel/generated_arch_static_branch_asm.rs +ifndef CONFIG_UML +always-$(subst y,$(CONFIG_RUST),$(CONFIG_BUG)) += kernel/generated_arch_warn_asm.rs kernel/generated_arch_reachable_asm.rs +endif # 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_error.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/generated_arch_reachable_asm.rs +endif +endif 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 /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/bug.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) => { + const FLAGS: u32 = $crate::bindings::BUGFLAG_WARNING | $flags; + const _FILE: &[u8] = file!().as_bytes(); + // Plus one for null-terminator. + static FILE: [u8; _FILE.len() + 1] = { + let mut bytes = [0; _FILE.len() + 1]; + let mut i = 0; + while i < _FILE.len() { + bytes[i] = _FILE[i]; + i += 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 = sym FILE, + line = const line!(), + flags = const FLAGS, + size = const ::core::mem::size_of::<$crate::bindings::bug_entry>(), + ); + } + } +} + +#[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) => { + const FLAGS: u32 = $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 = const FLAGS, + size = const ::core::mem::size_of::<$crate::bindings::bug_entry>(), + ); + } + } +} + +#[macro_export] +#[doc(hidden)] +#[cfg(all(CONFIG_BUG, CONFIG_UML))] +macro_rules! warn_flags { + ($flags:expr) => { + // 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) => { + // 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) => {}; +} + +#[doc(hidden)] +pub const fn bugflag_taint(value: u32) -> u32 { + value << 8 +} + +/// Report a warning if `cond` is true and return the condition's evaluation result. +#[macro_export] +macro_rules! warn_on { + ($cond:expr) => {{ + if $cond { + const WARN_ON_FLAGS: u32 = $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/generated_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/generated_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;