From: Alexandre Ghiti <alex@ghiti.fr>
To: FUJITA Tomonori <fujita.tomonori@gmail.com>,
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: Re: [PATCH v3 2/5] riscv/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust
Date: Fri, 28 Feb 2025 11:13:32 +0100 [thread overview]
Message-ID: <608d690a-54ad-4c1e-bf4b-b21c81792cfd@ghiti.fr> (raw)
In-Reply-To: <20250213135759.190006-3-fujita.tomonori@gmail.com>
Hi FUJITA,
On 13/02/2025 14:57, FUJITA Tomonori wrote:
> 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 <fujita.tomonori@gmail.com>
> ---
> 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 <asm-generic/bug.h>
This looks good to me so:
Acked-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Thanks,
Alex
next prev parent reply other threads:[~2025-02-28 10:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <yy_ESUuchCjlaGIJHzCPAcP_d9ucSD0CGXaoZNNkY7BmN5Ch1J8avsA9QpKO5LkTjlGpu99jl8NrFl5NFSQXuw==@protonmail.internalid>
2025-02-13 13:57 ` [PATCH v3 0/5] rust: Add bug/warn abstractions FUJITA Tomonori
2025-02-13 13:57 ` [PATCH v3 1/5] x86/bug: Add ARCH_WARN_ASM macro for BUG/WARN asm code sharing with Rust FUJITA Tomonori
2025-02-13 13:57 ` [PATCH v3 2/5] riscv/bug: " FUJITA Tomonori
2025-02-28 10:13 ` Alexandre Ghiti [this message]
2025-02-13 13:57 ` [PATCH v3 3/5] arm64/bug: " FUJITA Tomonori
2025-02-26 19:27 ` Catalin Marinas
2025-02-27 7:01 ` FUJITA Tomonori
2025-02-13 13:57 ` [PATCH v3 4/5] loongarch/bug: " FUJITA Tomonori
2025-02-13 13:57 ` [PATCH v3 5/5] rust: Add warn_on and warn_on_once FUJITA Tomonori
2025-03-03 13:33 ` Alice Ryhl
2025-03-05 5:13 ` FUJITA Tomonori
2025-03-05 8:42 ` Alice Ryhl
2025-03-05 10:24 ` FUJITA Tomonori
2025-03-05 10:36 ` Alice Ryhl
2025-02-26 19:39 ` [PATCH v3 0/5] rust: Add bug/warn abstractions Andreas Hindborg
2025-02-27 6:54 ` FUJITA Tomonori
2025-02-27 8:28 ` Andreas Hindborg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=608d690a-54ad-4c1e-bf4b-b21c81792cfd@ghiti.fr \
--to=alex@ghiti.fr \
--cc=a.hindborg@kernel.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=aou@eecs.berkeley.edu \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=fujita.tomonori@gmail.com \
--cc=gary@garyguo.net \
--cc=hejinyang@loongson.cn \
--cc=hpa@zytor.com \
--cc=kernel@xen0n.name \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=loongarch@lists.linux.dev \
--cc=mingo@redhat.com \
--cc=ojeda@kernel.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=peterz@infradead.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=tangyouling@loongson.cn \
--cc=tglx@linutronix.de \
--cc=tmgross@umich.edu \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=yangtiezhu@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®