From: Alexandre Ghiti <alex@ghiti.fr>
To: "Clément Léger" <cleger@rivosinc.com>,
"Nylon Chen" <nylon.chen@sifive.com>,
linux-kernel@vger.kernel.org
Cc: linux-riscv@lists.infradead.org, paul.walmsley@sifive.com,
palmer@dabbelt.com, aou@eecs.berkeley.edu, charlie@rivosinc.com,
jesse@rivosinc.com, evan@rivosinc.com, zhangchunyan@iscas.ac.cn,
samuel.holland@sifive.com, zong.li@sifive.com
Subject: Re: [PATCH 2/2] riscv: misaligned: fix sleeping function called during misaligned access handling
Date: Fri, 11 Apr 2025 10:35:21 +0200 [thread overview]
Message-ID: <22a2c734-b446-4b1e-a2bc-a0080656fe29@ghiti.fr> (raw)
In-Reply-To: <992e3135-0c55-403c-9f71-d76c59cec75b@rivosinc.com>
Hi Clément,
On 11/04/2025 09:36, Clément Léger wrote:
> Hi Nylon,
>
> I already have a pending fix for that bug which is to reenable
> interrupts while handling misaligned faults. Please see:
> https://lore.kernel.org/linux-riscv/20250317170625.1142870-12-cleger@rivosinc.com/
Can you extract this fix from the series so that it can be merged in 6.15?
Thanks,
Alex
>
> Thanks,
>
> Clément
>
> On 11/04/2025 09:38, Nylon Chen wrote:
>> Use copy_from_user_nofault() and copy_to_user_nofault() instead of
>> copy_from/to_user functions in the misaligned access trap handlers.
>>
>> The following bug report was found when executing misaligned memory
>> accesses:
>>
>> BUG: sleeping function called from invalid context at ./include/linux/uaccess.h:162
>> in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 115, name: two
>> preempt_count: 0, expected: 0
>> CPU: 0 UID: 0 PID: 115 Comm: two Not tainted 6.14.0-rc5 #24
>> Hardware name: riscv-virtio,qemu (DT)
>> Call Trace:
>> [<ffffffff800160ea>] dump_backtrace+0x1c/0x24
>> [<ffffffff80002304>] show_stack+0x28/0x34
>> [<ffffffff80010fae>] dump_stack_lvl+0x4a/0x68
>> [<ffffffff80010fe0>] dump_stack+0x14/0x1c
>> [<ffffffff8004e44e>] __might_resched+0xfa/0x104
>> [<ffffffff8004e496>] __might_sleep+0x3e/0x62
>> [<ffffffff801963c4>] __might_fault+0x1c/0x24
>> [<ffffffff80425352>] _copy_from_user+0x28/0xaa
>> [<ffffffff8000296c>] handle_misaligned_store+0x204/0x254
>> [<ffffffff809eae82>] do_trap_store_misaligned+0x24/0xee
>> [<ffffffff809f4f1a>] handle_exception+0x146/0x152
>>
>> Fixes: b686ecdeacf6 ("riscv: misaligned: Restrict user access to kernel memory")
>> Fixes: 441381506ba7 ("riscv: misaligned: remove CONFIG_RISCV_M_MODE specific code")
>>
>> Signed-off-by: Zong Li <zong.li@sifive.com>
>> Signed-off-by: Nylon Chen <nylon.chen@sifive.com>
>> ---
>> arch/riscv/kernel/traps_misaligned.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/riscv/kernel/traps_misaligned.c b/arch/riscv/kernel/traps_misaligned.c
>> index d7275dfb6b7e..563f73f88fa8 100644
>> --- a/arch/riscv/kernel/traps_misaligned.c
>> +++ b/arch/riscv/kernel/traps_misaligned.c
>> @@ -455,7 +455,7 @@ static int handle_scalar_misaligned_load(struct pt_regs *regs)
>>
>> val.data_u64 = 0;
>> if (user_mode(regs)) {
>> - if (copy_from_user(&val, (u8 __user *)addr, len))
>> + if (copy_from_user_nofault(&val, (u8 __user *)addr, len))
>> return -1;
>> } else {
>> memcpy(&val, (u8 *)addr, len);
>> @@ -556,7 +556,7 @@ static int handle_scalar_misaligned_store(struct pt_regs *regs)
>> return -EOPNOTSUPP;
>>
>> if (user_mode(regs)) {
>> - if (copy_to_user((u8 __user *)addr, &val, len))
>> + if (copy_to_user_nofault((u8 __user *)addr, &val, len))
>> return -1;
>> } else {
>> memcpy((u8 *)addr, &val, len);
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2025-04-11 8:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-11 7:38 [PATCH 0/2] riscv: misaligned: Add ZCB handling and fix sleeping function Nylon Chen
2025-04-11 7:38 ` [PATCH 1/2] riscv: misaligned: Add handling for ZCB instructions Nylon Chen
2025-04-21 7:47 ` Alexandre Ghiti
2025-04-11 7:38 ` [PATCH 2/2] riscv: misaligned: fix sleeping function called during misaligned access handling Nylon Chen
2025-04-11 7:36 ` Clément Léger
2025-04-11 8:04 ` Nylon Chen
2025-04-11 8:35 ` Alexandre Ghiti [this message]
2025-04-11 8:38 ` Clément Léger
2025-04-29 5:57 ` Nylon Chen
2025-04-29 7:07 ` Clément Léger
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=22a2c734-b446-4b1e-a2bc-a0080656fe29@ghiti.fr \
--to=alex@ghiti.fr \
--cc=aou@eecs.berkeley.edu \
--cc=charlie@rivosinc.com \
--cc=cleger@rivosinc.com \
--cc=evan@rivosinc.com \
--cc=jesse@rivosinc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=nylon.chen@sifive.com \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=samuel.holland@sifive.com \
--cc=zhangchunyan@iscas.ac.cn \
--cc=zong.li@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®