[PATCH v4 3/3] riscv: kprobes: add KUnit test for LR/SC sequence rejection
From: Vladimir Kondratiev
Date: Sun Nov 15 2026 - 07:39:10 EST
Extend the kprobes KUnit test with a function containing an LR/SC
sequence and assert that register_kprobe() accepts a probe placed right
before or right after the sequence, and rejects a probe placed on the
LR, on an instruction inside the sequence, or on the SC.
Add never-executed function that imitates s valid LR/SC section, one
with short and one with maximum valis size body, and section with
LR and no SC, mimicking __cmpwait where LR is followed by the
conditional branch.
Suggested-by: Xiaofeng Yuan <yuanxiaofeng@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Vladimir Kondratiev <vladimir.kondratiev@xxxxxxxxxxxx>
---
arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S | 58 ++++++++++++++++++++++
arch/riscv/kernel/tests/kprobes/test-kprobes.c | 32 ++++++++++++
arch/riscv/kernel/tests/kprobes/test-kprobes.h | 6 +++
3 files changed, 96 insertions(+)
diff --git a/arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S b/arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S
index 15e50934bbd7..ca5b9223f885 100644
--- a/arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S
+++ b/arch/riscv/kernel/tests/kprobes/test-kprobes-asm.S
@@ -198,6 +198,44 @@ SYM_FUNC_END(test_kprobes_c_jal)
#endif /* CONFIG_RISCV_ISA_C */
+SYM_FUNC_START(test_kprobes_lrsc)
+test_kprobes_lrsc_addr0:
+ nop
+ /* valid LR/SC sequence */
+1:
+test_kprobes_lrsc_addr1: /* expect: rejected */
+ lr.w t0, 0(a0)
+test_kprobes_lrsc_addr2: /* expect: rejected */
+ addi t0, t0, 1
+test_kprobes_lrsc_addr3: /* expect: rejected */
+ sc.w t0, t0, 0(a0)
+test_kprobes_lrsc_addr4:
+ bnez t0, 1b
+
+ /* not a valid LR/SC sequence - no SC */
+test_kprobes_lrsc_addr5:
+ lr.w t0, 0(a0)
+test_kprobes_lrsc_addr6:
+ and t0, t0, a1
+ xor t0, t0, a2
+ bnez t0, 1f
+test_kprobes_lrsc_addr7:
+ nop
+1:
+ nop
+
+ /* valid LR/SC sequence */
+test_kprobes_lrsc_addr8: /* expect: rejected */
+ lr.w t0, 0(a0)
+test_kprobes_lrsc_addr9: /* expect: rejected */
+ .rept 16
+ nop
+ .endr
+ sc.w t0, t0, 0(a0)
+ nop
+ ret
+SYM_FUNC_END(test_kprobes_lrsc)
+
.section .rodata
SYM_DATA_START(test_kprobes_addresses)
RISCV_PTR test_kprobes_add_addr1
@@ -253,3 +291,23 @@ SYM_DATA_START(test_kprobes_functions)
#endif /* CONFIG_RISCV_ISA_C */
RISCV_PTR 0
SYM_DATA_END(test_kprobes_functions)
+
+.section .rodata
+SYM_DATA_START(test_kprobes_lrsc_allowed_addresses)
+ RISCV_PTR test_kprobes_lrsc_addr0
+ RISCV_PTR test_kprobes_lrsc_addr4
+ RISCV_PTR test_kprobes_lrsc_addr5
+ RISCV_PTR test_kprobes_lrsc_addr6
+ RISCV_PTR test_kprobes_lrsc_addr7
+ RISCV_PTR 0
+SYM_DATA_END(test_kprobes_lrsc_allowed_addresses)
+
+.section .rodata
+SYM_DATA_START(test_kprobes_lrsc_rejected_addresses)
+ RISCV_PTR test_kprobes_lrsc_addr1
+ RISCV_PTR test_kprobes_lrsc_addr2
+ RISCV_PTR test_kprobes_lrsc_addr3
+ RISCV_PTR test_kprobes_lrsc_addr8
+ RISCV_PTR test_kprobes_lrsc_addr9
+ RISCV_PTR 0
+SYM_DATA_END(test_kprobes_lrsc_rejected_addresses)
diff --git a/arch/riscv/kernel/tests/kprobes/test-kprobes.c b/arch/riscv/kernel/tests/kprobes/test-kprobes.c
index 027424a3ff7b..ff9d5bb2b998 100644
--- a/arch/riscv/kernel/tests/kprobes/test-kprobes.c
+++ b/arch/riscv/kernel/tests/kprobes/test-kprobes.c
@@ -43,8 +43,40 @@ static void test_kprobe_riscv(struct kunit *test)
kfree(kp);
}
+static void test_kprobe_riscv_lrsc(struct kunit *test)
+{
+ /* probes outside the LR/SC sequence must be accepted */
+ for (int i = 0; test_kprobes_lrsc_allowed_addresses[i]; i++) {
+ struct kprobe kp = {};
+ int ret;
+
+ kp.pre_handler = kprobe_dummy_handler;
+ kp.addr = test_kprobes_lrsc_allowed_addresses[i];
+
+ ret = register_kprobe(&kp);
+ KUNIT_EXPECT_EQ_MSG(test, ret, 0, "location %pS rejected", kp.addr);
+ if (!ret)
+ unregister_kprobe(&kp);
+ }
+
+ /* probes on or inside the LR/SC sequence must be rejected */
+ for (int i = 0; test_kprobes_lrsc_rejected_addresses[i]; i++) {
+ struct kprobe kp = {};
+ int ret;
+
+ kp.pre_handler = kprobe_dummy_handler;
+ kp.addr = test_kprobes_lrsc_rejected_addresses[i];
+
+ ret = register_kprobe(&kp);
+ KUNIT_EXPECT_LT_MSG(test, ret, 0, "location %pS accepted", kp.addr);
+ if (!ret)
+ unregister_kprobe(&kp);
+ }
+}
+
static struct kunit_case kprobes_testcases[] = {
KUNIT_CASE(test_kprobe_riscv),
+ KUNIT_CASE(test_kprobe_riscv_lrsc),
{}
};
diff --git a/arch/riscv/kernel/tests/kprobes/test-kprobes.h b/arch/riscv/kernel/tests/kprobes/test-kprobes.h
index 537f44aa9d3f..93393e77a2cf 100644
--- a/arch/riscv/kernel/tests/kprobes/test-kprobes.h
+++ b/arch/riscv/kernel/tests/kprobes/test-kprobes.h
@@ -19,6 +19,12 @@ extern void *test_kprobes_addresses[];
/* array of functions that return KPROBE_TEST_MAGIC */
extern long (*test_kprobes_functions[])(void);
+/* probe points that must be accepted, terminated by NULL */
+extern void *test_kprobes_lrsc_allowed_addresses[];
+
+/* probe points that must be rejected, terminated by NULL */
+extern void *test_kprobes_lrsc_rejected_addresses[];
+
#endif /* __ASSEMBLER__ */
#endif /* TEST_KPROBES_H */
--
2.43.0