From: Alexandre Ghiti <alex@ghiti.fr>
To: Palmer Dabbelt <palmer@dabbelt.com>, linux-riscv@lists.infradead.org
Cc: Paul Walmsley <paul.walmsley@sifive.com>,
aou@eecs.berkeley.edu, cyrilbur@tenstorrent.com,
jszhang@kernel.org, cleger@rivosinc.com,
samuel.holland@sifive.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] RISC-V: uaccess: Wrap the get_user_8 uaccess macro
Date: Wed, 11 Jun 2025 09:31:18 +0200 [thread overview]
Message-ID: <de5e9d8d-c620-4371-8c74-7ef804d97d53@ghiti.fr> (raw)
In-Reply-To: <20250610213058.24852-1-palmer@dabbelt.com>
On 6/10/25 23:30, Palmer Dabbelt wrote:
> From: Palmer Dabbelt <palmer@dabbelt.com>
>
> I must have lost this rebasing things during the merge window, I know I
> got it at some point but it's not here now. Without this I get warnings
> along the lines of
>
> include/linux/fs.h:3975:15: warning: label followed by a declaration is a C23 extension [-Wc23-extensions]
> 3975 | if (unlikely(get_user(c, path)))
> | ^
> arch/riscv/include/asm/uaccess.h:274:3: note: expanded from macro 'get_user'
> 274 | __get_user((x), __p) : \
> | ^
> arch/riscv/include/asm/uaccess.h:244:2: note: expanded from macro '__get_user'
> 244 | __get_user_error(__gu_val, __gu_ptr, __gu_err); \
> | ^
> arch/riscv/include/asm/uaccess.h:207:2: note: expanded from macro '__get_user_error'
> 207 | __ge LD [M] net/802/psnap.ko
> t_user_nocheck(x, ptr, __gu_failed); \
> | ^
> arch/riscv/include/asm/uaccess.h:196:3: note: expanded from macro '__get_user_nocheck'
> 196 | __get_user_8((x), __gu_ptr, label); \
> | ^
> arch/riscv/include/asm/uaccess.h:130:2: note: expanded from macro '__get_user_8'
> 130 | u32 __user *__ptr = (u32 __user *)(ptr); \
> | ^
>
> Signed-off-by: Palmer Dabbelt <palmer@dabbelt.com>
> ---
> arch/riscv/include/asm/uaccess.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h
> index d472da4450e6..525e50db24f7 100644
> --- a/arch/riscv/include/asm/uaccess.h
> +++ b/arch/riscv/include/asm/uaccess.h
> @@ -127,6 +127,7 @@ do { \
>
> #ifdef CONFIG_CC_HAS_ASM_GOTO_OUTPUT
> #define __get_user_8(x, ptr, label) \
> +do { \
> u32 __user *__ptr = (u32 __user *)(ptr); \
> u32 __lo, __hi; \
> asm_goto_output( \
> @@ -141,7 +142,7 @@ do { \
> : : label); \
> (x) = (__typeof__(x))((__typeof__((x) - (x)))( \
> (((u64)__hi << 32) | __lo))); \
> -
> +} while (0)
> #else /* !CONFIG_CC_HAS_ASM_GOTO_OUTPUT */
> #define __get_user_8(x, ptr, label) \
> do { \
I had come up with the same fix so:
Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
next prev parent reply other threads:[~2025-06-11 7:31 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-10 21:30 Palmer Dabbelt
2025-06-11 7:31 ` Alexandre Ghiti [this message]
2025-06-12 19:42 ` Palmer Dabbelt
2025-06-12 20:10 ` patchwork-bot+linux-riscv
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=de5e9d8d-c620-4371-8c74-7ef804d97d53@ghiti.fr \
--to=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=cleger@rivosinc.com \
--cc=cyrilbur@tenstorrent.com \
--cc=jszhang@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=samuel.holland@sifive.com \
/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®