Add support for SBI FWFT extension testing
Subsystems (3)
v3 cover Add support for SBI FWFT extension testing
This series adds a minimal set of tests for the FWFT extension. Reserved range as well as misaligned exception delegation. A commit coming from the SSE tests series is also included in this series to add -deps makefile notation.
---
V3:
- Rebase on top of andrew/riscv/sbi
- Use sbiret_report_error()
- Add helpers for MISALIGNED_EXC_DELEG fwft set/get
- Add a comment on misaligned trap handling
V2:
- Added fwft_{get/set}_raw() to test invalid > 32 bits ids
- Added test for invalid flags/value > 32 bits
- Added test for lock feature
- Use and enum for FWFT functions
- Replace hardcoded 1 << with BIT()
- Fix fwft_get/set return value
- Split set/get tests for reserved ranges
- Added push/pop to arch -c option
- Remove leftover of manual probing code
Clément Léger (2):
riscv: Add "-deps" handling for tests
riscv: Add tests for SBI FWFT extension
riscv/Makefile | 8 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 riscv/sbi-fwft.c
Signature · 1 line
2.47.1
PATCH v3 1/2 riscv: Add "-deps" handling for tests
Some tests uses additional files that needs to be linked in the final binary. This is the case for asm-sbi.S which is only used by the sbi test. Add a "-deps" per test variable that allows to designate additional .o files.
--- riscv/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
riscv/Makefile +5 -3
@@ -17,6 +17,8 @@ tests += $(TEST_DIR)/sieve.$(exe) all: $(tests) +$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o + # When built for EFI sieve needs extra memory, run with e.g. '-m 256' on QEMU $(TEST_DIR)/sieve.$(exe): AUXFLAGS = 0x1
@@ -44,7 +46,6 @@ cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32) cflatobjs += lib/ldiv32.o endif -cflatobjs += riscv/sbi-asm.o ########################################
@@ -93,6 +94,7 @@ include $(SRCDIR)/scripts/asm-offsets.mak $(CC) $(CFLAGS) -c -o $@ $< \ -DPROGNAME=\"$(notdir $(@:.aux.o=.$(exe)))\" -DAUXFLAGS=$(AUXFLAGS) +.SECONDEXPANSION: ifeq ($(CONFIG_EFI),y) # avoid jump tables before all relocations have been processed riscv/efi/reloc_riscv64.o: CFLAGS += -fno-jump-tables
@@ -103,7 +105,7 @@ cflatobjs += lib/efi.o .PRECIOUS: %.so %.so: EFI_LDFLAGS += -defsym=EFI_SUBSYSTEM=0xa --no-undefined -%.so: %.o $(FLATLIBS) $(SRCDIR)/riscv/efi/elf_riscv64_efi.lds $(cstart.o) %.aux.o +%.so: %.o $(FLATLIBS) $(SRCDIR)/riscv/efi/elf_riscv64_efi.lds $(cstart.o) %.aux.o $$($$*-deps) $(LD) $(EFI_LDFLAGS) -o $@ -T $(SRCDIR)/riscv/efi/elf_riscv64_efi.lds \ $(filter %.o, $^) $(FLATLIBS) $(EFI_LIBS)
@@ -119,7 +121,7 @@ cflatobjs += lib/efi.o -O binary $^ $@ else %.elf: LDFLAGS += -pie -n -z notext -%.elf: %.o $(FLATLIBS) $(SRCDIR)/riscv/flat.lds $(cstart.o) %.aux.o +%.elf: %.o $(FLATLIBS) $(SRCDIR)/riscv/flat.lds $(cstart.o) %.aux.o $$($$*-deps) $(LD) $(LDFLAGS) -o $@ -T $(SRCDIR)/riscv/flat.lds \ $(filter %.o, $^) $(FLATLIBS) @chmod a-x $@
Signature · 1 line
2.47.1
PATCH v3 2/2 riscv: Add tests for SBI FWFT extension
In reply to Clément LégerAdd tests for the FWFT SBI extension. Currently, only the reserved range as well as the misaligned exception delegation are used.
--- riscv/Makefile | 2 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 riscv/sbi-fwft.c
riscv/Makefile +1 -1
@@ -17,7 +17,7 @@ tests += $(TEST_DIR)/sieve.$(exe) all: $(tests) -$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o +$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o $(TEST_DIR)/sbi-fwft.o # When built for EFI sieve needs extra memory, run with e.g. '-m 256' on QEMU $(TEST_DIR)/sieve.$(exe): AUXFLAGS = 0x1
lib/riscv/asm/sbi.h +34 -0
@@ -11,6 +11,12 @@#define SBI_ERR_ALREADY_AVAILABLE -6#define SBI_ERR_ALREADY_STARTED -7#define SBI_ERR_ALREADY_STOPPED -8 +#define SBI_ERR_NO_SHMEM -9 +#define SBI_ERR_INVALID_STATE -10 +#define SBI_ERR_BAD_RANGE -11 +#define SBI_ERR_TIMEOUT -12 +#define SBI_ERR_IO -13 +#define SBI_ERR_LOCKED -14#ifndef __ASSEMBLY__#include <cpumask.h>
@@ -23,6 +29,7 @@ enum sbi_ext_id {SBI_EXT_SRST =0x53525354 ,SBI_EXT_DBCN =0x4442434E ,SBI_EXT_SUSP =0x53555350 , + SBI_EXT_FWFT = 0x46574654, }; enum sbi_ext_base_fid {
@@ -71,6 +78,33 @@ enum sbi_ext_dbcn_fid { SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, }; + +enum sbi_ext_fwft_fid { +SBI_EXT_FWFT_SET =0 , +SBI_EXT_FWFT_GET , +}; + +#define SBI_FWFT_MISALIGNED_EXC_DELEG 0x0 +#define SBI_FWFT_LANDING_PAD 0x1 +#define SBI_FWFT_SHADOW_STACK 0x2 +#define SBI_FWFT_DOUBLE_TRAP 0x3 +#define SBI_FWFT_PTE_AD_HW_UPDATING 0x4 +#define SBI_FWFT_POINTER_MASKING_PMLEN 0x5 +#define SBI_FWFT_LOCAL_RESERVED_START 0x6 +#define SBI_FWFT_LOCAL_RESERVED_END 0x3fffffff +#define SBI_FWFT_LOCAL_PLATFORM_START 0x40000000 +#define SBI_FWFT_LOCAL_PLATFORM_END 0x7fffffff + +#define SBI_FWFT_GLOBAL_RESERVED_START 0x80000000 +#define SBI_FWFT_GLOBAL_RESERVED_END 0xbfffffff +#define SBI_FWFT_GLOBAL_PLATFORM_START 0xc0000000 +#define SBI_FWFT_GLOBAL_PLATFORM_END 0xffffffff + +#define SBI_FWFT_PLATFORM_FEATURE_BIT BIT(30) +#define SBI_FWFT_GLOBAL_FEATURE_BIT BIT(31) + +#define SBI_FWFT_SET_FLAG_LOCK BIT(0) +struct sbiret {long error;long value;
riscv/sbi-fwft.c new file +190 -0
190 lines not on this page · raw message
riscv/sbi.c +3 -0
@@ -32,6 +32,8 @@#define HIGH_ADDR_BOUNDARY ((phys_addr_t)1 << 32) +void check_fwft (void ); +static long __labs (long a) {return __builtin_labs (a);
@@ -1437,6 +1439,7 @@ int main(int argc, char **argv)check_hsm ();check_dbcn ();check_susp (); +check_fwft ();return report_summary (); }
Signature · 1 line
2.47.1
Re: [kvm-unit-tests PATCH v3 2/2] riscv: Add tests for SBI FWFT extension
Quoted 249 lines · Clément Léger
Add tests for the FWFT SBI extension. Currently, only the reserved range as well as the misaligned exception delegation are used.
Signed-off-by Clément Léger <[email protected]>--- riscv/Makefile | 2 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 riscv/sbi-fwft.criscv/Makefile +1
-1@@ -17,7 +17,7 @@ tests += $(TEST_DIR)/sieve.$(exe) all: $(tests) -$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o +$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o $(TEST_DIR)/sbi-fwft.o # When built for EFI sieve needs extra memory, run with e.g. '-m 256' on QEMU $(TEST_DIR)/sieve.$(exe): AUXFLAGS = 0x1lib/riscv/asm/sbi.h +34
-0@@ -11,6 +11,12 @@#define SBI_ERR_ALREADY_AVAILABLE -6#define SBI_ERR_ALREADY_STARTED -7#define SBI_ERR_ALREADY_STOPPED -8 +#define SBI_ERR_NO_SHMEM -9 +#define SBI_ERR_INVALID_STATE -10 +#define SBI_ERR_BAD_RANGE -11 +#define SBI_ERR_TIMEOUT -12 +#define SBI_ERR_IO -13 +#define SBI_ERR_LOCKED -14#ifndef __ASSEMBLY__#include <cpumask.h> @@ -23,6 +29,7 @@ enum sbi_ext_id {SBI_EXT_SRST =0x53525354 ,SBI_EXT_DBCN =0x4442434E ,SBI_EXT_SUSP =0x53555350 , + SBI_EXT_FWFT = 0x46574654, }; enum sbi_ext_base_fid {@@ -71,6 +78,33 @@ enum sbi_ext_dbcn_fid { SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, }; + +enum sbi_ext_fwft_fid { +SBI_EXT_FWFT_SET =0 , +SBI_EXT_FWFT_GET , +}; + +#define SBI_FWFT_MISALIGNED_EXC_DELEG 0x0 +#define SBI_FWFT_LANDING_PAD 0x1 +#define SBI_FWFT_SHADOW_STACK 0x2 +#define SBI_FWFT_DOUBLE_TRAP 0x3 +#define SBI_FWFT_PTE_AD_HW_UPDATING 0x4 +#define SBI_FWFT_POINTER_MASKING_PMLEN 0x5 +#define SBI_FWFT_LOCAL_RESERVED_START 0x6 +#define SBI_FWFT_LOCAL_RESERVED_END 0x3fffffff +#define SBI_FWFT_LOCAL_PLATFORM_START 0x40000000 +#define SBI_FWFT_LOCAL_PLATFORM_END 0x7fffffff + +#define SBI_FWFT_GLOBAL_RESERVED_START 0x80000000 +#define SBI_FWFT_GLOBAL_RESERVED_END 0xbfffffff +#define SBI_FWFT_GLOBAL_PLATFORM_START 0xc0000000 +#define SBI_FWFT_GLOBAL_PLATFORM_END 0xffffffff + +#define SBI_FWFT_PLATFORM_FEATURE_BIT BIT(30) +#define SBI_FWFT_GLOBAL_FEATURE_BIT BIT(31) + +#define SBI_FWFT_SET_FLAG_LOCK BIT(0) +struct sbiret {long error;long value;riscv/sbi-fwft.c new file +159
-0@@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* SBI verification +* +* Copyright (C) 2024, Rivos Inc., Clément Léger <[email protected]> +*/ +#include <libcflat.h> +#include <stdlib.h> + +#include <asm/csr.h> +#include <asm/processor.h> +#include <asm/ptrace.h> +#include <asm/sbi.h> + +#include "sbi-tests.h" + +void check_fwft (void ); + + +static struct sbiret fwft_set_raw (unsigned long feature,unsigned long value,unsigned long flags) +{ +return sbi_ecall (SBI_EXT_FWFT ,SBI_EXT_FWFT_SET , feature, value, flags,0 ,0 ,0 ); +} + +static struct sbiret fwft_set (uint32_t feature,unsigned long value,unsigned long flags) +{ +return fwft_set_raw (feature, value, flags); +} + +static struct sbiret fwft_get_raw (unsigned long feature) +{ +return sbi_ecall (SBI_EXT_FWFT ,SBI_EXT_FWFT_GET , feature,0 ,0 ,0 ,0 ,0 ); +} + +static struct sbiret fwft_get (uint32_t feature) +{ +return fwft_get_raw (feature); +} + +static void fwft_check_reserved (unsigned long id) +{ +struct sbiret ret; + + ret =fwft_get (id); +sbiret_report_error (&ret,SBI_ERR_DENIED ,"get reserved feature 0x%lx" , id); + + ret =fwft_set (id,1 ,0 ); +sbiret_report_error (&ret,SBI_ERR_DENIED ,"set reserved feature 0x%lx" , id); +} + +static void fwft_check_base (void ) +{ +struct sbiret ret; + +report_prefix_push ("base" ); + +fwft_check_reserved (SBI_FWFT_LOCAL_RESERVED_START ); +fwft_check_reserved (SBI_FWFT_LOCAL_RESERVED_END ); +fwft_check_reserved (SBI_FWFT_GLOBAL_RESERVED_START ); +fwft_check_reserved (SBI_FWFT_GLOBAL_RESERVED_END ); + +/* Check id > 32 bits */ +if (__riscv_xlen >32 ) { + ret =fwft_get_raw (BIT (32 )); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"get feature 0x%lx error" ,BIT (32 )); + + ret =fwft_set_raw (BIT (32 ),0 ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"set feature 0x%lx error" ,BIT (32 )); + } + +report_prefix_pop (); +} + +static bool misaligned_handled; + +static void misaligned_handler (struct pt_regs *regs) +{ + misaligned_handled = true; + regs->epc +=4 ; +} + +static struct sbiret fwft_misaligned_exc_set (unsigned long value,unsigned long flags) +{ +return fwft_set (SBI_FWFT_MISALIGNED_EXC_DELEG , value, flags); +} + +static struct sbiret fwft_misaligned_exc_get (void ) +{ +return fwft_get (SBI_FWFT_MISALIGNED_EXC_DELEG ); +} + +static void fwft_check_misaligned_exc_deleg (void ) +{ +struct sbiret ret; + +report_prefix_push ("misaligned_exc_deleg" ); + + ret =fwft_misaligned_exc_get (); +if (ret.error ==SBI_ERR_NOT_SUPPORTED ) { +report_skip ("SBI_FWFT_MISALIGNED_EXC_DELEG is not supported" ); +return ; + } + +if (!sbiret_report_error (&ret,0 ,"Get misaligned deleg feature no error" )) +return ; + + ret =fwft_misaligned_exc_set (2 ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg feature invalid value 2" ); + ret =fwft_misaligned_exc_set (0xFFFFFFFF ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg feature invalid value 0xFFFFFFFF" ); + +if (__riscv_xlen >32 ) { + ret =fwft_misaligned_exc_set (BIT (32 ),0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg with invalid value > 32bits" ); + + ret =fwft_misaligned_exc_set (0 ,BIT (32 )); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg with invalid flag > 32bits" ); + } + +/* Set to 0 and check after with get */ + ret =fwft_misaligned_exc_set (0 ,0 ); +sbiret_report_error (&ret,0 ,"Set misaligned deleg feature value 0 no error" ); + ret =fwft_misaligned_exc_get (); +sbiret_report (&ret,0 ,0 ,"Get misaligned deleg feature expected value 0" ); + +/* Set to 1 and check after with get */ + ret =fwft_misaligned_exc_set (1 ,0 ); +sbiret_report_error (&ret,0 ,"Set misaligned deleg feature value 1 no error" ); + ret =fwft_misaligned_exc_get (); +sbiret_report (&ret,0 ,1 ,"Get misaligned deleg feature expected value 1" ); + +install_exception_handler (EXC_LOAD_MISALIGNED , misaligned_handler); + + asmvolatile ( +".option push\n" +/* +* Disable compression so the lw takes exactly 4 bytes and thus +* can be skipped reliably from the exception handler. +*/ +".option arch,-c\n" +"lw %[val], 1(%[val_addr])\n" +".option pop\n" + : [val]"+r" (ret.value) + : [val_addr]"r" (&ret.value) + :"memory" ); + +/* +* Even though the SBI delegated the misaligned exception to S-mode, it might not trap on +* misaligned load/store access, report that during tests. +*/ +if (!misaligned_handled) +report_skip ("Misaligned load exception does not trap in S-mode" ); +else
riscv/sbi-fwft.c line 169
Quoted 10 lines
riscv/sbi-fwft.c new file +10
-0+report_pass ("Misaligned load exception trap in S-mode" ); + +install_exception_handler (EXC_LOAD_MISALIGNED ,NULL ); + +/* Lock the feature */ + ret =fwft_misaligned_exc_set (0 ,SBI_FWFT_SET_FLAG_LOCK ); +sbiret_report_error (&ret,0 ,"Set misaligned deleg feature value 0 and lock no error" ); + ret =fwft_misaligned_exc_set (1 ,0 ); +sbiret_report_error (&ret,SBI_ERR_LOCKED , +"Set misaligned deleg feature value 0 and lock no error" );
The error message is copy+pasted from the last one. I've changed it to
"Set locked misaligned deleg feature to new value returns error"
while merging.
Quoted 45 lines
riscv/sbi-fwft.c new file +21
-0+ ret =fwft_misaligned_exc_get (); +sbiret_report (&ret,0 ,0 ,"Get misaligned deleg locked value 0 no error" ); + +report_prefix_pop (); +} + +void check_fwft (void ) +{ +report_prefix_push ("fwft" ); + +if (!sbi_probe (SBI_EXT_FWFT )) { +report_skip ("FWFT extension not available" ); +report_prefix_pop (); +return ; + } + +fwft_check_base (); +fwft_check_misaligned_exc_deleg (); + +report_prefix_pop (); +}riscv/sbi.c +3
-0@@ -32,6 +32,8 @@#define HIGH_ADDR_BOUNDARY ((phys_addr_t)1 << 32) +void check_fwft (void ); +static long __labs (long a) {return __builtin_labs (a);@@ -1437,6 +1439,7 @@ int main(int argc, char **argv)check_hsm ();check_dbcn ();check_susp (); +check_fwft ();return report_summary (); }Signature · 1 line
2.47.1
Thanks,
drew
Re: [kvm-unit-tests PATCH v3 2/2] riscv: Add tests for SBI FWFT extension
In reply to Clément LégerQuoted 150 lines · Clément Léger
Add tests for the FWFT SBI extension. Currently, only the reserved range as well as the misaligned exception delegation are used.
Signed-off-by Clément Léger <[email protected]>--- riscv/Makefile | 2 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 riscv/sbi-fwft.criscv/Makefile +1
-1@@ -17,7 +17,7 @@ tests += $(TEST_DIR)/sieve.$(exe) all: $(tests) -$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o +$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o $(TEST_DIR)/sbi-fwft.o # When built for EFI sieve needs extra memory, run with e.g. '-m 256' on QEMU $(TEST_DIR)/sieve.$(exe): AUXFLAGS = 0x1lib/riscv/asm/sbi.h +34
-0@@ -11,6 +11,12 @@#define SBI_ERR_ALREADY_AVAILABLE -6#define SBI_ERR_ALREADY_STARTED -7#define SBI_ERR_ALREADY_STOPPED -8 +#define SBI_ERR_NO_SHMEM -9 +#define SBI_ERR_INVALID_STATE -10 +#define SBI_ERR_BAD_RANGE -11 +#define SBI_ERR_TIMEOUT -12 +#define SBI_ERR_IO -13 +#define SBI_ERR_LOCKED -14#ifndef __ASSEMBLY__#include <cpumask.h> @@ -23,6 +29,7 @@ enum sbi_ext_id {SBI_EXT_SRST =0x53525354 ,SBI_EXT_DBCN =0x4442434E ,SBI_EXT_SUSP =0x53555350 , + SBI_EXT_FWFT = 0x46574654, }; enum sbi_ext_base_fid {@@ -71,6 +78,33 @@ enum sbi_ext_dbcn_fid { SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, }; + +enum sbi_ext_fwft_fid { +SBI_EXT_FWFT_SET =0 , +SBI_EXT_FWFT_GET , +}; + +#define SBI_FWFT_MISALIGNED_EXC_DELEG 0x0 +#define SBI_FWFT_LANDING_PAD 0x1 +#define SBI_FWFT_SHADOW_STACK 0x2 +#define SBI_FWFT_DOUBLE_TRAP 0x3 +#define SBI_FWFT_PTE_AD_HW_UPDATING 0x4 +#define SBI_FWFT_POINTER_MASKING_PMLEN 0x5 +#define SBI_FWFT_LOCAL_RESERVED_START 0x6 +#define SBI_FWFT_LOCAL_RESERVED_END 0x3fffffff +#define SBI_FWFT_LOCAL_PLATFORM_START 0x40000000 +#define SBI_FWFT_LOCAL_PLATFORM_END 0x7fffffff + +#define SBI_FWFT_GLOBAL_RESERVED_START 0x80000000 +#define SBI_FWFT_GLOBAL_RESERVED_END 0xbfffffff +#define SBI_FWFT_GLOBAL_PLATFORM_START 0xc0000000 +#define SBI_FWFT_GLOBAL_PLATFORM_END 0xffffffff + +#define SBI_FWFT_PLATFORM_FEATURE_BIT BIT(30) +#define SBI_FWFT_GLOBAL_FEATURE_BIT BIT(31) + +#define SBI_FWFT_SET_FLAG_LOCK BIT(0) +struct sbiret {long error;long value;riscv/sbi-fwft.c new file +60
-0@@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* SBI verification +* +* Copyright (C) 2024, Rivos Inc., Clément Léger <[email protected]> +*/ +#include <libcflat.h> +#include <stdlib.h> + +#include <asm/csr.h> +#include <asm/processor.h> +#include <asm/ptrace.h> +#include <asm/sbi.h> + +#include "sbi-tests.h" + +void check_fwft (void ); + + +static struct sbiret fwft_set_raw (unsigned long feature,unsigned long value,unsigned long flags) +{ +return sbi_ecall (SBI_EXT_FWFT ,SBI_EXT_FWFT_SET , feature, value, flags,0 ,0 ,0 ); +} + +static struct sbiret fwft_set (uint32_t feature,unsigned long value,unsigned long flags) +{ +return fwft_set_raw (feature, value, flags); +} + +static struct sbiret fwft_get_raw (unsigned long feature) +{ +return sbi_ecall (SBI_EXT_FWFT ,SBI_EXT_FWFT_GET , feature,0 ,0 ,0 ,0 ,0 ); +} + +static struct sbiret fwft_get (uint32_t feature) +{ +return fwft_get_raw (feature); +} + +static void fwft_check_reserved (unsigned long id) +{ +struct sbiret ret; + + ret =fwft_get (id); +sbiret_report_error (&ret,SBI_ERR_DENIED ,"get reserved feature 0x%lx" , id); + + ret =fwft_set (id,1 ,0 ); +sbiret_report_error (&ret,SBI_ERR_DENIED ,"set reserved feature 0x%lx" , id); +} + +static void fwft_check_base (void ) +{ +struct sbiret ret; + +report_prefix_push ("base" ); + +fwft_check_reserved (SBI_FWFT_LOCAL_RESERVED_START ); +fwft_check_reserved (SBI_FWFT_LOCAL_RESERVED_END ); +fwft_check_reserved (SBI_FWFT_GLOBAL_RESERVED_START ); +fwft_check_reserved (SBI_FWFT_GLOBAL_RESERVED_END );
riscv/sbi-fwft.c line 70
Quoted 10 lines
riscv/sbi-fwft.c new file +10
-0+ +/* Check id > 32 bits */ +if (__riscv_xlen >32 ) { + ret =fwft_get_raw (BIT (32 )); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"get feature 0x%lx error" ,BIT (32 )); + + ret =fwft_set_raw (BIT (32 ),0 ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"set feature 0x%lx error" ,BIT (32 ));
At least with the compiler I'm using, the code inside this "if (__riscv_xlen > 32)" block is still getting compiled for rv32 and breaking on the BIT(). It doesn't help to use BIT_ULL() here since fwft_get/set_raw() take longs. I guess we'll have to use #if.
Fixed on merge.
Quoted 43 lines
riscv/sbi-fwft.c new file +43
-0+ } + +report_prefix_pop (); +} + +static bool misaligned_handled; + +static void misaligned_handler (struct pt_regs *regs) +{ + misaligned_handled = true; + regs->epc +=4 ; +} + +static struct sbiret fwft_misaligned_exc_set (unsigned long value,unsigned long flags) +{ +return fwft_set (SBI_FWFT_MISALIGNED_EXC_DELEG , value, flags); +} + +static struct sbiret fwft_misaligned_exc_get (void ) +{ +return fwft_get (SBI_FWFT_MISALIGNED_EXC_DELEG ); +} + +static void fwft_check_misaligned_exc_deleg (void ) +{ +struct sbiret ret; + +report_prefix_push ("misaligned_exc_deleg" ); + + ret =fwft_misaligned_exc_get (); +if (ret.error ==SBI_ERR_NOT_SUPPORTED ) { +report_skip ("SBI_FWFT_MISALIGNED_EXC_DELEG is not supported" ); +return ; + } + +if (!sbiret_report_error (&ret,0 ,"Get misaligned deleg feature no error" )) +return ; + + ret =fwft_misaligned_exc_set (2 ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg feature invalid value 2" ); + ret =fwft_misaligned_exc_set (0xFFFFFFFF ,0 ); + sbiret_report_error(&ret, SBI_ERR_INVALID_PARAM,
riscv/sbi-fwft.c line 123
Quoted 10 lines
riscv/sbi-fwft.c new file +10
-0+ "Set misaligned deleg feature invalid value 0xFFFFFFFF"); + +if (__riscv_xlen >32 ) { + ret =fwft_misaligned_exc_set (BIT (32 ),0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg with invalid value > 32bits" ); + + ret =fwft_misaligned_exc_set (0 ,BIT (32 )); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg with invalid flag > 32bits" );
Same comment as above and also fixed on merge.
Thanks,
drew
Re: [kvm-unit-tests PATCH v3 2/2] riscv: Add tests for SBI FWFT extension
Quoted 158 lines · Andrew Jones
Quoted 157 lines · Clément Léger
Add tests for the FWFT SBI extension. Currently, only the reserved range as well as the misaligned exception delegation are used.
Signed-off-by Clément Léger <[email protected]>--- riscv/Makefile | 2 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 riscv/sbi-fwft.criscv/Makefile +1
-1@@ -17,7 +17,7 @@ tests += $(TEST_DIR)/sieve.$(exe) all: $(tests) -$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o +$(TEST_DIR)/sbi-deps = $(TEST_DIR)/sbi-asm.o $(TEST_DIR)/sbi-fwft.o # When built for EFI sieve needs extra memory, run with e.g. '-m 256' on QEMU $(TEST_DIR)/sieve.$(exe): AUXFLAGS = 0x1lib/riscv/asm/sbi.h +34
-0@@ -11,6 +11,12 @@#define SBI_ERR_ALREADY_AVAILABLE -6#define SBI_ERR_ALREADY_STARTED -7#define SBI_ERR_ALREADY_STOPPED -8 +#define SBI_ERR_NO_SHMEM -9 +#define SBI_ERR_INVALID_STATE -10 +#define SBI_ERR_BAD_RANGE -11 +#define SBI_ERR_TIMEOUT -12 +#define SBI_ERR_IO -13 +#define SBI_ERR_LOCKED -14#ifndef __ASSEMBLY__#include <cpumask.h> @@ -23,6 +29,7 @@ enum sbi_ext_id {SBI_EXT_SRST =0x53525354 ,SBI_EXT_DBCN =0x4442434E ,SBI_EXT_SUSP =0x53555350 , + SBI_EXT_FWFT = 0x46574654, }; enum sbi_ext_base_fid {@@ -71,6 +78,33 @@ enum sbi_ext_dbcn_fid { SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, }; + +enum sbi_ext_fwft_fid { +SBI_EXT_FWFT_SET =0 , +SBI_EXT_FWFT_GET , +}; + +#define SBI_FWFT_MISALIGNED_EXC_DELEG 0x0 +#define SBI_FWFT_LANDING_PAD 0x1 +#define SBI_FWFT_SHADOW_STACK 0x2 +#define SBI_FWFT_DOUBLE_TRAP 0x3 +#define SBI_FWFT_PTE_AD_HW_UPDATING 0x4 +#define SBI_FWFT_POINTER_MASKING_PMLEN 0x5 +#define SBI_FWFT_LOCAL_RESERVED_START 0x6 +#define SBI_FWFT_LOCAL_RESERVED_END 0x3fffffff +#define SBI_FWFT_LOCAL_PLATFORM_START 0x40000000 +#define SBI_FWFT_LOCAL_PLATFORM_END 0x7fffffff + +#define SBI_FWFT_GLOBAL_RESERVED_START 0x80000000 +#define SBI_FWFT_GLOBAL_RESERVED_END 0xbfffffff +#define SBI_FWFT_GLOBAL_PLATFORM_START 0xc0000000 +#define SBI_FWFT_GLOBAL_PLATFORM_END 0xffffffff + +#define SBI_FWFT_PLATFORM_FEATURE_BIT BIT(30) +#define SBI_FWFT_GLOBAL_FEATURE_BIT BIT(31) + +#define SBI_FWFT_SET_FLAG_LOCK BIT(0) +struct sbiret {long error;long value;riscv/sbi-fwft.c new file +67
-0@@ -0,0 +1,190 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* SBI verification +* +* Copyright (C) 2024, Rivos Inc., Clément Léger <[email protected]> +*/ +#include <libcflat.h> +#include <stdlib.h> + +#include <asm/csr.h> +#include <asm/processor.h> +#include <asm/ptrace.h> +#include <asm/sbi.h> + +#include "sbi-tests.h" + +void check_fwft (void ); + + +static struct sbiret fwft_set_raw (unsigned long feature,unsigned long value,unsigned long flags) +{ +return sbi_ecall (SBI_EXT_FWFT ,SBI_EXT_FWFT_SET , feature, value, flags,0 ,0 ,0 ); +} + +static struct sbiret fwft_set (uint32_t feature,unsigned long value,unsigned long flags) +{ +return fwft_set_raw (feature, value, flags); +} + +static struct sbiret fwft_get_raw (unsigned long feature) +{ +return sbi_ecall (SBI_EXT_FWFT ,SBI_EXT_FWFT_GET , feature,0 ,0 ,0 ,0 ,0 ); +} + +static struct sbiret fwft_get (uint32_t feature) +{ +return fwft_get_raw (feature); +} + +static void fwft_check_reserved (unsigned long id) +{ +struct sbiret ret; + + ret =fwft_get (id); +sbiret_report_error (&ret,SBI_ERR_DENIED ,"get reserved feature 0x%lx" , id); + + ret =fwft_set (id,1 ,0 ); +sbiret_report_error (&ret,SBI_ERR_DENIED ,"set reserved feature 0x%lx" , id); +} + +static void fwft_check_base (void ) +{ +struct sbiret ret; + +report_prefix_push ("base" ); + +fwft_check_reserved (SBI_FWFT_LOCAL_RESERVED_START ); +fwft_check_reserved (SBI_FWFT_LOCAL_RESERVED_END ); +fwft_check_reserved (SBI_FWFT_GLOBAL_RESERVED_START ); +fwft_check_reserved (SBI_FWFT_GLOBAL_RESERVED_END ); + +/* Check id > 32 bits */ +if (__riscv_xlen >32 ) { + ret =fwft_get_raw (BIT (32 )); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"get feature 0x%lx error" ,BIT (32 )); +
Quoted 8 lines
riscv/sbi-fwft.c line 70
Quoted 3 lines
riscv/sbi-fwft.c new file +3
-0+ ret =fwft_set_raw (BIT (32 ),0 ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"set feature 0x%lx error" ,BIT (32 ));At least with the compiler I'm using, the code inside this "if (
__riscv_xlen> 32)" block is still getting compiled for rv32 and breaking on theBIT(). It doesn't help to useBIT_ULL()here since fwft_get/set_raw() take longs. I guess we'll have to use #if.
Acked, forgot to compile for rv32 that time. I'll double check for SSE.
Thanks,
Clément
Quoted 61 lines
Fixed on merge.
Quoted 43 lines
riscv/sbi-fwft.c new file +43
-0+ } + +report_prefix_pop (); +} + +static bool misaligned_handled; + +static void misaligned_handler (struct pt_regs *regs) +{ + misaligned_handled = true; + regs->epc +=4 ; +} + +static struct sbiret fwft_misaligned_exc_set (unsigned long value,unsigned long flags) +{ +return fwft_set (SBI_FWFT_MISALIGNED_EXC_DELEG , value, flags); +} + +static struct sbiret fwft_misaligned_exc_get (void ) +{ +return fwft_get (SBI_FWFT_MISALIGNED_EXC_DELEG ); +} + +static void fwft_check_misaligned_exc_deleg (void ) +{ +struct sbiret ret; + +report_prefix_push ("misaligned_exc_deleg" ); + + ret =fwft_misaligned_exc_get (); +if (ret.error ==SBI_ERR_NOT_SUPPORTED ) { +report_skip ("SBI_FWFT_MISALIGNED_EXC_DELEG is not supported" ); +return ; + } + +if (!sbiret_report_error (&ret,0 ,"Get misaligned deleg feature no error" )) +return ; + + ret =fwft_misaligned_exc_set (2 ,0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg feature invalid value 2" ); + ret =fwft_misaligned_exc_set (0xFFFFFFFF ,0 ); + sbiret_report_error(&ret, SBI_ERR_INVALID_PARAM,riscv/sbi-fwft.c line 123
Quoted 10 lines
riscv/sbi-fwft.c new file +10
-0+ "Set misaligned deleg feature invalid value 0xFFFFFFFF"); + +if (__riscv_xlen >32 ) { + ret =fwft_misaligned_exc_set (BIT (32 ),0 ); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg with invalid value > 32bits" ); + + ret =fwft_misaligned_exc_set (0 ,BIT (32 )); +sbiret_report_error (&ret,SBI_ERR_INVALID_PARAM , +"Set misaligned deleg with invalid flag > 32bits" );Same comment as above and also fixed on merge.
Thanks,
drew
Andrew Jones
AppliedQuoted 28 lines · Clément Léger
This series adds a minimal set of tests for the FWFT extension. Reserved range as well as misaligned exception delegation. A commit coming from the SSE tests series is also included in this series to add -deps makefile notation.
---
V3:
- Rebase on top of andrew/riscv/sbi
- Usesbiret_report_error()
- Add helpers forMISALIGNED_EXC_DELEGfwft set/get
- Add a comment on misaligned trap handlingV2:
- Added fwft_{get/set}_raw() to test invalid > 32 bits ids
- Added test for invalid flags/value > 32 bits
- Added test for lock feature
- Use and enum for FWFT functions
- Replace hardcoded 1 << withBIT()
- Fix fwft_get/set return value
- Split set/get tests for reserved ranges
- Added push/pop to arch -c option
- Remove leftover of manual probing codeClément Léger (2):
riscv: Add "-deps" handling for tests
riscv: Add tests for SBI FWFT extension
Quoted 10 lines
riscv/Makefile | 8 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 riscv/sbi-fwft.cSignature · 1 line
2.47.1
Applied to riscv/sbi
https://gitlab.com/jones-drew/kvm-unit-tests/-/commits/riscv/sbi
Thanks,
drew
Quoted 36 lines · Andrew Jones
Quoted 35 lines · Clément Léger
This series adds a minimal set of tests for the FWFT extension. Reserved range as well as misaligned exception delegation. A commit coming from the SSE tests series is also included in this series to add -deps makefile notation.
---
V3:
- Rebase on top of andrew/riscv/sbi
- Usesbiret_report_error()
- Add helpers forMISALIGNED_EXC_DELEGfwft set/get
- Add a comment on misaligned trap handlingV2:
- Added fwft_{get/set}_raw() to test invalid > 32 bits ids
- Added test for invalid flags/value > 32 bits
- Added test for lock feature
- Use and enum for FWFT functions
- Replace hardcoded 1 << withBIT()
- Fix fwft_get/set return value
- Split set/get tests for reserved ranges
- Added push/pop to arch -c option
- Remove leftover of manual probing codeClément Léger (2):
riscv: Add "-deps" handling for tests
riscv: Add tests for SBI FWFT extensionriscv/Makefile | 8 +- lib/riscv/asm/sbi.h | 34 ++++++++ riscv/sbi-fwft.c | 190 ++++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 riscv/sbi-fwft.c
Quoted 8 lines
Quoted 3 lines
Signature · 1 line
2.47.1Applied to riscv/sbi
https://gitlab.com/jones-drew/kvm-unit-tests/-/commits/riscv/sbi
Merged.
Thanks,
drew