| Message ID | 1569199517-5884-3-git-send-email-vincent.chen@sifive.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: correct the do_trap_break() | expand |
On Mon, Sep 23, 2019 at 08:45:15AM +0800, Vincent Chen wrote: > On RISC-V, when the kernel runs code on behalf of a user thread, and the > kernel executes a WARN() or WARN_ON(), the user thread will be sent > a bogus SIGTRAP. Fix the RISC-V kernel code to not send a SIGTRAP when > a WARN()/WARN_ON() is executed. > > Signed-off-by: Vincent Chen <vincent.chen@sifive.com> Looks good, Reviewed-by: Christoph Hellwig <hch@lst.de>
Oh and s/rsicv/riscv/ in the subject, please.
On Sat, Sep 28, 2019 at 6:56 AM Christoph Hellwig <hch@infradead.org> wrote: > > Oh and s/rsicv/riscv/ in the subject, please. Oh! Thank you for finding this typo. I will correct it.
On Mon, 23 Sep 2019, Vincent Chen wrote: > On RISC-V, when the kernel runs code on behalf of a user thread, and the > kernel executes a WARN() or WARN_ON(), the user thread will be sent > a bogus SIGTRAP. Fix the RISC-V kernel code to not send a SIGTRAP when > a WARN()/WARN_ON() is executed. > > Signed-off-by: Vincent Chen <vincent.chen@sifive.com> Thanks, queued for v5.4-rc. - Paul
diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 055a937aca70..82f42a55451e 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -134,7 +134,7 @@ asmlinkage void do_trap_break(struct pt_regs *regs) break; case BUG_TRAP_TYPE_WARN: regs->sepc += get_break_insn_length(regs->sepc); - break; + return; case BUG_TRAP_TYPE_BUG: #endif /* CONFIG_GENERIC_BUG */ default:
On RISC-V, when the kernel runs code on behalf of a user thread, and the kernel executes a WARN() or WARN_ON(), the user thread will be sent a bogus SIGTRAP. Fix the RISC-V kernel code to not send a SIGTRAP when a WARN()/WARN_ON() is executed. Signed-off-by: Vincent Chen <vincent.chen@sifive.com> --- arch/riscv/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)