riscv: kprobes: simulate nop and c.nop instructions
cover riscv: kprobes: simulate nop and c.nop instructions
nop and c.nop have no architectural effect, so handling them through an out-of-line instruction slot and single-stepping is pure overhead. This series simulates them directly in the breakpoint handler by advancing the program counter, following the approach already used on arm64, and extends the RISC-V kprobes KUnit test to cover both paths.
Patch 1 adds the simulation. Patch 2 extends the KUnit test with test_kprobes_nop and test_kprobes_c_nop.
Verified by cross-compiling for RISC-V and running the kprobes KUnit test in QEMU (ok 1 kprobes_riscv).
Xiaofeng Yuan (2):
riscv: kprobes: simulate nop and c.nop instructions
riscv: kprobes: add nop and c.nop to the KUnit test
arch/riscv/include/asm/insn.h | 11 ++++++++ arch/riscv/kernel/probes/decode-insn.c | 6 +++++ arch/riscv/kernel/probes/simulate-insn.c | 14 ++++++++++ arch/riscv/kernel/probes/simulate-insn.h | 2 ++ .../kernel/tests/kprobes/test-kprobes-asm.S | 27 +++++++++++++++++++ 5 files changed, 60 insertions(+)
Signature · 7 lines
2.43.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 1/2 riscv: kprobes: simulate nop and c.nop instructions
nop and c.nop have no architectural effect, so allocating an out-of-line instruction slot and single-stepping through them is pure overhead. Simulate them directly in the breakpoint handler by advancing the program counter, following the approach already used on arm64.
This avoids slot allocation, text patching, IRQ flag save/restore and the single-step exception for these instructions.
Compile tested on RISC-V, and verified with the RISC-V kprobes KUnit test which now covers nop and c.nop.
--- arch/riscv/include/asm/insn.h | 11 +++++++++++ arch/riscv/kernel/probes/decode-insn.c | 6 ++++++ arch/riscv/kernel/probes/simulate-insn.c | 14 ++++++++++++++ arch/riscv/kernel/probes/simulate-insn.h | 2 ++ 4 files changed, 33 insertions(+)
arch/riscv/include/asm/insn.h +11 -0
@@ -228,6 +228,15 @@#define RVG_MASK_EBREAK 0xffffffff#define RVG_MASK_SRET 0xffffffff +/* +* NOP and C.NOP have no variable fields, so all bits must match. +* NOP is encoded as ADDI x0, x0, 0 (0x00000013), C.NOP as C.ADDI x0, 0 (0x0001). +*/ +#define RVG_MATCH_NOP 0x00000013 +#define RVG_MASK_NOP 0xffffffff +#define RVC_MATCH_C_NOP 0x0001 +#define RVC_MASK_C_NOP 0xffff +#define __INSN_LENGTH_MASK _UL(0x3)#define __INSN_LENGTH_GE_32 _UL(0x3)#define __INSN_OPCODE_MASK _UL(0x7F)
@@ -262,6 +271,8 @@ __RISCV_INSN_FUNCS(c_ebreak, RVC_MASK_C_EBREAK, RVC_MATCH_C_EBREAK) __RISCV_INSN_FUNCS(ebreak, RVG_MASK_EBREAK, RVG_MATCH_EBREAK) __RISCV_INSN_FUNCS(sret, RVG_MASK_SRET, RVG_MATCH_SRET)__RISCV_INSN_FUNCS (fence,RVG_MASK_FENCE ,RVG_MATCH_FENCE ); +__RISCV_INSN_FUNCS(nop, RVG_MASK_NOP, RVG_MATCH_NOP) +__RISCV_INSN_FUNCS (c_nop,RVC_MASK_C_NOP ,RVC_MATCH_C_NOP ) /* special case to catch _any_ system instruction */ static __always_inline bool riscv_insn_is_system(u32 code)
arch/riscv/kernel/probes/decode-insn.c +6 -0
@@ -44,5 +44,11 @@ riscv_probe_decode_insn(probe_opcode_t *addr, struct arch_probe_insn *api)RISCV_INSN_SET_SIMULATE (auipc, insn);RISCV_INSN_SET_SIMULATE (branch, insn); +/* Simulate NOP for better performance */ +RISCV_INSN_SET_SIMULATE (nop, insn); +#ifdef CONFIG_RISCV_ISA_C +RISCV_INSN_SET_SIMULATE (c_nop, insn); +#endif +return INSN_GOOD ; }
arch/riscv/kernel/probes/simulate-insn.c +14 -0
@@ -237,3 +237,17 @@ bool __kprobes simulate_c_beqz(u32 opcode, unsigned long addr, struct pt_regs *r {return simulate_c_bnez_beqz (opcode, addr, regs, false); } + +bool __kprobes simulate_nop (u32 opcode,unsigned long addr,struct pt_regs *regs) +{ +instruction_pointer_set (regs, addr +4 ); + +return true; +} + +bool __kprobes simulate_c_nop (u32 opcode,unsigned long addr,struct pt_regs *regs) +{ +instruction_pointer_set (regs, addr +2 ); + +return true; +}
arch/riscv/kernel/probes/simulate-insn.h +2 -0
@@ -29,5 +29,7 @@ bool simulate_c_jr(u32 opcode, unsigned long addr, struct pt_regs *regs);bool simulate_c_jalr (u32 opcode,unsigned long addr,struct pt_regs *regs);bool simulate_c_bnez (u32 opcode,unsigned long addr,struct pt_regs *regs);bool simulate_c_beqz (u32 opcode,unsigned long addr,struct pt_regs *regs); +bool simulate_nop (u32 opcode,unsigned long addr,struct pt_regs *regs); +bool simulate_c_nop (u32 opcode,unsigned long addr,struct pt_regs *regs);#endif /* _RISCV_KERNEL_PROBES_SIMULATE_INSN_H */
Signature · 7 lines
2.43.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Quoted 11 lines · Xiaofeng Yuan
nop and c.nop have no architectural effect, so allocating an out-of-line instruction slot and single-stepping through them is pure overhead. Simulate them directly in the breakpoint handler by advancing the program counter, following the approach already used on arm64.
This avoids slot allocation, text patching, IRQ flag save/restore and the single-step exception for these instructions.
Compile tested on RISC-V, and verified with the RISC-V kprobes KUnit test which now covers nop and c.nop.
For RISC-V, how common is installing probes on nop instructions?
Looking at the commit adding nop simulation on Arm, I see it is useful for probes on USDT. Is this also the case for RISC-V?
Additionally, it would be great if there is a benchmark to justify adding this.
Nam
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 2/2 riscv: kprobes: add nop and c.nop to the KUnit test
In reply to Xiaofeng YuanExtend the RISC-V kprobes KUnit test with test_kprobes_nop and test_kprobes_c_nop, covering both the 32-bit nop and the compressed c.nop simulation paths.
--- .../kernel/tests/kprobes/test-kprobes-asm.S | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+)
arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S +27 -0
@@ -181,6 +181,29 @@ SYM_FUNC_END(test_kprobes_c_bnez) #endif /* CONFIG_RISCV_ISA_C */ +SYM_FUNC_START(test_kprobes_nop) + .option push + .option norvc +test_kprobes_nop_addr: + nop + .option pop + li a0, KPROBE_TEST_MAGIC_LOWER + li a1, KPROBE_TEST_MAGIC_UPPER + add a0, a0, a1 + ret +SYM_FUNC_END(test_kprobes_nop) + +#ifdef CONFIG_RISCV_ISA_C +SYM_FUNC_START(test_kprobes_c_nop) +test_kprobes_c_nop_addr: + c.nop + li a0, KPROBE_TEST_MAGIC_LOWER + li a1, KPROBE_TEST_MAGIC_UPPER + add a0, a0, a1 + ret +SYM_FUNC_END(test_kprobes_c_nop) +#endif /* CONFIG_RISCV_ISA_C */ + .section .rodata SYM_DATA_START(test_kprobes_addresses) RISCV_PTR test_kprobes_add_addr1
@@ -197,7 +220,9 @@ SYM_DATA_START(test_kprobes_addresses) RISCV_PTR test_kprobes_branch_addr6 RISCV_PTR test_kprobes_branch_addr7 RISCV_PTR test_kprobes_branch_addr8 + RISCV_PTR test_kprobes_nop_addr #ifdef CONFIG_RISCV_ISA_C + RISCV_PTR test_kprobes_c_nop_addr RISCV_PTR test_kprobes_branch_c_j_addr1 RISCV_PTR test_kprobes_branch_c_j_addr2 RISCV_PTR test_kprobes_c_jr_addr1
@@ -220,7 +245,9 @@ SYM_DATA_START(test_kprobes_functions) RISCV_PTR test_kprobes_jalr RISCV_PTR test_kprobes_auipc RISCV_PTR test_kprobes_branch + RISCV_PTR test_kprobes_nop #ifdef CONFIG_RISCV_ISA_C + RISCV_PTR test_kprobes_c_nop RISCV_PTR test_kprobes_c_j RISCV_PTR test_kprobes_c_jr RISCV_PTR test_kprobes_c_jalr
Signature · 7 lines
2.43.0 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Re: [PATCH 2/2] riscv: kprobes: add nop and c.nop to the KUnit test
arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S SYM_FUNC_END(test_kprobes_c_bnez) · line 191
Quoted 8 lines · Xiaofeng Yuan
arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S +8
-0+SYM_FUNC_START(test_kprobes_nop) + .option push + .option norvc +test_kprobes_nop_addr: + nop + .option pop + li a0, KPROBE_TEST_MAGIC_LOWER + li a1, KPROBE_TEST_MAGIC_UPPER
I split the magic number into _LOWER and _UPPER because I wanted to validate that two instructions in two different code paths are both executed.
For this simple case, we can just use KPROBE_TEST_MAGIC.
Nam
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv