[PATCH] riscv: provide riscv-specific is_trap_insn()

Björn Töpel bjorn at kernel.org
Mon Aug 28 05:48:06 PDT 2023


Nam Cao <namcaov at gmail.com> writes:

> uprobes expects is_trap_insn() to return true for any trap instructions,
> not just the one used for installing uprobe. The current default
> implementation only returns true for 16-bit c.ebreak if C extension is
> enabled. This can confuse uprobes if a 32-bit ebreak generates a trap
> exception from userspace: uprobes asks is_trap_insn() who says there is no
> trap, so uprobes assume a probe was there before but has been removed, and
> return to the trap instruction. This cause an infinite loop of entering
> and exiting trap handler.
>
> Instead of using the default implementation, implement this function
> speficially for riscv which checks for both ebreak and c.ebreak.

I took this for a spin, and it indeed fixes this new hang! Nice!

However, when I tried setting an uprobe on the ebreak instruction
(offset 0x118) from your example [1], the probe does not show up in the
trace buffer.

Any ideas?

Regardless, your patch fixes the hang:

Tested-by: Björn Töpel <bjorn at rivosinc.com>

[1] https://lore.kernel.org/linux-riscv/ZOum50Py8Vki+Nd3@nam-dell/



More information about the linux-riscv mailing list