riscv: provide riscv-specific is_trap_insn()
PATCH v2 1/1 riscv: provide riscv-specific is_trap_insn()
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 causes an infinite loop of entering and exiting trap handler.
Instead of using the default implementation, implement this function speficially for riscv with checks for both ebreak and c.ebreak.
---
v2: remove #ifdef CONFIG_RISCV_ISA_C (Guo Ren)
arch/riscv/kernel/probes/uprobes.c | 6 ++++++ 1 file changed, 6 insertions(+)
arch/riscv/kernel/probes/uprobes.c +6 -0
@@ -3,6 +3,7 @@#include <linux/highmem.h> #include <linux/ptrace.h> #include <linux/uprobes.h> +#include <asm/insn.h> #include "decode-insn.h"
@@ -17,6 +18,11 @@ bool is_swbp_insn(uprobe_opcode_t *insn)#endif } +bool is_trap_insn (uprobe_opcode_t *insn) +{ +return riscv_insn_is_ebreak (*insn) ||riscv_insn_is_c_ebreak (*insn); +} +unsigned long uprobe_get_swbp_addr (struct pt_regs *regs) {return instruction_pointer (regs);
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Thx for the fix.
Quoted 49 lines · Nam Cao
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 asksis_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 causes an infinite loop of entering and exiting trap handler.Instead of using the default implementation, implement this function speficially for riscv with checks for both ebreak and c.ebreak.
Fixes 74784081aac8 ("riscv: Add uprobes supported")Signed-off-by Nam Cao <[email protected]>Tested-by Björn Töpel <[email protected]>---
v2: remove #ifdefCONFIG_RISCV_ISA_C(Guo Ren)arch/riscv/kernel/probes/uprobes.c | 6 ++++++ 1 file changed, 6 insertions(+)arch/riscv/kernel/probes/uprobes.c +6
-1@@ -3,6 +3,7 @@#include <linux/highmem.h> #include <linux/ptrace.h> #include <linux/uprobes.h> +#include <asm/insn.h> #include "decode-insn.h" @@ -17,6 +18,11 @@ bool is_swbp_insn(uprobe_opcode_t *insn)#endif } +bool is_trap_insn (uprobe_opcode_t *insn) +{ +return riscv_insn_is_ebreak (*insn) ||riscv_insn_is_c_ebreak (*insn); +} +unsigned long uprobe_get_swbp_addr (struct pt_regs *regs) {return instruction_pointer (regs); --2.34.1
Signature · 7 lines
Best Regards Guo Ren _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (for-next) by Palmer Dabbelt <[email protected]>:
Quoted 10 lines · On Tue, 29 Aug 2023 10:36:15 +0200 you wrote:
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 asksis_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 causes an infinite loop of entering and exiting trap handler.[...]
Here is the summary with links:
- [v2] riscv: provide riscv-specific is_trap_insn()
https://git.kernel.org/riscv/c/b701f9e726f0
You are awesome, thank you!
Signature · 9 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv