Skip to contentSkip to conversation

riscv: sbi: Add SBI Debug Triggers Extension tests

PATCH In review Jesse Taube 2 participants 3 messages Jul 1, 2025 – Jul 2, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v8 1/1 riscv: sbi: Add SBI Debug Triggers Extension tests

Add tests for the DBTR SBI extension.

---
V1 -> V2:
- Call report_prefix_pop before returning
- Disable compressed instructions in exec_call, update related comment
- Remove extra "| 1" in dbtr_test_load
- Remove extra newlines
- Remove extra tabs in check_exec
- Remove typedefs from enums
- Return when dbtr_install_trigger fails
- s/avalible/available/g
- s/unistall/uninstall/g
V2 -> V3:
- Change SBI_DBTR_SHMEM_INVALID_ADDR to -1UL
- Move all dbtr functions to sbi-dbtr.c
- Move INSN_LEN to processor.h
- Update include list
- Use C-style comments
V3 -> V4:
- Include libcflat.h
- Remove #define SBI_DBTR_SHMEM_INVALID_ADDR
V4 -> V5:
- Sort includes
- Add kfail for update triggers
V5 -> V6:
- Add assert in gen_tdata1
- Add prefix to dbtr_test_type
- Add TRIG_STATE_DMODE
- Add TRIG_STATE_RESERVED
- Align function paramaters with opening parenthesis
- Change OpenSBI < v1.7 to < v1.5
- Constantly use spaces in prefix rather than _
- Export split_phys_addr
- Fix MCONTROL_U and MCONTROL_M mix up
- Fix swapped VU and VS
- Move /* to own line
- Print type in dbtr_test_type
- Remove _BIT suffix from macros
- Remove duplicate MODE_S
- Remove spaces before include
- Rename tdata1,2 to trigger and control in dbtr_install_trigger
- Report skip in dbtr_test_multiple
- Report variables in info not pass or fail
- s/save/store/g
- sbi_debug_set_shmem use split_phys_addr
- Use if (!report(... in dbtr_test_disable_enable
V6 -> V7:
- Alphabetize Makefile
- Only print read info on failure
- Remove return after assert
- Remove unnecessary OpenSBI version check
- Rename error to exit_test in check_dbtr
- Use prefix in dbtr_test_num_triggers and dbtr_test_type
V7 -> V8:
- Add mcontrol_size mcontrol6_size
- Cast McontrolType to int for assert
- Set trigger size to 32BIT using mcontrol_size
Debug triggers allow traps on different access sizes, which was set to any. QEMU was triggering on a 32BIT access next to the trigger address causing an erroneous trap. Set the size to 32BITs to avoid this.

---
 lib/riscv/asm/sbi.h |   1 +
 riscv/Makefile      |   1 +
 riscv/sbi-dbtr.c    | 867 ++++++++++++++++++++++++++++++++++++++++++++
 riscv/sbi-tests.h   |   2 +
 riscv/sbi.c         |   3 +-
 5 files changed, 873 insertions(+), 1 deletion(-)
 create mode 100644 riscv/sbi-dbtr.c
lib/riscv/asm/sbi.h +1 -0
index a5738a5c..78fd6e2a 100644
@@ -51,6 +51,7 @@ enum sbi_ext_id {
 	SBI_EXT_SUSP = 0x53555350,
 	SBI_EXT_FWFT = 0x46574654,
 	SBI_EXT_SSE = 0x535345,
+	SBI_EXT_DBTR = 0x44425452,
 };
 
 enum sbi_ext_base_fid {
riscv/Makefile +1 -0
index 11e68eae..9309ac12 100644
@@ -18,6 +18,7 @@ tests += $(TEST_DIR)/sieve.$(exe)
 all: $(tests)
 
 $(TEST_DIR)/sbi-deps += $(TEST_DIR)/sbi-asm.o
+$(TEST_DIR)/sbi-deps += $(TEST_DIR)/sbi-dbtr.o
 $(TEST_DIR)/sbi-deps += $(TEST_DIR)/sbi-fwft.o
 $(TEST_DIR)/sbi-deps += $(TEST_DIR)/sbi-sse.o
 
riscv/sbi-dbtr.c new file +867 -0

867 lines not on this page · raw message

riscv/sbi-tests.h +2 -0
index d5c4ae70..c1ebf016 100644
@@ -97,8 +97,10 @@ static inline bool env_enabled(const char *env)
 	return s && (*s == '1' || *s == 'y' || *s == 'Y');
 }
 
+void split_phys_addr(phys_addr_t paddr, unsigned long *hi, unsigned long *lo);
 void sbi_bad_fid(int ext);
 void check_sse(void);
+void check_dbtr(void);
 
 #endif /* __ASSEMBLER__ */
 #endif /* _RISCV_SBI_TESTS_H_ */
riscv/sbi.c +2 -1
index edb1a6be..3b8aadce 100644
@@ -105,7 +105,7 @@ static int rand_online_cpu(prng_state *ps)
 	return cpu;
 }
 
-static void split_phys_addr(phys_addr_t paddr, unsigned long *hi, unsigned long *lo)
+void split_phys_addr(phys_addr_t paddr, unsigned long *hi, unsigned long *lo)
 {
 	*lo = (unsigned long)paddr;
 	*hi = 0;
@@ -1561,6 +1561,7 @@ int main(int argc, char **argv)
 	check_susp();
 	check_sse();
 	check_fwft();
+	check_dbtr();
 
 	return report_summary();
 }
Signature · 1 line
2.43.0
#1 lore raw
Quoted 1 line · Jesse Taube

+#define SBI_DBTR_TDATA1_TYPE_SHIFT (__riscv_xlen - 4)

I just double checked and see that this shift is 4 less than xlen, so...

Quoted 7 lines
riscv/sbi-dbtr.c new file +7 -0
+enum McontrolType {
+	SBI_DBTR_TDATA1_TYPE_NONE =		(0UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_LEGACY =		(1UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_MCONTROL =		(2UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_ICOUNT =		(3UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_ITRIGGER =		(4UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_ETRIGGER =		(5UL << SBI_DBTR_TDATA1_TYPE_SHIFT),

riscv/sbi-dbtr.c line 72

Quoted 10 lines
riscv/sbi-dbtr.c new file +10 -0
+	SBI_DBTR_TDATA1_TYPE_MCONTROL6 =	(6UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_TMEXTTRIGGER =	(7UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_RESERVED0 =	(8UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_RESERVED1 =	(9UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_RESERVED2 =	(10UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_RESERVED3 =	(11UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_CUSTOM0 =		(12UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_CUSTOM1 =		(13UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_CUSTOM2 =		(14UL << SBI_DBTR_TDATA1_TYPE_SHIFT),
+	SBI_DBTR_TDATA1_TYPE_DISABLED =		(15UL << SBI_DBTR_TDATA1_TYPE_SHIFT),

...all these will require unsigned long (as the UL's provide), but that means...

riscv/sbi-dbtr.c line 275

Quoted 9 lines
riscv/sbi-dbtr.c new file +9 -0
+static unsigned long gen_tdata1(enum McontrolType type, enum Tdata1Value value, enum Tdata1Mode mode)
+{
+	switch (type) {
+	case SBI_DBTR_TDATA1_TYPE_MCONTROL:
+		return gen_tdata1_mcontrol(mode, value) | mcontrol_size(SIZE_32BIT);
+	case SBI_DBTR_TDATA1_TYPE_MCONTROL6:
+		return gen_tdata1_mcontrol6(mode, value) | mcontrol6_size(SIZE_32BIT);
+	default:
+		assert_msg(false, "Invalid mcontrol type: %u", (int)type);

...my suggestion here was wrong for rv64. We need

  assert_msg(false, "Invalid mcontrol type: %lu", (unsigned long)type);

I've fixed it up while applying to riscv/sbi

https://gitlab.com/jones-drew/kvm-unit-tests/-/commits/riscv/sbi

Thanks,
drew