| Message ID | 20250314092614.27372-1-zong.li@sifive.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | riscv: traps: handle uprobe event in software-check exception | expand |
| Context | Check | Description |
|---|---|---|
| bjorn/pre-ci_am | fail | Failed to apply series |
Hi, On 14/03/2025 10:26, Zong Li wrote: > Handle the uprobe event first before handling the CFI violation in > software-check exception handler. Because when the landing pad is > activated, if the uprobe point is set at the lpad instruction at > the beginning of a function, the system triggers a software-check > exception instead of an ebreak exception due to the exception > priority, then uprobe can't work successfully. > > Co-developed-by: Deepak Gupta <debug@rivosinc.com> > Signed-off-by: Deepak Gupta <debug@rivosinc.com> > Signed-off-by: Zong Li <zong.li@sifive.com> > --- > > This patch is based on top of the following series > [PATCH v11 00/27] riscv control-flow integrity for usermode > > arch/riscv/kernel/traps.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c > index 3f7709f4595a..ef5a92111ee1 100644 > --- a/arch/riscv/kernel/traps.c > +++ b/arch/riscv/kernel/traps.c > @@ -386,9 +386,12 @@ asmlinkage __visible __trap_section void do_trap_software_check(struct pt_regs * > if (user_mode(regs)) { > irqentry_enter_from_user_mode(regs); > > - /* not a cfi violation, then merge into flow of unknown trap handler */ > - if (!handle_user_cfi_violation(regs)) > - do_trap_unknown(regs); > + /* handle uprobe event frist */ > + if (!probe_breakpoint_handler(regs)) { > + /* not a cfi violation, then merge into flow of unknown trap handler */ > + if (!handle_user_cfi_violation(regs)) > + do_trap_unknown(regs); > + } > > irqentry_exit_to_user_mode(regs); > } else { Deepak, can you take this patch in your next spin of your CFI series? Otherwise, I'm pretty sure we will forget about it :) Thanks, Alex
diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index 3f7709f4595a..ef5a92111ee1 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c @@ -386,9 +386,12 @@ asmlinkage __visible __trap_section void do_trap_software_check(struct pt_regs * if (user_mode(regs)) { irqentry_enter_from_user_mode(regs); - /* not a cfi violation, then merge into flow of unknown trap handler */ - if (!handle_user_cfi_violation(regs)) - do_trap_unknown(regs); + /* handle uprobe event frist */ + if (!probe_breakpoint_handler(regs)) { + /* not a cfi violation, then merge into flow of unknown trap handler */ + if (!handle_user_cfi_violation(regs)) + do_trap_unknown(regs); + } irqentry_exit_to_user_mode(regs); } else {