From nobody Wed Dec 17 14:25:19 2025 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.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 68618801; Tue, 10 Dec 2024 00:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789961; cv=none; b=id/NPghPuIEi64WedZOUrW7nNjAU0ns9QQJAd4WYCPV6tDcxLJTa1WnTkFX3schfxoG522UkCNZ15h7klGx0y35bvfK0edjB2SypdQRdw9DQIsEItV28FKyrrxkf88y+jclQ+M0pfX55f936mV+zIOu94ZesSTM66H8hExA0v7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789961; c=relaxed/simple; bh=Dcj41wgoErpyvv6rMccASWdZmCVr+BwsDARBxcvPC6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CeQxmW4J+ydi4EdgU3yye1GIQWQ37lVqGzWKfwL+/2O3J4p7z3by+FRgvMIW2gQXd6B/kwiKHbqW+kt8pHGUGreflDa8IwiyPt2613Z05Sob4qjXx8/I5/B9pK0pAkW46Jwn72lrXUmGfJlTVsZ2Q8GxA4q3dDN57WC0NxSFGKU= 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=NEQPPnQT; arc=none smtp.client-ip=209.85.210.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="NEQPPnQT" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-725c86bbae7so2736914b3a.3; Mon, 09 Dec 2024 16:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733789957; x=1734394757; 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=lvYxXwvEnjyqSBQUdMwEVvz9hfO5O8pSiGSR6Ept2V0=; b=NEQPPnQTv0JCzN3c9ZkiWvlg6LlVrITeoUP0ufWgiwcqWIEInLK8BpExEt6Agx+YLv sCKSgFHAoJNZBqSxSeKzKNa99O1vJAzeje3IOHylenTiUUwi+L81+fPj86mZS0vDm23B 6zS4MJFCoip13ubI4Vsb6UvxH+jgv6bB/uI8E/jaKHoj2x22F+OCjWrdYSJiN4bRwWu/ Epai1Y40bx0eTJNmzkCIT69VWID250fIftFCZtmZ1hcLyW1JJzRnpfG2tcsT6SWcGUBy j8J64vIvzrAMzuVtj4w61xe8EU/dQ9wrP2SiLOs2kLmtby8pLvkOI+6VYyFsJyIILU3C JOtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733789957; x=1734394757; 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=lvYxXwvEnjyqSBQUdMwEVvz9hfO5O8pSiGSR6Ept2V0=; b=mTwjp+8kewfDJWbBvp1QuXXseYO5OgPJLmLc57UsxQ0r3cpaFyWrzzAOIb3zhDzoSH KBXGb36FLKSkyXte5Gz69DhSCcqXEOo+6tR/E4yvqqeD/FMbnM+MLu90ZIC0J5cNeSgT t5S6E0ziDSPYV2g8EDmGPmOKlMIn8/RAPEfwVuBX9rDUrPnBhZ4Fb10FgOHJtalySxaP wj9Kr7sdVM2fSKCmeo7RELtodLKLIZdEZSD9zHJyS6hY+Tq0qqj6tSwul/QN0EMtFAJZ AVUL8e+F6sgMaYZMMEt6nWnpprk6wvIOYoNP1Ye5xcALSldVE52hwT5UJXUZ2LSAQdzU Y9XA== X-Forwarded-Encrypted: i=1; AJvYcCUvcS0UJPKzdu49u8b6EgfM4ANAE/v16ZNZkSa5LsYAYTWZajrUhpp00SJWv6dc8hY4SyMusKpI/8uupY11+w==@vger.kernel.org X-Gm-Message-State: AOJu0Yw0IDAckaV7mLEpfA/oKb97klSPuEZKiUMMexBa95al2bBSP3EM 06fjVQLQ1zAq9wz/B6SxPDGdXInQEtFSUY4najK/H5tdA2DraAuPzSdwMv9b X-Gm-Gg: ASbGnctGtcP3LRJiKJL8dYUgaqocRJ/w3B9mnhci/FGVdAxxGS/0gU+0t6dJZMnZ1Aa 7emnTOmrfuJWXRfTzuR1p/S90qgEzXzgsES6KsAtQPxE8312wcX8Id80hwc6ja2hHoMfI6tNypR pwvnHkieCxR/czBjk+sgMbaos917pNrHsi2Pt5RFkGBb7Zp3q+DYyGsmjIwhG4ZZ4f4obJy8UG+ pAJ7yr9nIAuviFiNGDiGsDbkRpoUZH+5WUPSVEapbfyUFz8tTDmupo1Lyieui0T0A/25p9OexJa e69dwo5fsIOAricf1Uikl4TPe/al X-Google-Smtp-Source: AGHT+IGXDLB74qKfVuatRG8d4NT0q2/7WE7V1EKSlo1ahbfyprBuniJ//vSx8P3YzstgSPlCq25zXA== X-Received: by 2002:a05:6a00:1815:b0:725:e015:9090 with SMTP id d2e1a72fcca58-7273c90ae9bmr3318953b3a.9.1733789957264; Mon, 09 Dec 2024 16:19:17 -0800 (PST) Received: from mew.. (p4007189-ipxg22601hodogaya.kanagawa.ocn.ne.jp. [180.53.81.189]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725f1fba027sm2005005b3a.3.2024.12.09.16.19.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 16:19:17 -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 v1 1/5] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Tue, 10 Dec 2024 09:17:57 +0900 Message-ID: <20241210001802.228725-2-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210001802.228725-1-fujita.tomonori@gmail.com> References: <20241210001802.228725-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. Signed-off-by: FUJITA Tomonori --- arch/x86/include/asm/bug.h | 51 ++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/arch/x86/include/asm/bug.h b/arch/x86/include/asm/bug.h index 806649c7f23d..71df68e2a731 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 --=20 2.43.0 From nobody Wed Dec 17 14:25:19 2025 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 86A2742056; Tue, 10 Dec 2024 00:19:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789966; cv=none; b=hgjyp7gBs/HTkqubxaF52mYx1gm3sL26ke+iyQCI2qZz1bycSoTLAtcpRLhQZTk31MsJgCq5IW9XAPo6YaiRVM9Lk6WCQj/8gcWyTWxnMfB1oKdCWY716VJl+V5UDTVMZWbl6Po2SwngUbC3ONHmfNpsQmZAMLRIfCDFvEP1sEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789966; c=relaxed/simple; bh=PphfExRm9WK9LCNvRjMF7+BNzJn3sHB2vfQS0MOjRdk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HgJskCAqkwOfXZuIc4oGuqV9xIZ1gEuTX1rhQg47J2apaAr69kE5AUG94l47ivVEjsLaGTXmJRO0amcEF2MKGlvkHFhcaDs3jbYBsyczdg3YWN7LNNApNlN+zIpsmBcSPPogSPP5MCrr2IIweMVAkMn+Nso8FiEdrKbC8vkFBSE= 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=i550Pc1Z; arc=none smtp.client-ip=209.85.210.170 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="i550Pc1Z" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7258bce5289so3907255b3a.0; Mon, 09 Dec 2024 16:19:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733789964; x=1734394764; 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=uE1ozcM0HS04q9lZpGc37IxiI38s9WgqP3M8QOeasQ4=; b=i550Pc1ZyLHxoan2IEL8SHeDoMVZ6cWa9nsl16kx3Qh664d0gue/9IcE5+EUbjrUYm DEb/yO2hWGtBgRQH6eDWCSpKdHEwLzgieVsIrWn6dcuOGAykQhW/3tp8HWMNtKvA1iD2 maB6vCHu6yAbFuZTiDE0hv0KS5U1l4CG4UQOvDBhJA6Qp9tlsw38uAAIpF60OcOoW2z6 lyzfc57A+3yjGrrGhHDVBNfDHIy6g2NFcwdzY1SdawiTHw/FA1J/inKU1dDpFm0W3MqQ SQq3nT5iSVqpwi6/zMVfCoF7FVPZDQVFeFCQFeMhS88h/y8mtpVeXx+Fr7KQZzHmr6yG +Cow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733789964; x=1734394764; 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=uE1ozcM0HS04q9lZpGc37IxiI38s9WgqP3M8QOeasQ4=; b=ACjgO8g5aMtOXV/ISoTbeQVuK5/8HNI0cW4UA/lWK2w223k6rNRRSHmEVQczWt2hIv 93Td8gUSpzJmWQd0Z3RfpqCk9Ay7yb6iyckDdtS68P9QvJWIabdGogRVBheQEKY+FT7E bqwwyjfSe5u/EPcxKqacpWI7jlDktQ2voTKmLPCkb+dHhKATicQAJFA4/PJFcDkCxiK7 UC07sZi4h0WGAKnzoW8Io152R6EMSs6RLR7pTEJWlGNWoGVaxShrGBTmUX0DcILI9FXh PNgGJRrx+4Ru01UDcQfbsyCWyJukUT6kTxCyXhTWg8ZQGZMFAwRhEX/9kq/t3sZUBg24 gAcg== X-Forwarded-Encrypted: i=1; AJvYcCUxwcm220Ni8n3LugcHjuUgGjoi04T533i3eqTP/enWl2dWHLPhSy6ZuGJ9xN4eOx7Dmkhzdd65JlGwX2LomA==@vger.kernel.org X-Gm-Message-State: AOJu0Yzz4OurTa3jQyZWcX3ljYY7i5RO1HbyuMXxilN7OZ0q5wqLnNx1 eTOOFbCGbaFJjaB4caZfTTRLU04W5h+MZzVptq9sVaT4blMUkEBT0h9f9SDU X-Gm-Gg: ASbGncsJtOmzHxHUkUvEuV4g1A6NaIzKtn9lJSigbLQy3tvlt5cbXckBnxQ/7Ev0GLl rWkUFmTEzXFQfkzliPpz33xIK8PqqbBTksGa9Wn4ZdFumMoCVbguaUIyoQFAM9hENP1EGN2jvaD +/bAykd5nnb0aRJ2CXYl02d+iFtRTEzx3peIbKj5Jl/hg+OvftAEcuY08P9TBJErtDZy5z9qQI+ ellPD3jWYTPUvUdBd/Ok2q8HpY5mxZtK8eJRsWqpBX0pQ9/Fc5aZ53shdUIraOWWfwpU23Q8PQp PB+WPRynkpJ4Fv7IA1mpSz5dGW0B X-Google-Smtp-Source: AGHT+IE0sO05jto/zLfmn6/T151S8aCpOvFIvTm7U8rW5Jtk2M587AQu6vur1sMtmKA/fHe5aWFjDA== X-Received: by 2002:a05:6a00:3e1b:b0:727:3935:dc83 with SMTP id d2e1a72fcca58-7273935f820mr4927070b3a.10.1733789963629; Mon, 09 Dec 2024 16:19:23 -0800 (PST) Received: from mew.. (p4007189-ipxg22601hodogaya.kanagawa.ocn.ne.jp. [180.53.81.189]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725f1fba027sm2005005b3a.3.2024.12.09.16.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 16:19:23 -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 v1 2/5] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Tue, 10 Dec 2024 09:17:58 +0900 Message-ID: <20241210001802.228725-3-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210001802.228725-1-fujita.tomonori@gmail.com> References: <20241210001802.228725-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. Signed-off-by: FUJITA Tomonori --- arch/riscv/include/asm/bug.h | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/bug.h b/arch/riscv/include/asm/bug.h index 1aaea81fb141..ee6b9b787e46 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"); \ --=20 2.43.0 From nobody Wed Dec 17 14:25:19 2025 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.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 BF0DD67A0D; Tue, 10 Dec 2024 00:19:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789972; cv=none; b=doFBzSBxTdqTkOLFQADZbQehoucllr0XEVYc+hB+F2ald2rwAuMmTTtpBag0KECzW8/iDR2WqfZQgWhL6h/sia2nZ8uoO30VHEKADmC+ccUZs6clT/9jzlG8a4UcqSPVW2gr6g1oxA12Xqp0naSpL2syPHF3Wuqz7oD+KuPSA1I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789972; c=relaxed/simple; bh=/K4eSvI1Ipf4Aur9iVP05PUVjTwf8ShxKmTB6bwov2M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hVQbw4+tR7YQVnKlXnn0c9kN15akh5mHcS6qAeS1a0d/q32rTLY4qYAHc/eBylQD4sw99ozY2LumWF0o7vD96rAITkxN0NZpFg8gKdORGSh6ejdQGmSVM1Emq0FOWPFpd/b+lel+bIOQa59TFQby9PQarTQ4opVTyJ+8ljVHWrs= 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=eXi6cVnf; arc=none smtp.client-ip=209.85.210.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="eXi6cVnf" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-725ee27e905so1722447b3a.2; Mon, 09 Dec 2024 16:19:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733789970; x=1734394770; 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=GaW3Ni06SPvaTbLHs0pbUeHaTTwDPxQuBfccVmzf3vY=; b=eXi6cVnfnoFFYmTXCwAR4NtO3coNe4MMjc1NInp64kzE+FhLxMT3PL7g86HYx9a4es DH9wjGzLvcyBZ58P7+KsxYXwLeGiVM/pgK5qyy2IK9+WzTLgIy4MKCyBwjb0BZpFoq0H Cdlv/OyFEt1EkboJwQTfmW9rD5pNG297TrpXgc17Wf9PFguujL/l0SAejRHTW7tU9Gon 4Q65g3vOus5HEWuMVZ5OZ8PAnobmtahi5TTADXDBRpjD70l5Xgv1SsFUzrTkUxcH6oFD iLNAmDEijF2xsjo0C4aoOqQDmFPqCEts3fXJReFj18iz/SypK1+RaIuchjSMpypHr8wj S2Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733789970; x=1734394770; 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=GaW3Ni06SPvaTbLHs0pbUeHaTTwDPxQuBfccVmzf3vY=; b=vVdozXWui4+/eDvRQCGqAAnuWKH79Ce7AioUvULn8xoWan8vwEb+4oofMey96Io9Z9 gEdIaU1piaO/aAgSstlD6dfFKuMEsDpbnHo8HUKnEZgOQVsRGZwNqUej6Ddqh69B3r2N hXrTcFX5SElSpo4l2hZTAQQtk7M7WTPkcQ01AKn/2sd+i4qluzzuWTVrtiqswew77qli vUm+TqdpxyhmLjimJ9ZBCavYvwJcoAqF2W5+ei07JRht2yhmCRig2/NcC/YUGuhF+woF baAT+wmIDQejQ7H2LQ5HNgsvQT9bLQlpxBt6Qgtd2Z7ns5gyUDi0va3CI2lV2S4fWn93 5ZBw== X-Forwarded-Encrypted: i=1; AJvYcCXDRI9B00qDtQAaBYwV5dpFBPAz9BmR8Ikh+wu19ysKdbq9zbb1tV0hEPH4anEC5hRPZcu+J0LmpmC9hXAB2Q==@vger.kernel.org X-Gm-Message-State: AOJu0YxWuGJte6qhVvEnvqA2fKh0hkp01eNA7uq2xRj7YMQS65PHSALq +3Sn/Dx9bXn4qcoLGDfz2uiPg7W3HlRH9zJ/PdThgznXjWsHQlzAIYe3VNdC X-Gm-Gg: ASbGncu02i1W9WnCiBxU2zvTe0qC751FFOE1a2t4lwTHjCDvQzrT4eegsGXf+IXilmg +gFnIPmYagW4eSekG2OXtiLeC4inMtvPuGIIhkVDVcb7PI8/tnaEfrwQp7Rxqwwj/WgTX0JmS5T gUFpgTbWghE+SQ4OyXYXqhLbvlveYyBpCUrDU25EwFkEUUittso4tY0zJedYLfPeTooseNoDIAX Se9zu27bmYGbHna+017vOZ/FABJu9OQM3r1OlKNhhpDnW/8J/loba8n4mSuxPn9vOZggFe/4suF 9ag+qG+CxfqRmYvP7yRoYkiyYLqh X-Google-Smtp-Source: AGHT+IEHFQLb+CnaKIfB/aQiVn4EtFWGkBf9ZZUksgIXRkbcaqD+tHXdDTDwGlizNlrZosk3pbCxTw== X-Received: by 2002:a05:6a00:1d8b:b0:725:dab9:f732 with SMTP id d2e1a72fcca58-725dab9f7f2mr11873956b3a.22.1733789970068; Mon, 09 Dec 2024 16:19:30 -0800 (PST) Received: from mew.. (p4007189-ipxg22601hodogaya.kanagawa.ocn.ne.jp. [180.53.81.189]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725f1fba027sm2005005b3a.3.2024.12.09.16.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 16:19:29 -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 v1 3/5] arm64/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Tue, 10 Dec 2024 09:17:59 +0900 Message-ID: <20241210001802.228725-4-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210001802.228725-1-fujita.tomonori@gmail.com> References: <20241210001802.228725-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. Signed-off-by: FUJITA Tomonori --- arch/arm64/include/asm/asm-bug.h | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/asm-bug.h b/arch/arm64/include/asm/asm-= bug.h index 6e73809f6492..822e9d51d3e9 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,22 @@ _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) + #endif /* __ASM_ASM_BUG_H */ --=20 2.43.0 From nobody Wed Dec 17 14:25:19 2025 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) (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 4773B182D2; Tue, 10 Dec 2024 00:19:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789978; cv=none; b=NOvVdNgL5pri+QpHCpWth6nLF3PmnrrlUPg8IZ797d6tEZiAZrXCk9887jpTsudSHZRvKKoe81AvryHUWUbQevHy93F6x7k24P2Vrs7XvgnQpZYdp4/mUPnI7o4c0t3qP9H6SGMD4NITyYvg79QwI0tC0rx9Alul+dXyCWC4fCA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789978; c=relaxed/simple; bh=tLULYhncvqXuSEEMkRa308bOiD43z3dLIb09npubBjc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZDOsn+/L/Nz5l5quxOXqgHNovsiXpfWPY5t1xp/mH1icHQnRbQbd0ZEq6Oxo6ktX5OEmz+D2W2ZfMEEsW7+1ilzqm6eKL87wQ3jLfOwWUbgVXDUhbpPaEU0LFPkMdn7KcKd0SIVA6FKF3buMI+k+41JAFI48RjSSguUhR0EkKYI= 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=HSTSM3yv; arc=none smtp.client-ip=209.85.215.179 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="HSTSM3yv" Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-7e9e38dd5f1so4000744a12.0; Mon, 09 Dec 2024 16:19:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733789976; x=1734394776; 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=Og2RZIwk2Fmm4a1enxRaJzgczmbvkc80VyX2Z+HeAaA=; b=HSTSM3yvD5ywLgXaMOcDHKC+xDMlQeZ7LIaq21S5Qq0JojalEuLZeI8tdJOmZ1I5bH NFpjU48Ivspmbc711qBuIOBcCAcXF4Fb0CgG2xfA6h45y0qYPNhNW1NxjnXWJf3qQXNH ELB99IcCQDqYtvmT0R+FwPulX8pRVbpYpmQPSRePFNCZKjjsXrgdcEWiSoCjugr0rRDy +gMTtHL7KCoO7aZqthY+kY9LDpU2sRNzvDqliPhhVl92B6vlJhfMu0p4FX5dcyX3ybV2 fehUWo/ojV3y9AZlZ6sP0kPzAys5FsHsexynsNzajy0829GAf6qdQ6iS70YUsaLfbt/m e98g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733789976; x=1734394776; 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=Og2RZIwk2Fmm4a1enxRaJzgczmbvkc80VyX2Z+HeAaA=; b=G9ugq1qixQwK1r5JFC0o+mqa3lxX8IPV3TDVmHb5PDZa3F2lGs7+5Z64AsJEaSKifk ROY9VfHp+/xFdjtuIJPCxyMV1GKyww6J5ovGRrbsVeeDusle4gtTErhuAkugqcHT/rYU jxgUf9AJVOSbw2o8szRhwqPve9jzMhDFe9rz2P+8Pz30pE9/bxoHEpZvuFiUOhH7XTmT mFiYvGcY2J1m0rbGUAB6p4JwWarw956k+cZD3sCjStH+6I1lRrXYbHd7YE75QNoRHjMv T8HhNA3BYE2ZoxowBwam3GBrQksB6D/gL9TcW0u5qNxwIKFj7iQ9KI+OshbnFwUwbRVi gorA== X-Forwarded-Encrypted: i=1; AJvYcCU5lblk/o9/7npLxqyU4o85QwV72oMpZPqiDVSxA3umaIbIXhGqCb5vT7BwbBGozFLPTT8RP8bQyQw9MQBbCw==@vger.kernel.org X-Gm-Message-State: AOJu0Yxslh7Fxjl4h9fffwK9EDuUouvEYFD2qpjMR3YJ3XrUxtPUEEKi LBPlHJEOQzd6dPLt/ioz/vbw7Yro0Siheh6UCFmx77C9Wmmzz7kkC/dCAugJ X-Gm-Gg: ASbGncvrnGfKw/BttlkonBePpmNZVrc4fW1t1WXDXfttcGGjUMTXixr3oANiN7BbcKg tLubRAlrbQ7pNSb704SlKxt9SauQtyhox0S3zGQGbenl/jLk5n+VaMHo86cWI2PWMVZsXYdPorq +9SJjGjl4p8VbPj76Q55AsL4PiZ0bpYuzhRSeLRNH/R/TCw+ksjlbCl8NjNHKZYMAO1SA1YqvNg rdJa9rgN6dSs8CoJBAzkefbcMtiEUZb9C3j4gsTL6ggDIBj+X57Ej8Gv9xNwdT1gbF7r0LuFEty hZXq6cMbPVTC5bAkpf3P+ov9RY9d X-Google-Smtp-Source: AGHT+IFzrftQzGze1g0ifR+gfHYjdPe8pRM5le+6CFZEL33/9GPgGvUcXSJX0JYy+N5Of4n1uRZr/g== X-Received: by 2002:a05:6a21:8cc7:b0:1d9:c78f:4207 with SMTP id adf61e73a8af0-1e1870bb625mr22034147637.11.1733789976324; Mon, 09 Dec 2024 16:19:36 -0800 (PST) Received: from mew.. (p4007189-ipxg22601hodogaya.kanagawa.ocn.ne.jp. [180.53.81.189]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725f1fba027sm2005005b3a.3.2024.12.09.16.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 16:19:36 -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 v1 4/5] loongarch/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust Date: Tue, 10 Dec 2024 09:18:00 +0900 Message-ID: <20241210001802.228725-5-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210001802.228725-1-fujita.tomonori@gmail.com> References: <20241210001802.228725-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. Signed-off-by: FUJITA Tomonori --- arch/loongarch/include/asm/bug.h | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/arch/loongarch/include/asm/bug.h b/arch/loongarch/include/asm/= bug.h index 08388876ade4..2343c4226595 100644 --- a/arch/loongarch/include/asm/bug.h +++ b/arch/loongarch/include/asm/bug.h @@ -21,14 +21,21 @@ #ifndef CONFIG_GENERIC_BUG #define __BUG_ENTRY(flags) #else -#define __BUG_ENTRY(flags) \ + +#define __BUG_ENTRY_START \ .pushsection __bug_table, "aw"; \ .align 2; \ 10000: .long 10001f - .; \ - _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ - .short flags; \ + +#define __BUG_ENTRY_END \ .popsection; \ 10001: + +#define __BUG_ENTRY(flags) \ + __BUG_ENTRY_START \ + _BUGVERBOSE_LOCATION(__FILE__, __LINE__) \ + .short flags; \ + __BUG_ENTRY_END #endif =20 #define ASM_BUG_FLAGS(flags) \ @@ -55,6 +62,24 @@ do { \ unreachable(); \ } while (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(break BRK_BUG) ";" + #define HAVE_ARCH_BUG =20 #include --=20 2.43.0 From nobody Wed Dec 17 14:25:19 2025 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 C772E770E2; Tue, 10 Dec 2024 00:19:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789985; cv=none; b=RDLSU8MSAVxniUsuDJ6Njjf7kq6A6lwcshibVoDKHPEYD0MvryEgJDskIViSqPhhRPdkcXSBF7HCg49y/ook5lk1T4F7JbY6TXdsDSgcW60uLlAN7QHe8PdnfxcIfOST+ONyEEEtwfWpczPG0xKQVyCbH7wpBtWnpq2zBBg6edw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733789985; c=relaxed/simple; bh=gc1d39RS7wiVXEfbWtH+yBQbESP+Z3kFhmrAhSEg62w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KdBTS3FE2Ddm2Zjn9SB06Sr3Rljp3JQJxxAqpq/ZFinjKE0kdS9VkQBjJElHTTWtjIOHepCZyQzA2HQqyNaO3aFeV+GwKLOidOdizlpxLHw88uXYvw7baA1JD8RFdYWVi93+LYMoB2NJGzFXWv8piT78W6NKXaGC2+gD1tzdulc= 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=KnCAegpQ; arc=none smtp.client-ip=209.85.210.176 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="KnCAegpQ" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-725f4025e25so1077716b3a.1; Mon, 09 Dec 2024 16:19:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733789983; x=1734394783; 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=StSb96QxP9/iNWSVkb/5jVIomgW7WStqt28dyYj6iuc=; b=KnCAegpQl53EGOkUhvhVE+5tojIbwnCPUmj3l6wNP85ckgeWQxrqSMmfNG6vU/Dk9e soH55r9P5OldzY/Z4RFAMpiXaa99GjBQxQmpmZ0cXEw69eV6VWxDLs6jrOI8tPOSBoWM ybNPJ6sijH8cDgKiy7YbzC6e+IWEPQVv8lfgd7B9PJGZvc2NJq/0Z3lGX+51lklXBupy dK44rSd2eXjX/d93idbbK8rLb3DTPVqQWFPpRY4lqzfbxPcO6b4FTGnDx+WIMCLJcXPP d8dN0ZBCXqptwWXp+/DTYpxrepWZI/JZT03WWsjx20TNs4ugH+jWq5ZhyF8c6/4uHJ5C +xrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733789983; x=1734394783; 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=StSb96QxP9/iNWSVkb/5jVIomgW7WStqt28dyYj6iuc=; b=CjV0SDcw7C5QkUbifeYU9z1XJijndvSE5/hHmPuUJSZkDftQfTcfQB57Qv09V5Xxev TJ2dDBA5DBnh9m19UEJGjwOqtEPO9n6/2miqUeY0JxVqmW3gyXwYVXEZ7WJ/IyJy/Uqt pkZfzOMRSazKNWjNCBKZsI9S+KH+rWDodVau22Q7HU+f6f/k5dAMjd4FNlyIggr3QQOh Y+Q/agOjkO9u7akb3rMqNXBwdAr2DN63Hn55q+Cp79H/zRdXO8LBUx9WfUOD2X2J5ZHS /Yr8VfmXpB2VJ5C5gxW0cwOZHPvQp+s+8GU8nqCBvYkCfdGoxTecnDtRQqXScDteVGnO vCzw== X-Forwarded-Encrypted: i=1; AJvYcCW0H3MoQvrPZiOGEP6mUoN4w3maOsCTEOYhbIsmHtjiyz58SN8HhoGHOS0tUjT1/bagjQ2v/k9Ztlrq5nvUWw==@vger.kernel.org X-Gm-Message-State: AOJu0YxQBl9DNtyB+C0jbjRQE9QYYxIPeoqBq+PZBN0rn2rT0WBVNhIB TnT45QnKIdr1PmBYcfHHnXdE6DjOMPLfVR/I9f+HGNSpp/+hAT9SEmB7Hl74 X-Gm-Gg: ASbGncscjQRc28q1ru8S05iVJsP/69/y5nMr4gTY1gu74MfTq7/brHj0bhdv1bV4zBf od4QQVd8HV4LsGoTAPTU2C39Z4akY7NmjvLoRNyWVXBMojlofvZPR2r647PGNjHa3c1j2NZiQXG EwIX9AKD2XKZxnA49GSShnO38lgsriOpuQRqAY0yBjuc5fu9Qj/DACuOgYm2f5Xl0wXC1QqSn/B IlqeO2sIuA6yxZ/L4uv1zuwxKz6jhD+tWNqGNDQtrhenrqlrsgnLV9YfZjW8+iFtN/OL0q4qmpZ F9t8U9Eozm/WUXrgghjZGFKJrsQj X-Google-Smtp-Source: AGHT+IEAyDAPo8at1XMlk9fsI+urdhbvpydHDU/JmlA7KkIMjf5Ed0t5JYgg2Zppc8mo6aYL53N8NA== X-Received: by 2002:a05:6a00:2ea9:b0:725:b702:af with SMTP id d2e1a72fcca58-725b81b7b57mr24866139b3a.25.1733789982639; Mon, 09 Dec 2024 16:19:42 -0800 (PST) Received: from mew.. (p4007189-ipxg22601hodogaya.kanagawa.ocn.ne.jp. [180.53.81.189]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-725f1fba027sm2005005b3a.3.2024.12.09.16.19.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 16:19:42 -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 v1 5/5] rust: Add warn_on and warn_on_once Date: Tue, 10 Dec 2024 09:18:01 +0900 Message-ID: <20241210001802.228725-6-fujita.tomonori@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241210001802.228725-1-fujita.tomonori@gmail.com> References: <20241210001802.228725-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 and warn_on_once macros. Wrapping the C's WARN_* and BUG_* macros doesn't work so this uses the assembly code exported by the C side via ARCH_WARN_ASM macro. Like the static branch code, this generates the assembly code for rust dynamically by using the C preprocessor. file()! macro doesn't work for the Rust inline assembly in the same way as __FILE__ for the C inline assembly. So the code to handle a file name is different from the C assembly code (similar to the arm64/loongarch assembly). ASM_REACHABLE definition works in the same way to get objtool's reachable asm code. The architectures which use objtool (x86 and loongarch) needs it. Signed-off-by: FUJITA Tomonori --- rust/Makefile | 8 ++ rust/kernel/.gitignore | 2 + rust/kernel/bug.rs | 131 ++++++++++++++++++ rust/kernel/generated_arch_reachable_asm.rs.S | 7 + rust/kernel/generated_arch_warn_asm.rs.S | 7 + rust/kernel/lib.rs | 1 + 6 files changed, 156 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 9da9042fd627..80c9c6b3e491 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -37,6 +37,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)` for the sysroot when it may not be available. ifdef CONFIG_RUST @@ -436,5 +439,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/kernel/.gitignore b/rust/kernel/.gitignore index 6ba39a178f30..f1d7f4225332 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 \ No newline at end of file diff --git a/rust/kernel/bug.rs b/rust/kernel/bug.rs new file mode 100644 index 000000000000..8959a2e94971 --- /dev/null +++ b/rust/kernel/bug.rs @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0 + +// Copyright (C) 2024 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)))] +#[cfg(any(target_arch =3D "x86_64", target_arch =3D "riscv64"))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + // SAFETY: Just an FFI call. + #[cfg(CONFIG_DEBUG_BUGVERBOSE)] + unsafe { + $crate::asm!(concat!( + ".pushsection .rodata.str1.1, \"aMS\",@progbits, 1\n", + "111:\t .string ", "\"", file!(), "\"\n", + ".popsection\n", + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_reachable_asm.rs"))); + line =3D const line!(), + flags =3D const FLAGS, + size =3D const ::core::mem::size_of::<$crate::bindings::bug_en= try>(), + ); + } + // SAFETY: Just an FFI call. + #[cfg(not(CONFIG_DEBUG_BUGVERBOSE))] + unsafe { + $crate::asm!( + concat!( + 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, not(CONFIG_UML)))] +#[cfg(any(target_arch =3D "aarch64", target_arch =3D "loongarch64"))] +macro_rules! warn_flags { + ($flags:expr) =3D> { + const FLAGS: u32 =3D $crate::bindings::BUGFLAG_WARNING | $flags; + // SAFETY: Just an FFI call. + #[cfg(CONFIG_DEBUG_BUGVERBOSE)] + unsafe { + $crate::asm!(concat!( + ".pushsection .rodata.str1.1, \"aMS\",@progbits, 1\n", + "111:\t .string ", "\"", file!(), "\"\n", + ".popsection\n", + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_warn_asm.rs")), + include!(concat!(env!("OBJTREE"), "/rust/kernel/generated_= arch_reachable_asm.rs"))); + line =3D const line!(), + flags =3D const FLAGS, + ); + } + // SAFETY: Just an FFI call. + #[cfg(not(CONFIG_DEBUG_BUGVERBOSE))] + unsafe { + $crate::asm!(concat!( + 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, + ); + } + } +} + +#[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_char, + line!() as i32, + $flags as u32, + ::core::ptr::null() as *const ::core::ffi::c_char, + ); + } + }; +} + +#[macro_export] +#[doc(hidden)] +#[cfg(not(CONFIG_BUG))] +macro_rules! warn_flags { + ($flags:expr) =3D> {}; +} + +#[doc(hidden)] +#[macro_export] +macro_rules! bugflag_taint { + ($taint:expr) =3D> { + $taint << 8 + }; +} + +/// Report a warning only once. +#[macro_export] +macro_rules! warn_on_once { + ($cond:expr) =3D> { + if $cond { + $crate::warn_flags!( + $crate::bindings::BUGFLAG_ONCE + | $crate::bugflag_taint!($crate::bindings::TAINT_WARN) + ); + } + $cond + }; +} + +/// Report a warning. +#[macro_export] +macro_rules! warn_on { + ($cond:expr) =3D> { + if $cond { + $crate::warn_flags!($crate::bugflag_taint!($crate::bindings::T= AINT_WARN)); + } + $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..4e65525e4464 --- /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!(ASM_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..8f239b431aa4 --- /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("111b", "{line}", "{flags}", "{s= ize}")) diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index e1065a7551a3..913f3a5b2a98 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -32,6 +32,7 @@ pub mod alloc; #[cfg(CONFIG_BLOCK)] pub mod block; +pub mod bug; mod build_assert; pub mod cred; pub mod device; --=20 2.43.0