riscv: add SBI SSE extension tests
Subsystems (3)
v3 cover riscv: add SBI SSE extension tests
This series adds an individual test for SBI SSE extension as well as needed infrastructure for SSE support.
---
V3:
- Add -deps variable for test specific dependencies
- Fix formatting errors/typo in sbi.h
- Add missing double trap event
- Alphabetize sbi-sse.c includes
- Fix a6 content after unmasking event
- Add SSE HART_MASK/UNMASK test
- Use mv instead of move
- move sbi_check_sse() definition in sbi.c
- Remove sbi_sse test from unitests.cfg
V2:
- Rebased on origin/master and integrate it into sbi.c tests
Cl?ment L?ger (4):
riscv: Add "-deps" handling for tests
riscv: lib: Add SBI SSE extension definitions
riscv: lib: Add SSE assembly entry handling
riscv: sbi: Add SSE extension tests
riscv/Makefile | 9 +- lib/riscv/asm/csr.h | 2 + lib/riscv/asm/sbi.h | 83 ++++ lib/riscv/asm/sse.h | 16 + lib/riscv/sse-entry.S | 100 ++++ lib/riscv/asm-offsets.c | 9 + riscv/sbi-sse.c | 1043 +++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 8 files changed, 1262 insertions(+), 3 deletions(-) create mode 100644 lib/riscv/asm/sse.h create mode 100644 lib/riscv/sse-entry.S create mode 100644 riscv/sbi-sse.c
Signature · 1 line
2.45.2
PATCH v3 1/4 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.45.2
Re: [kvm-unit-tests PATCH v3 1/4] riscv: Add "-deps" handling for tests
Quoted 10 lines · Cl?ment L?ger
Some tests uses additional files that needs to be linked in the final binary. This is the case for
asm-sbi.Swhich is only used by the sbi test. Add a "-deps" per test variable that allows to designate additional .o files.Signed-off-by Cl?ment L?ger <[email protected]>--- riscv/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
PATCH v3 2/4 riscv: lib: Add SBI SSE extension definitions
In reply to Clément LégerAdd SBI SSE extension definitions in sbi.h
--- lib/riscv/asm/sbi.h | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
lib/riscv/asm/sbi.h +83 -0
@@ -11,6 +11,11 @@#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#ifndef __ASSEMBLY__#include <cpumask.h>
@@ -23,6 +28,7 @@ enum sbi_ext_id {SBI_EXT_SRST =0x53525354 ,SBI_EXT_DBCN =0x4442434E ,SBI_EXT_SUSP =0x53555350 , + SBI_EXT_SSE = 0x535345, }; enum sbi_ext_base_fid {
@@ -71,6 +77,83 @@ enum sbi_ext_dbcn_fid { SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, }; +enum sbi_ext_ss_fid { +SBI_EXT_SSE_READ_ATTRS =0 , +SBI_EXT_SSE_WRITE_ATTRS , +SBI_EXT_SSE_REGISTER , +SBI_EXT_SSE_UNREGISTER , +SBI_EXT_SSE_ENABLE , +SBI_EXT_SSE_DISABLE , +SBI_EXT_SSE_COMPLETE , +SBI_EXT_SSE_INJECT , +SBI_EXT_SSE_HART_UNMASK , +SBI_EXT_SSE_HART_MASK , +}; + +/* SBI SSE Event Attributes. */ +enum sbi_sse_attr_id { +SBI_SSE_ATTR_STATUS =0x00000000 , +SBI_SSE_ATTR_PRIORITY =0x00000001 , +SBI_SSE_ATTR_CONFIG =0x00000002 , +SBI_SSE_ATTR_PREFERRED_HART =0x00000003 , +SBI_SSE_ATTR_ENTRY_PC =0x00000004 , +SBI_SSE_ATTR_ENTRY_ARG =0x00000005 , +SBI_SSE_ATTR_INTERRUPTED_SEPC =0x00000006 , +SBI_SSE_ATTR_INTERRUPTED_FLAGS =0x00000007 , +SBI_SSE_ATTR_INTERRUPTED_A6 =0x00000008 , +SBI_SSE_ATTR_INTERRUPTED_A7 =0x00000009 , +}; + +#define SBI_SSE_ATTR_STATUS_STATE_OFFSET 0 +#define SBI_SSE_ATTR_STATUS_STATE_MASK 0x3 +#define SBI_SSE_ATTR_STATUS_PENDING_OFFSET 2 +#define SBI_SSE_ATTR_STATUS_INJECT_OFFSET 3 + +#define SBI_SSE_ATTR_CONFIG_ONESHOT (1 << 0) + +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_SSTATUS_SPP BIT(0) +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_SSTATUS_SPIE BIT(1) +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_HSTATUS_SPV BIT(2) +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_HSTATUS_SPVP BIT(3) + +enum sbi_sse_state { +SBI_SSE_STATE_UNUSED =0 , +SBI_SSE_STATE_REGISTERED =1 , +SBI_SSE_STATE_ENABLED =2 , +SBI_SSE_STATE_RUNNING =3 , +}; + +/* SBI SSE Event IDs. */ +#define SBI_SSE_EVENT_LOCAL_RAS 0x00000000 +#define SBI_SSE_EVENT_LOCAL_DOUBLE_TRAP 0x00000001 +#define SBI_SSE_EVENT_LOCAL_PLAT_0_START 0x00004000 +#define SBI_SSE_EVENT_LOCAL_PLAT_0_END 0x00007fff + +#define SBI_SSE_EVENT_GLOBAL_RAS 0x00008000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_0_START 0x0000c000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_0_END 0x0000ffff + +#define SBI_SSE_EVENT_LOCAL_PMU 0x00010000 +#define SBI_SSE_EVENT_LOCAL_PLAT_1_START 0x00014000 +#define SBI_SSE_EVENT_LOCAL_PLAT_1_END 0x00017fff +#define SBI_SSE_EVENT_GLOBAL_PLAT_1_START 0x0001c000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_1_END 0x0001ffff + +#define SBI_SSE_EVENT_LOCAL_PLAT_2_START 0x00024000 +#define SBI_SSE_EVENT_LOCAL_PLAT_2_END 0x00027fff +#define SBI_SSE_EVENT_GLOBAL_PLAT_2_START 0x0002c000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_2_END 0x0002ffff + +#define SBI_SSE_EVENT_LOCAL_SOFTWARE 0xffff0000 +#define SBI_SSE_EVENT_LOCAL_PLAT_3_START 0xffff4000 +#define SBI_SSE_EVENT_LOCAL_PLAT_3_END 0xffff7fff +#define SBI_SSE_EVENT_GLOBAL_SOFTWARE 0xffff8000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_3_START 0xffffc000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_3_END 0xffffffff + +#define SBI_SSE_EVENT_PLATFORM_BIT (1 << 14) +#define SBI_SSE_EVENT_GLOBAL_BIT (1 << 15) +struct sbiret {long error;long value;
Signature · 1 line
2.45.2
Re: [kvm-unit-tests PATCH v3 2/4] riscv: lib: Add SBI SSE extension definitions
Quoted 32 lines · Cl?ment L?ger
Add SBI SSE extension definitions in
sbi.hSigned-off-by Cl?ment L?ger <[email protected]>--- lib/riscv/asm/sbi.h | 83 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)lib/riscv/asm/sbi.h +6
-0@@ -11,6 +11,11 @@#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#ifndef __ASSEMBLY__#include <cpumask.h> @@ -23,6 +28,7 @@ enum sbi_ext_id {SBI_EXT_SRST =0x53525354 ,SBI_EXT_DBCN =0x4442434E ,SBI_EXT_SUSP =0x53555350 , + SBI_EXT_SSE = 0x535345, }; enum sbi_ext_base_fid {
lib/riscv/asm/sbi.h enum sbi_ext_dbcn_fid { · line 80
Quoted 4 lines
lib/riscv/asm/sbi.h +1
-0@@ -71,6 +77,83 @@ enum sbi_ext_dbcn_fid { SBI_EXT_DBCN_CONSOLE_WRITE_BYTE, }; +enum sbi_ext_ss_fid {
^ sse
Quoted 82 lines
lib/riscv/asm/sbi.h +76
-0+ SBI_EXT_SSE_READ_ATTRS = 0, + SBI_EXT_SSE_WRITE_ATTRS, +SBI_EXT_SSE_REGISTER , +SBI_EXT_SSE_UNREGISTER , +SBI_EXT_SSE_ENABLE , +SBI_EXT_SSE_DISABLE , +SBI_EXT_SSE_COMPLETE , +SBI_EXT_SSE_INJECT , +SBI_EXT_SSE_HART_UNMASK , + SBI_EXT_SSE_HART_MASK, +}; + +/* SBI SSE Event Attributes. */ +enum sbi_sse_attr_id { +SBI_SSE_ATTR_STATUS =0x00000000 , +SBI_SSE_ATTR_PRIORITY =0x00000001 , +SBI_SSE_ATTR_CONFIG =0x00000002 , +SBI_SSE_ATTR_PREFERRED_HART =0x00000003 , +SBI_SSE_ATTR_ENTRY_PC =0x00000004 , +SBI_SSE_ATTR_ENTRY_ARG =0x00000005 , +SBI_SSE_ATTR_INTERRUPTED_SEPC =0x00000006 , +SBI_SSE_ATTR_INTERRUPTED_FLAGS =0x00000007 , +SBI_SSE_ATTR_INTERRUPTED_A6 =0x00000008 , +SBI_SSE_ATTR_INTERRUPTED_A7 =0x00000009 , +}; + +#define SBI_SSE_ATTR_STATUS_STATE_OFFSET 0 +#define SBI_SSE_ATTR_STATUS_STATE_MASK 0x3 +#define SBI_SSE_ATTR_STATUS_PENDING_OFFSET 2 +#define SBI_SSE_ATTR_STATUS_INJECT_OFFSET 3 + +#define SBI_SSE_ATTR_CONFIG_ONESHOT (1 << 0) + +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_SSTATUS_SPP BIT(0) +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_SSTATUS_SPIE BIT(1) +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_HSTATUS_SPV BIT(2) +#define SBI_SSE_ATTR_INTERRUPTED_FLAGS_HSTATUS_SPVP BIT(3) + +enum sbi_sse_state { +SBI_SSE_STATE_UNUSED =0 , +SBI_SSE_STATE_REGISTERED =1 , +SBI_SSE_STATE_ENABLED =2 , +SBI_SSE_STATE_RUNNING =3 , +}; + +/* SBI SSE Event IDs. */ +#define SBI_SSE_EVENT_LOCAL_RAS 0x00000000 +#define SBI_SSE_EVENT_LOCAL_DOUBLE_TRAP 0x00000001 +#define SBI_SSE_EVENT_LOCAL_PLAT_0_START 0x00004000 +#define SBI_SSE_EVENT_LOCAL_PLAT_0_END 0x00007fff + +#define SBI_SSE_EVENT_GLOBAL_RAS 0x00008000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_0_START 0x0000c000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_0_END 0x0000ffff + +#define SBI_SSE_EVENT_LOCAL_PMU 0x00010000 +#define SBI_SSE_EVENT_LOCAL_PLAT_1_START 0x00014000 +#define SBI_SSE_EVENT_LOCAL_PLAT_1_END 0x00017fff +#define SBI_SSE_EVENT_GLOBAL_PLAT_1_START 0x0001c000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_1_END 0x0001ffff + +#define SBI_SSE_EVENT_LOCAL_PLAT_2_START 0x00024000 +#define SBI_SSE_EVENT_LOCAL_PLAT_2_END 0x00027fff +#define SBI_SSE_EVENT_GLOBAL_PLAT_2_START 0x0002c000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_2_END 0x0002ffff + +#define SBI_SSE_EVENT_LOCAL_SOFTWARE 0xffff0000 +#define SBI_SSE_EVENT_LOCAL_PLAT_3_START 0xffff4000 +#define SBI_SSE_EVENT_LOCAL_PLAT_3_END 0xffff7fff +#define SBI_SSE_EVENT_GLOBAL_SOFTWARE 0xffff8000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_3_START 0xffffc000 +#define SBI_SSE_EVENT_GLOBAL_PLAT_3_END 0xffffffff + +#define SBI_SSE_EVENT_PLATFORM_BIT (1 << 14) +#define SBI_SSE_EVENT_GLOBAL_BIT (1 << 15) +struct sbiret {long error;long value;Signature · 1 line
2.45.2
Otherwise looks good.
Thanks,
drew
PATCH v3 3/4 riscv: lib: Add SSE assembly entry handling
In reply to Clément LégerAdd a SSE entry assembly code to handle SSE events. Events should be registered with a struct sse_handler_arg containing a correct stack and handler function.
--- riscv/Makefile | 1 + lib/riscv/asm/sse.h | 16 +++++++ lib/riscv/sse-entry.S | 100 ++++++++++++++++++++++++++++++++++++++++ lib/riscv/asm-offsets.c | 9 ++++ 4 files changed, 126 insertions(+) create mode 100644 lib/riscv/asm/sse.h create mode 100644 lib/riscv/sse-entry.S
riscv/Makefile +1 -0
@@ -41,6 +41,7 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o +cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)
lib/riscv/asm/sse.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMRISCV_SSE_H_ +#define _ASMRISCV_SSE_H_ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +}; + +extern void sse_entry (void ); + +#endif /* _ASMRISCV_SSE_H_ */
lib/riscv/sse-entry.S new file +100 -0
100 lines not on this page · raw message
lib/riscv/asm-offsets.c +9 -0
@@ -3,7 +3,9 @@#include <elf.h> #include <asm/processor.h> #include <asm/ptrace.h> +#include <asm/sbi.h> #include <asm/smp.h> +#include <asm/sse.h> int main (void ) {
@@ -63,5 +65,12 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); +OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); +OFFSET (SSE_HANDLER , sse_handler_arg, handler); +OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); +OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack); +DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE ); +DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE ); +return 0 ; }
Signature · 1 line
2.45.2
Re: [kvm-unit-tests PATCH v3 3/4] riscv: lib: Add SSE assembly entry handling
Quoted 34 lines · Cl?ment L?ger
Add a SSE entry assembly code to handle SSE events. Events should be registered with a struct
sse_handler_argcontaining a correct stack and handler function.Signed-off-by Cl?ment L?ger <[email protected]>--- riscv/Makefile | 1 + lib/riscv/asm/sse.h | 16 +++++++ lib/riscv/sse-entry.S | 100 ++++++++++++++++++++++++++++++++++++++++ lib/riscv/asm-offsets.c | 9 ++++ 4 files changed, 126 insertions(+) create mode 100644 lib/riscv/asm/sse.h create mode 100644 lib/riscv/sse-entry.Sriscv/Makefile +1
-0@@ -41,6 +41,7 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o +cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)lib/riscv/asm/sse.h new file +2
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMRISCV_SSE_H_
lib/riscv/asm/sse.h line 12
Quoted 10 lines
lib/riscv/asm/sse.h new file +10
-0+#define _ASMRISCV_SSE_H_ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +};
It still feels wrong to put a test-specific struct definition in lib. It's test-specific, because the SSE register function doesn't define it (otherwise we'd put the definition in lib/riscv/asm/sbi.h with the rest of the defines that come straight from the spec). Now, if we foresee using sse_event_register() outside of SBI SSE testing, then it would make sense to come up with a common struct, but it doesn't look like we have plans for that now, and sse_event_register() isn't in lib/riscv/sbi.c yet.
Quoted 12 lines
lib/riscv/asm/sse.h new file +4
-0+ +extern void sse_entry (void ); + +#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S new file +2
-0@@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/*
lib/riscv/sse-entry.S line 12
Quoted 10 lines
lib/riscv/sse-entry.S new file +10
-0+ * SBI SSE entry code + * + * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> + */ +#include <asm/asm.h> +#include <asm/asm-offsets.h> +#include <asm/csr.h> + +.global sse_entry +sse_entry:
sse_entry is also test-specific unless we export sse_event_register().
Quoted 103 lines
lib/riscv/sse-entry.S new file +88
-0+ /* Save stack temporarily */ + REG_S sp, SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SSE_HANDLER(a7) + REG_L a0, SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecalllib/riscv/asm-offsets.c +2
-0@@ -3,7 +3,9 @@#include <elf.h> #include <asm/processor.h> #include <asm/ptrace.h> +#include <asm/sbi.h> #include <asm/smp.h> +#include <asm/sse.h> int main (void ) {
lib/riscv/asm-offsets.c int main(void) · line 71
Quoted 7 lines
lib/riscv/asm-offsets.c +4
-0@@ -63,5 +65,12 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); +OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); +OFFSET (SSE_HANDLER , sse_handler_arg, handler); +OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); +OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack);
I think I prefer just hard coding the offsets in defines and then using static asserts to ensure they stay as expected. Below is a diff I applied which moves some stuff around. Let me know what you think.
Thanks,
drew
Quoted 8 lines
lib/riscv/asm-offsets.c +3
-0+DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE ); +DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE ); +return 0 ; }Signature · 1 line
2.45.2
lib/riscv/asm-offsets.c +2 -5
@@ -5,7 +5,6 @@#include <asm/ptrace.h> #include <asm/sbi.h> #include <asm/smp.h> -#include <asm/sse.h> int main (void ) {
@@ -65,10 +64,8 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); -OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); -OFFSET (SSE_HANDLER , sse_handler_arg, handler); -OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); -OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack); +DEFINE (ASM_SBI_EXT_HSM ,SBI_EXT_HSM ); +DEFINE (ASM_SBI_EXT_HSM_HART_STOP ,SBI_EXT_HSM_HART_STOP );DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE );DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE );
lib/riscv/asm/sse.h deleted +0 -16
@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _ASMRISCV_SSE_H_ -#define _ASMRISCV_SSE_H_ - -typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); - -struct sse_handler_arg { -unsigned long reg_tmp; -sse_handler_fn handler; -void *handler_data; -void *stack; -}; - -extern void sse_entry (void ); - -#endif /* _ASMRISCV_SSE_H_ */
lib/riscv/sse-entry.S deleted +0 -100
100 lines not on this page · raw message
riscv/Makefile +0 -1
@@ -41,7 +41,6 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o -cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)
riscv/sbi-asm.S +94 -2
111 lines not on this page · raw message
riscv/sbi-sse.c +1 -1
@@ -16,12 +16,12 @@#include <asm/processor.h> #include <asm/sbi.h> #include <asm/setup.h> -#include <asm/sse.h> #include "sbi-tests.h" #define SSE_STACK_SIZE PAGE_SIZE +void sse_entry (void );void check_sse (void );struct sse_event_info {
riscv/sbi-tests.h +21 -0
@@ -33,4 +33,25 @@#define SBI_SUSP_TEST_HARTID (1 << 2)#define SBI_SUSP_TEST_MASK 7 +#define SBI_SSE_REG_TMP 0 +#define SBI_SSE_HANDLER 8 +#define SBI_SSE_HANDLER_DATA 16 +#define SBI_SSE_HANDLER_STACK 24 + +#ifndef __ASSEMBLY__ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +}; +_Static_assert (offsetof(struct sse_handler_arg , reg_tmp) ==SBI_SSE_REG_TMP ); +_Static_assert (offsetof(struct sse_handler_arg , handler) ==SBI_SSE_HANDLER ); +_Static_assert (offsetof(struct sse_handler_arg , handler_data) ==SBI_SSE_HANDLER_DATA ); +_Static_assert (offsetof(struct sse_handler_arg , stack) ==SBI_SSE_HANDLER_STACK ); + +#endif /* !__ASSEMBLY__ */ #endif /* _RISCV_SBI_TESTS_H_ */
Re: [kvm-unit-tests PATCH v3 3/4] riscv: lib: Add SSE assembly entry handling
Quoted 525 lines · Andrew Jones
Quoted 34 lines · Cl?ment L?ger
Add a SSE entry assembly code to handle SSE events. Events should be registered with a struct
sse_handler_argcontaining a correct stack and handler function.Signed-off-by Cl?ment L?ger <[email protected]>--- riscv/Makefile | 1 + lib/riscv/asm/sse.h | 16 +++++++ lib/riscv/sse-entry.S | 100 ++++++++++++++++++++++++++++++++++++++++ lib/riscv/asm-offsets.c | 9 ++++ 4 files changed, 126 insertions(+) create mode 100644 lib/riscv/asm/sse.h create mode 100644 lib/riscv/sse-entry.Sriscv/Makefile +1
-0@@ -41,6 +41,7 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o +cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)lib/riscv/asm/sse.h new file +2
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMRISCV_SSE_H_lib/riscv/asm/sse.h line 12
Quoted 10 lines
lib/riscv/asm/sse.h new file +10
-0+#define _ASMRISCV_SSE_H_ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +};It still feels wrong to put a test-specific struct definition in lib. It's test-specific, because the SSE register function doesn't define it (otherwise we'd put the definition in
lib/riscv/asm/sbi.hwith the rest of the defines that come straight from the spec). Now, if we foresee usingsse_event_register()outside of SBI SSE testing, then it would make sense to come up with a common struct, but it doesn't look like we have plans for that now, andsse_event_register()isn't inlib/riscv/sbi.cyet.Quoted 12 lines
lib/riscv/asm/sse.h new file +4
-0+ +extern void sse_entry (void ); + +#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S new file +2
-0@@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/*lib/riscv/sse-entry.S line 12
Quoted 10 lines
lib/riscv/sse-entry.S new file +10
-0+ * SBI SSE entry code + * + * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> + */ +#include <asm/asm.h> +#include <asm/asm-offsets.h> +#include <asm/csr.h> + +.global sse_entry +sse_entry:
sse_entryis also test-specific unless we exportsse_event_register().Quoted 103 lines
lib/riscv/sse-entry.S new file +88
-0+ /* Save stack temporarily */ + REG_S sp, SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SSE_HANDLER(a7) + REG_L a0, SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecalllib/riscv/asm-offsets.c +2
-0@@ -3,7 +3,9 @@#include <elf.h> #include <asm/processor.h> #include <asm/ptrace.h> +#include <asm/sbi.h> #include <asm/smp.h> +#include <asm/sse.h> int main (void ) {lib/riscv/asm-offsets.c int main(void) · line 71
Quoted 7 lines
lib/riscv/asm-offsets.c +4
-0@@ -63,5 +65,12 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); +OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); +OFFSET (SSE_HANDLER , sse_handler_arg, handler); +OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); +OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack);I think I prefer just hard coding the offsets in defines and then using static asserts to ensure they stay as expected. Below is a diff I applied which moves some stuff around. Let me know what you think.
Thanks,
drewQuoted 8 lines
lib/riscv/asm-offsets.c +3
-0+DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE ); +DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE ); +return 0 ; }Signature · 1 line
2.45.2lib/riscv/asm-offsets.c +2
-5@@ -5,7 +5,6 @@#include <asm/ptrace.h> #include <asm/sbi.h> #include <asm/smp.h> -#include <asm/sse.h> int main (void ) {@@ -65,10 +64,8 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); -OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); -OFFSET (SSE_HANDLER , sse_handler_arg, handler); -OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); -OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack); +DEFINE (ASM_SBI_EXT_HSM ,SBI_EXT_HSM ); +DEFINE (ASM_SBI_EXT_HSM_HART_STOP ,SBI_EXT_HSM_HART_STOP );DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE );DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE );lib/riscv/asm/sse.h deleted +0
-16@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _ASMRISCV_SSE_H_ -#define _ASMRISCV_SSE_H_ - -typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); - -struct sse_handler_arg { -unsigned long reg_tmp; -sse_handler_fn handler; -void *handler_data; -void *stack; -}; - -extern void sse_entry (void ); - -#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S deleted +0
-100@@ -1,100 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * SBI SSE entry code - * - * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> - */ -#include <asm/asm.h> -#include <asm/asm-offsets.h> -#include <asm/csr.h> - -.global sse_entry -sse_entry: - /* Save stack temporarily */ - REG_S sp, SSE_REG_TMP(a7) - /* Set entry stack */ - REG_L sp, SSE_HANDLER_STACK(a7) - - addi sp, sp, -(PT_SIZE) - REG_S ra, PT_RA(sp) - REG_S s0, PT_S0(sp) - REG_S s1, PT_S1(sp) - REG_S s2, PT_S2(sp) - REG_S s3, PT_S3(sp) - REG_S s4, PT_S4(sp) - REG_S s5, PT_S5(sp) - REG_S s6, PT_S6(sp) - REG_S s7, PT_S7(sp) - REG_S s8, PT_S8(sp) - REG_S s9, PT_S9(sp) - REG_S s10, PT_S10(sp) - REG_S s11, PT_S11(sp) - REG_S tp, PT_TP(sp) - REG_S t0, PT_T0(sp) - REG_S t1, PT_T1(sp) - REG_S t2, PT_T2(sp) - REG_S t3, PT_T3(sp) - REG_S t4, PT_T4(sp) - REG_S t5, PT_T5(sp) - REG_S t6, PT_T6(sp) - REG_S gp, PT_GP(sp) - REG_S a0, PT_A0(sp) - REG_S a1, PT_A1(sp) - REG_S a2, PT_A2(sp) - REG_S a3, PT_A3(sp) - REG_S a4, PT_A4(sp) - REG_S a5, PT_A5(sp) - csrr a1, CSR_SEPC - REG_S a1, PT_EPC(sp) - csrr a2, CSR_SSTATUS - REG_S a2, PT_STATUS(sp) - - REG_L a0, SSE_REG_TMP(a7) - REG_S a0, PT_SP(sp) - - REG_L t0, SSE_HANDLER(a7) - REG_L a0, SSE_HANDLER_DATA(a7) - mv a1, sp - mv a2, a6 - jalr t0 - - - REG_L a1, PT_EPC(sp) - REG_L a2, PT_STATUS(sp) - csrw CSR_SEPC, a1 - csrw CSR_SSTATUS, a2 - - REG_L ra, PT_RA(sp) - REG_L s0, PT_S0(sp) - REG_L s1, PT_S1(sp) - REG_L s2, PT_S2(sp) - REG_L s3, PT_S3(sp) - REG_L s4, PT_S4(sp) - REG_L s5, PT_S5(sp) - REG_L s6, PT_S6(sp) - REG_L s7, PT_S7(sp) - REG_L s8, PT_S8(sp) - REG_L s9, PT_S9(sp) - REG_L s10, PT_S10(sp) - REG_L s11, PT_S11(sp) - REG_L tp, PT_TP(sp) - REG_L t0, PT_T0(sp) - REG_L t1, PT_T1(sp) - REG_L t2, PT_T2(sp) - REG_L t3, PT_T3(sp) - REG_L t4, PT_T4(sp) - REG_L t5, PT_T5(sp) - REG_L t6, PT_T6(sp) - REG_L gp, PT_GP(sp) - REG_L a0, PT_A0(sp) - REG_L a1, PT_A1(sp) - REG_L a2, PT_A2(sp) - REG_L a3, PT_A3(sp) - REG_L a4, PT_A4(sp) - REG_L a5, PT_A5(sp) - - REG_L sp, PT_SP(sp) - - li a7, ASM_SBI_EXT_SSE - li a6, ASM_SBI_EXT_SSE_COMPLETE - ecallriscv/Makefile +0
-1@@ -41,7 +41,6 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o -cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)riscv/sbi-asm.S +94
-2@@ -6,6 +6,7 @@ */ #define __ASSEMBLY__ #include <asm/asm.h> +#include <asm/asm-offsets.h> #include <asm/csr.h> #include "sbi-tests.h"@@ -58,8 +59,8 @@ sbi_hsm_check: 7: lb t0, 0(t1) pause beqz t0, 7b - li a7, 0x48534d /* SBI_EXT_HSM */ - li a6, 1 /* SBI_EXT_HSM_HART_STOP */ + li a7, ASM_SBI_EXT_HSM + li a6, ASM_SBI_EXT_HSM_HART_STOP ecall 8: pause j 8b@@ -129,3 +130,94 @@ sbi_susp_resume: call longjmp 6: pause /* unreachable */ j 6b + +.global sse_entry +sse_entry: + /* Save stack temporarily */ + REG_S sp, SBI_SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SBI_SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SBI_SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SBI_SSE_HANDLER(a7) + REG_L a0, SBI_SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecallriscv/sbi-sse.c +1
-1@@ -16,12 +16,12 @@#include <asm/processor.h> #include <asm/sbi.h> #include <asm/setup.h> -#include <asm/sse.h> #include "sbi-tests.h" #define SSE_STACK_SIZE PAGE_SIZE +void sse_entry (void );void check_sse (void );struct sse_event_info {riscv/sbi-tests.h +10
-0@@ -33,4 +33,25 @@#define SBI_SUSP_TEST_HARTID (1 << 2)#define SBI_SUSP_TEST_MASK 7 +#define SBI_SSE_REG_TMP 0 +#define SBI_SSE_HANDLER 8 +#define SBI_SSE_HANDLER_DATA 16 +#define SBI_SSE_HANDLER_STACK 24 + +#ifndef __ASSEMBLY__ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg {
riscv/sbi-tests.h line 55
Quoted 10 lines
riscv/sbi-tests.h +10
-0+unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +}; +_Static_assert (offsetof(struct sse_handler_arg , reg_tmp) ==SBI_SSE_REG_TMP ); +_Static_assert (offsetof(struct sse_handler_arg , handler) ==SBI_SSE_HANDLER ); +_Static_assert (offsetof(struct sse_handler_arg , handler_data) ==SBI_SSE_HANDLER_DATA ); +_Static_assert (offsetof(struct sse_handler_arg , stack) ==SBI_SSE_HANDLER_STACK ); +
I'm not a huge fan but in the end, the result is the same and it suits you ;) Let's go for it, I'll integrate that in the series (minus the HSM stuff).
Thanks !
Cl?ment
Quoted 2 lines
riscv/sbi-tests.h +1
-0+#endif /* !__ASSEMBLY__ */ #endif /* _RISCV_SBI_TESTS_H_ */
Re: [kvm-unit-tests PATCH v3 3/4] riscv: lib: Add SSE assembly entry handling
Quoted 533 lines · Cl?ment L?ger
Quoted 530 lines · Andrew Jones
Quoted 34 lines · Cl?ment L?ger
Add a SSE entry assembly code to handle SSE events. Events should be registered with a struct
sse_handler_argcontaining a correct stack and handler function.Signed-off-by Cl?ment L?ger <[email protected]>--- riscv/Makefile | 1 + lib/riscv/asm/sse.h | 16 +++++++ lib/riscv/sse-entry.S | 100 ++++++++++++++++++++++++++++++++++++++++ lib/riscv/asm-offsets.c | 9 ++++ 4 files changed, 126 insertions(+) create mode 100644 lib/riscv/asm/sse.h create mode 100644 lib/riscv/sse-entry.Sriscv/Makefile +1
-0@@ -41,6 +41,7 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o +cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)lib/riscv/asm/sse.h new file +2
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMRISCV_SSE_H_lib/riscv/asm/sse.h line 12
Quoted 10 lines
lib/riscv/asm/sse.h new file +10
-0+#define _ASMRISCV_SSE_H_ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +};It still feels wrong to put a test-specific struct definition in lib. It's test-specific, because the SSE register function doesn't define it (otherwise we'd put the definition in
lib/riscv/asm/sbi.hwith the rest of the defines that come straight from the spec). Now, if we foresee usingsse_event_register()outside of SBI SSE testing, then it would make sense to come up with a common struct, but it doesn't look like we have plans for that now, andsse_event_register()isn't inlib/riscv/sbi.cyet.Quoted 12 lines
lib/riscv/asm/sse.h new file +4
-0+ +extern void sse_entry (void ); + +#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S new file +2
-0@@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/*lib/riscv/sse-entry.S line 12
Quoted 10 lines
lib/riscv/sse-entry.S new file +10
-0+ * SBI SSE entry code + * + * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> + */ +#include <asm/asm.h> +#include <asm/asm-offsets.h> +#include <asm/csr.h> + +.global sse_entry +sse_entry:
sse_entryis also test-specific unless we exportsse_event_register().Quoted 103 lines
lib/riscv/sse-entry.S new file +88
-0+ /* Save stack temporarily */ + REG_S sp, SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SSE_HANDLER(a7) + REG_L a0, SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecalllib/riscv/asm-offsets.c +2
-0@@ -3,7 +3,9 @@#include <elf.h> #include <asm/processor.h> #include <asm/ptrace.h> +#include <asm/sbi.h> #include <asm/smp.h> +#include <asm/sse.h> int main (void ) {lib/riscv/asm-offsets.c int main(void) · line 71
Quoted 7 lines
lib/riscv/asm-offsets.c +4
-0@@ -63,5 +65,12 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); +OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); +OFFSET (SSE_HANDLER , sse_handler_arg, handler); +OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); +OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack);I think I prefer just hard coding the offsets in defines and then using static asserts to ensure they stay as expected. Below is a diff I applied which moves some stuff around. Let me know what you think.
Thanks,
drewQuoted 8 lines
lib/riscv/asm-offsets.c +3
-0+DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE ); +DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE ); +return 0 ; }Signature · 1 line
2.45.2lib/riscv/asm-offsets.c +2
-5@@ -5,7 +5,6 @@#include <asm/ptrace.h> #include <asm/sbi.h> #include <asm/smp.h> -#include <asm/sse.h> int main (void ) {@@ -65,10 +64,8 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); -OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); -OFFSET (SSE_HANDLER , sse_handler_arg, handler); -OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); -OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack); +DEFINE (ASM_SBI_EXT_HSM ,SBI_EXT_HSM ); +DEFINE (ASM_SBI_EXT_HSM_HART_STOP ,SBI_EXT_HSM_HART_STOP );DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE );DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE );lib/riscv/asm/sse.h deleted +0
-16@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _ASMRISCV_SSE_H_ -#define _ASMRISCV_SSE_H_ - -typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); - -struct sse_handler_arg { -unsigned long reg_tmp; -sse_handler_fn handler; -void *handler_data; -void *stack; -}; - -extern void sse_entry (void ); - -#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S deleted +0
-100@@ -1,100 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * SBI SSE entry code - * - * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> - */ -#include <asm/asm.h> -#include <asm/asm-offsets.h> -#include <asm/csr.h> - -.global sse_entry -sse_entry: - /* Save stack temporarily */ - REG_S sp, SSE_REG_TMP(a7) - /* Set entry stack */ - REG_L sp, SSE_HANDLER_STACK(a7) - - addi sp, sp, -(PT_SIZE) - REG_S ra, PT_RA(sp) - REG_S s0, PT_S0(sp) - REG_S s1, PT_S1(sp) - REG_S s2, PT_S2(sp) - REG_S s3, PT_S3(sp) - REG_S s4, PT_S4(sp) - REG_S s5, PT_S5(sp) - REG_S s6, PT_S6(sp) - REG_S s7, PT_S7(sp) - REG_S s8, PT_S8(sp) - REG_S s9, PT_S9(sp) - REG_S s10, PT_S10(sp) - REG_S s11, PT_S11(sp) - REG_S tp, PT_TP(sp) - REG_S t0, PT_T0(sp) - REG_S t1, PT_T1(sp) - REG_S t2, PT_T2(sp) - REG_S t3, PT_T3(sp) - REG_S t4, PT_T4(sp) - REG_S t5, PT_T5(sp) - REG_S t6, PT_T6(sp) - REG_S gp, PT_GP(sp) - REG_S a0, PT_A0(sp) - REG_S a1, PT_A1(sp) - REG_S a2, PT_A2(sp) - REG_S a3, PT_A3(sp) - REG_S a4, PT_A4(sp) - REG_S a5, PT_A5(sp) - csrr a1, CSR_SEPC - REG_S a1, PT_EPC(sp) - csrr a2, CSR_SSTATUS - REG_S a2, PT_STATUS(sp) - - REG_L a0, SSE_REG_TMP(a7) - REG_S a0, PT_SP(sp) - - REG_L t0, SSE_HANDLER(a7) - REG_L a0, SSE_HANDLER_DATA(a7) - mv a1, sp - mv a2, a6 - jalr t0 - - - REG_L a1, PT_EPC(sp) - REG_L a2, PT_STATUS(sp) - csrw CSR_SEPC, a1 - csrw CSR_SSTATUS, a2 - - REG_L ra, PT_RA(sp) - REG_L s0, PT_S0(sp) - REG_L s1, PT_S1(sp) - REG_L s2, PT_S2(sp) - REG_L s3, PT_S3(sp) - REG_L s4, PT_S4(sp) - REG_L s5, PT_S5(sp) - REG_L s6, PT_S6(sp) - REG_L s7, PT_S7(sp) - REG_L s8, PT_S8(sp) - REG_L s9, PT_S9(sp) - REG_L s10, PT_S10(sp) - REG_L s11, PT_S11(sp) - REG_L tp, PT_TP(sp) - REG_L t0, PT_T0(sp) - REG_L t1, PT_T1(sp) - REG_L t2, PT_T2(sp) - REG_L t3, PT_T3(sp) - REG_L t4, PT_T4(sp) - REG_L t5, PT_T5(sp) - REG_L t6, PT_T6(sp) - REG_L gp, PT_GP(sp) - REG_L a0, PT_A0(sp) - REG_L a1, PT_A1(sp) - REG_L a2, PT_A2(sp) - REG_L a3, PT_A3(sp) - REG_L a4, PT_A4(sp) - REG_L a5, PT_A5(sp) - - REG_L sp, PT_SP(sp) - - li a7, ASM_SBI_EXT_SSE - li a6, ASM_SBI_EXT_SSE_COMPLETE - ecallriscv/Makefile +0
-1@@ -41,7 +41,6 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o -cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)riscv/sbi-asm.S +94
-2@@ -6,6 +6,7 @@ */ #define __ASSEMBLY__ #include <asm/asm.h> +#include <asm/asm-offsets.h> #include <asm/csr.h> #include "sbi-tests.h"@@ -58,8 +59,8 @@ sbi_hsm_check: 7: lb t0, 0(t1) pause beqz t0, 7b - li a7, 0x48534d /* SBI_EXT_HSM */ - li a6, 1 /* SBI_EXT_HSM_HART_STOP */ + li a7, ASM_SBI_EXT_HSM + li a6, ASM_SBI_EXT_HSM_HART_STOP ecall 8: pause j 8b@@ -129,3 +130,94 @@ sbi_susp_resume: call longjmp 6: pause /* unreachable */ j 6b + +.global sse_entry +sse_entry: + /* Save stack temporarily */ + REG_S sp, SBI_SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SBI_SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SBI_SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SBI_SSE_HANDLER(a7) + REG_L a0, SBI_SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecallriscv/sbi-sse.c +1
-1@@ -16,12 +16,12 @@#include <asm/processor.h> #include <asm/sbi.h> #include <asm/setup.h> -#include <asm/sse.h> #include "sbi-tests.h" #define SSE_STACK_SIZE PAGE_SIZE +void sse_entry (void );void check_sse (void );struct sse_event_info {riscv/sbi-tests.h +15
-0@@ -33,4 +33,25 @@#define SBI_SUSP_TEST_HARTID (1 << 2)#define SBI_SUSP_TEST_MASK 7 +#define SBI_SSE_REG_TMP 0 +#define SBI_SSE_HANDLER 8 +#define SBI_SSE_HANDLER_DATA 16 +#define SBI_SSE_HANDLER_STACK 24 + +#ifndef __ASSEMBLY__ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +};
Quoted 8 lines
riscv/sbi-tests.h line 55
Quoted 5 lines
riscv/sbi-tests.h +5
-0+_Static_assert (offsetof(struct sse_handler_arg , reg_tmp) ==SBI_SSE_REG_TMP ); +_Static_assert (offsetof(struct sse_handler_arg , handler) ==SBI_SSE_HANDLER ); +_Static_assert (offsetof(struct sse_handler_arg , handler_data) ==SBI_SSE_HANDLER_DATA ); +_Static_assert (offsetof(struct sse_handler_arg , stack) ==SBI_SSE_HANDLER_STACK ); +I'm not a huge fan but in the end, the result is the same and it suits you ;)
Ideally we'd have asm-offsets for test code so we don't have to choose between hard coding offsets and putting code in the library that doesn't belong there. I'm OK with deferring that work, though, by choosing hard coded offsets which we can check at compile time.
Quoted 2 lines
Let's go for it, I'll integrate that in the series (minus the HSM stuff).
I wouldn't complain if the HSM defines got slipped in with a "while at it change the HSM defines to ones provided by asm-offsets" type of comment in the commit message, but I can also add a patch on top which does that change myself.
Thanks,
drew
Re: [kvm-unit-tests PATCH v3 3/4] riscv: lib: Add SSE assembly entry handling
Quoted 543 lines · Andrew Jones
Quoted 533 lines · Cl?ment L?ger
Quoted 530 lines · Andrew Jones
Quoted 34 lines · Cl?ment L?ger
Add a SSE entry assembly code to handle SSE events. Events should be registered with a struct
sse_handler_argcontaining a correct stack and handler function.Signed-off-by Cl?ment L?ger <[email protected]>--- riscv/Makefile | 1 + lib/riscv/asm/sse.h | 16 +++++++ lib/riscv/sse-entry.S | 100 ++++++++++++++++++++++++++++++++++++++++ lib/riscv/asm-offsets.c | 9 ++++ 4 files changed, 126 insertions(+) create mode 100644 lib/riscv/asm/sse.h create mode 100644 lib/riscv/sse-entry.Sriscv/Makefile +1
-0@@ -41,6 +41,7 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o +cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)lib/riscv/asm/sse.h new file +2
-0@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASMRISCV_SSE_H_lib/riscv/asm/sse.h line 12
Quoted 10 lines
lib/riscv/asm/sse.h new file +10
-0+#define _ASMRISCV_SSE_H_ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +};It still feels wrong to put a test-specific struct definition in lib. It's test-specific, because the SSE register function doesn't define it (otherwise we'd put the definition in
lib/riscv/asm/sbi.hwith the rest of the defines that come straight from the spec). Now, if we foresee usingsse_event_register()outside of SBI SSE testing, then it would make sense to come up with a common struct, but it doesn't look like we have plans for that now, andsse_event_register()isn't inlib/riscv/sbi.cyet.Quoted 12 lines
lib/riscv/asm/sse.h new file +4
-0+ +extern void sse_entry (void ); + +#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S new file +2
-0@@ -0,0 +1,100 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/*lib/riscv/sse-entry.S line 12
Quoted 10 lines
lib/riscv/sse-entry.S new file +10
-0+ * SBI SSE entry code + * + * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> + */ +#include <asm/asm.h> +#include <asm/asm-offsets.h> +#include <asm/csr.h> + +.global sse_entry +sse_entry:
sse_entryis also test-specific unless we exportsse_event_register().Quoted 103 lines
lib/riscv/sse-entry.S new file +88
-0+ /* Save stack temporarily */ + REG_S sp, SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SSE_HANDLER(a7) + REG_L a0, SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecalllib/riscv/asm-offsets.c +2
-0@@ -3,7 +3,9 @@#include <elf.h> #include <asm/processor.h> #include <asm/ptrace.h> +#include <asm/sbi.h> #include <asm/smp.h> +#include <asm/sse.h> int main (void ) {lib/riscv/asm-offsets.c int main(void) · line 71
Quoted 7 lines
lib/riscv/asm-offsets.c +4
-0@@ -63,5 +65,12 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); +OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); +OFFSET (SSE_HANDLER , sse_handler_arg, handler); +OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); +OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack);I think I prefer just hard coding the offsets in defines and then using static asserts to ensure they stay as expected. Below is a diff I applied which moves some stuff around. Let me know what you think.
Thanks,
drewQuoted 8 lines
lib/riscv/asm-offsets.c +3
-0+DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE ); +DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE ); +return 0 ; }Signature · 1 line
2.45.2lib/riscv/asm-offsets.c +2
-5@@ -5,7 +5,6 @@#include <asm/ptrace.h> #include <asm/sbi.h> #include <asm/smp.h> -#include <asm/sse.h> int main (void ) {@@ -65,10 +64,8 @@ int main(void)OFFSET (THREAD_INFO_HARTID , thread_info, hartid);DEFINE (THREAD_INFO_SIZE ,sizeof (struct thread_info )); -OFFSET (SSE_REG_TMP , sse_handler_arg, reg_tmp); -OFFSET (SSE_HANDLER , sse_handler_arg, handler); -OFFSET (SSE_HANDLER_DATA , sse_handler_arg, handler_data); -OFFSET (SSE_HANDLER_STACK , sse_handler_arg, stack); +DEFINE (ASM_SBI_EXT_HSM ,SBI_EXT_HSM ); +DEFINE (ASM_SBI_EXT_HSM_HART_STOP ,SBI_EXT_HSM_HART_STOP );DEFINE (ASM_SBI_EXT_SSE ,SBI_EXT_SSE );DEFINE (ASM_SBI_EXT_SSE_COMPLETE ,SBI_EXT_SSE_COMPLETE );lib/riscv/asm/sse.h deleted +0
-16@@ -1,16 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -#ifndef _ASMRISCV_SSE_H_ -#define _ASMRISCV_SSE_H_ - -typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); - -struct sse_handler_arg { -unsigned long reg_tmp; -sse_handler_fn handler; -void *handler_data; -void *stack; -}; - -extern void sse_entry (void ); - -#endif /* _ASMRISCV_SSE_H_ */ lib/riscv/sse-entry.S deleted +0
-100@@ -1,100 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * SBI SSE entry code - * - * Copyright (C) 2024, Rivos Inc., Cl?ment L?ger <[email protected]> - */ -#include <asm/asm.h> -#include <asm/asm-offsets.h> -#include <asm/csr.h> - -.global sse_entry -sse_entry: - /* Save stack temporarily */ - REG_S sp, SSE_REG_TMP(a7) - /* Set entry stack */ - REG_L sp, SSE_HANDLER_STACK(a7) - - addi sp, sp, -(PT_SIZE) - REG_S ra, PT_RA(sp) - REG_S s0, PT_S0(sp) - REG_S s1, PT_S1(sp) - REG_S s2, PT_S2(sp) - REG_S s3, PT_S3(sp) - REG_S s4, PT_S4(sp) - REG_S s5, PT_S5(sp) - REG_S s6, PT_S6(sp) - REG_S s7, PT_S7(sp) - REG_S s8, PT_S8(sp) - REG_S s9, PT_S9(sp) - REG_S s10, PT_S10(sp) - REG_S s11, PT_S11(sp) - REG_S tp, PT_TP(sp) - REG_S t0, PT_T0(sp) - REG_S t1, PT_T1(sp) - REG_S t2, PT_T2(sp) - REG_S t3, PT_T3(sp) - REG_S t4, PT_T4(sp) - REG_S t5, PT_T5(sp) - REG_S t6, PT_T6(sp) - REG_S gp, PT_GP(sp) - REG_S a0, PT_A0(sp) - REG_S a1, PT_A1(sp) - REG_S a2, PT_A2(sp) - REG_S a3, PT_A3(sp) - REG_S a4, PT_A4(sp) - REG_S a5, PT_A5(sp) - csrr a1, CSR_SEPC - REG_S a1, PT_EPC(sp) - csrr a2, CSR_SSTATUS - REG_S a2, PT_STATUS(sp) - - REG_L a0, SSE_REG_TMP(a7) - REG_S a0, PT_SP(sp) - - REG_L t0, SSE_HANDLER(a7) - REG_L a0, SSE_HANDLER_DATA(a7) - mv a1, sp - mv a2, a6 - jalr t0 - - - REG_L a1, PT_EPC(sp) - REG_L a2, PT_STATUS(sp) - csrw CSR_SEPC, a1 - csrw CSR_SSTATUS, a2 - - REG_L ra, PT_RA(sp) - REG_L s0, PT_S0(sp) - REG_L s1, PT_S1(sp) - REG_L s2, PT_S2(sp) - REG_L s3, PT_S3(sp) - REG_L s4, PT_S4(sp) - REG_L s5, PT_S5(sp) - REG_L s6, PT_S6(sp) - REG_L s7, PT_S7(sp) - REG_L s8, PT_S8(sp) - REG_L s9, PT_S9(sp) - REG_L s10, PT_S10(sp) - REG_L s11, PT_S11(sp) - REG_L tp, PT_TP(sp) - REG_L t0, PT_T0(sp) - REG_L t1, PT_T1(sp) - REG_L t2, PT_T2(sp) - REG_L t3, PT_T3(sp) - REG_L t4, PT_T4(sp) - REG_L t5, PT_T5(sp) - REG_L t6, PT_T6(sp) - REG_L gp, PT_GP(sp) - REG_L a0, PT_A0(sp) - REG_L a1, PT_A1(sp) - REG_L a2, PT_A2(sp) - REG_L a3, PT_A3(sp) - REG_L a4, PT_A4(sp) - REG_L a5, PT_A5(sp) - - REG_L sp, PT_SP(sp) - - li a7, ASM_SBI_EXT_SSE - li a6, ASM_SBI_EXT_SSE_COMPLETE - ecallriscv/Makefile +0
-1@@ -41,7 +41,6 @@ cflatobjs += lib/riscv/sbi.o cflatobjs += lib/riscv/setjmp.o cflatobjs += lib/riscv/setup.o cflatobjs += lib/riscv/smp.o -cflatobjs += lib/riscv/sse-entry.o cflatobjs += lib/riscv/stack.o cflatobjs += lib/riscv/timer.o ifeq ($(ARCH),riscv32)riscv/sbi-asm.S +94
-2@@ -6,6 +6,7 @@ */ #define __ASSEMBLY__ #include <asm/asm.h> +#include <asm/asm-offsets.h> #include <asm/csr.h> #include "sbi-tests.h"@@ -58,8 +59,8 @@ sbi_hsm_check: 7: lb t0, 0(t1) pause beqz t0, 7b - li a7, 0x48534d /* SBI_EXT_HSM */ - li a6, 1 /* SBI_EXT_HSM_HART_STOP */ + li a7, ASM_SBI_EXT_HSM + li a6, ASM_SBI_EXT_HSM_HART_STOP ecall 8: pause j 8b@@ -129,3 +130,94 @@ sbi_susp_resume: call longjmp 6: pause /* unreachable */ j 6b + +.global sse_entry +sse_entry: + /* Save stack temporarily */ + REG_S sp, SBI_SSE_REG_TMP(a7) + /* Set entry stack */ + REG_L sp, SBI_SSE_HANDLER_STACK(a7) + + addi sp, sp, -(PT_SIZE) + REG_S ra, PT_RA(sp) + REG_S s0, PT_S0(sp) + REG_S s1, PT_S1(sp) + REG_S s2, PT_S2(sp) + REG_S s3, PT_S3(sp) + REG_S s4, PT_S4(sp) + REG_S s5, PT_S5(sp) + REG_S s6, PT_S6(sp) + REG_S s7, PT_S7(sp) + REG_S s8, PT_S8(sp) + REG_S s9, PT_S9(sp) + REG_S s10, PT_S10(sp) + REG_S s11, PT_S11(sp) + REG_S tp, PT_TP(sp) + REG_S t0, PT_T0(sp) + REG_S t1, PT_T1(sp) + REG_S t2, PT_T2(sp) + REG_S t3, PT_T3(sp) + REG_S t4, PT_T4(sp) + REG_S t5, PT_T5(sp) + REG_S t6, PT_T6(sp) + REG_S gp, PT_GP(sp) + REG_S a0, PT_A0(sp) + REG_S a1, PT_A1(sp) + REG_S a2, PT_A2(sp) + REG_S a3, PT_A3(sp) + REG_S a4, PT_A4(sp) + REG_S a5, PT_A5(sp) + csrr a1, CSR_SEPC + REG_S a1, PT_EPC(sp) + csrr a2, CSR_SSTATUS + REG_S a2, PT_STATUS(sp) + + REG_L a0, SBI_SSE_REG_TMP(a7) + REG_S a0, PT_SP(sp) + + REG_L t0, SBI_SSE_HANDLER(a7) + REG_L a0, SBI_SSE_HANDLER_DATA(a7) + mv a1, sp + mv a2, a6 + jalr t0 + + + REG_L a1, PT_EPC(sp) + REG_L a2, PT_STATUS(sp) + csrw CSR_SEPC, a1 + csrw CSR_SSTATUS, a2 + + REG_L ra, PT_RA(sp) + REG_L s0, PT_S0(sp) + REG_L s1, PT_S1(sp) + REG_L s2, PT_S2(sp) + REG_L s3, PT_S3(sp) + REG_L s4, PT_S4(sp) + REG_L s5, PT_S5(sp) + REG_L s6, PT_S6(sp) + REG_L s7, PT_S7(sp) + REG_L s8, PT_S8(sp) + REG_L s9, PT_S9(sp) + REG_L s10, PT_S10(sp) + REG_L s11, PT_S11(sp) + REG_L tp, PT_TP(sp) + REG_L t0, PT_T0(sp) + REG_L t1, PT_T1(sp) + REG_L t2, PT_T2(sp) + REG_L t3, PT_T3(sp) + REG_L t4, PT_T4(sp) + REG_L t5, PT_T5(sp) + REG_L t6, PT_T6(sp) + REG_L gp, PT_GP(sp) + REG_L a0, PT_A0(sp) + REG_L a1, PT_A1(sp) + REG_L a2, PT_A2(sp) + REG_L a3, PT_A3(sp) + REG_L a4, PT_A4(sp) + REG_L a5, PT_A5(sp) + + REG_L sp, PT_SP(sp) + + li a7, ASM_SBI_EXT_SSE + li a6, ASM_SBI_EXT_SSE_COMPLETE + ecallriscv/sbi-sse.c +1
-1@@ -16,12 +16,12 @@#include <asm/processor.h> #include <asm/sbi.h> #include <asm/setup.h> -#include <asm/sse.h> #include "sbi-tests.h" #define SSE_STACK_SIZE PAGE_SIZE +void sse_entry (void );void check_sse (void );struct sse_event_info {riscv/sbi-tests.h +15
-0@@ -33,4 +33,25 @@#define SBI_SUSP_TEST_HARTID (1 << 2)#define SBI_SUSP_TEST_MASK 7 +#define SBI_SSE_REG_TMP 0 +#define SBI_SSE_HANDLER 8 +#define SBI_SSE_HANDLER_DATA 16 +#define SBI_SSE_HANDLER_STACK 24 + +#ifndef __ASSEMBLY__ + +typedef void (*sse_handler_fn )(void *data,struct pt_regs *regs,unsigned int hartid); + +struct sse_handler_arg { +unsigned long reg_tmp; +sse_handler_fn handler; +void *handler_data; +void *stack; +};Quoted 8 lines
riscv/sbi-tests.h line 55
Quoted 5 lines
riscv/sbi-tests.h +5
-0+_Static_assert (offsetof(struct sse_handler_arg , reg_tmp) ==SBI_SSE_REG_TMP ); +_Static_assert (offsetof(struct sse_handler_arg , handler) ==SBI_SSE_HANDLER ); +_Static_assert (offsetof(struct sse_handler_arg , handler_data) ==SBI_SSE_HANDLER_DATA ); +_Static_assert (offsetof(struct sse_handler_arg , stack) ==SBI_SSE_HANDLER_STACK ); +I'm not a huge fan but in the end, the result is the same and it suits you ;)
Quoted 4 lines
Ideally we'd have asm-offsets for test code so we don't have to choose between hard coding offsets and putting code in the library that doesn't belong there. I'm OK with deferring that work, though, by choosing hard coded offsets which we can check at compile time.
yeah, I took a look a asm-offset generation but it seems pretty hardcoded for a signle asm-offsets.c file yet. Probably require much more work to have multiples files but i'll take a look. In the meantime, it makes sense to move that in riscv/ as you say. That per test asm-offsets can be added later.
Quoted 8 lines
Quoted 3 lines
Let's go for it, I'll integrate that in the series (minus the HSM stuff).
I wouldn't complain if the HSM defines got slipped in with a "while at it change the HSM defines to ones provided by asm-offsets" type of comment in the commit message, but I can also add a patch on top which does that change myself.
No worries then, I'll add that !
Quoted 3 lines
Thanks,
drew
PATCH v3 4/4 riscv: sbi: Add SSE extension tests
In reply to Clément LégerAdd SBI SSE extension tests for the following features:
- Test attributes errors (invalid values, RO, etc)
- Registration errors
- Simple events (register, enable, inject)
- Events with different priorities
- Global events dispatch on different harts
- Local events on all harts
--- riscv/Makefile | 2 +- lib/riscv/asm/csr.h | 2 + riscv/sbi-sse.c | 1043 +++++++++++++++++++++++++++++++++++++++++++ riscv/sbi.c | 3 + 4 files changed, 1049 insertions(+), 1 deletion(-) create mode 100644 riscv/sbi-sse.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-sse.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/csr.h +2 -0
@@ -21,6 +21,8 @@/* Exception cause high bit - is an interrupt if set */ #define CAUSE_IRQ_FLAG (_AC(1, UL) << (__riscv_xlen - 1)) +#define SSTATUS_SPP _AC(0x00000100, UL)/* Previously Supervisor */ +/* Exception causes */ #define EXC_INST_MISALIGNED 0#define EXC_INST_ACCESS 1
riscv/sbi-sse.c new file +1043 -0
1,043 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_sse (void ); +static long __labs (long a) { return __builtin_labs@;
@@ -1451,6 +1453,7 @@ int main(int argc, char **argv)check_hsm ();check_dbcn ();check_susp (); +check_sse ();return report_summary (); }
Signature · 1 line
2.45.2
Re: [kvm-unit-tests PATCH v3 4/4] riscv: sbi: Add SSE extension tests
Quoted 7 lines · Cl?ment L?ger
Add SBI SSE extension tests for the following features:
- Test attributes errors (invalid values, RO, etc)
- Registration errors
- Simple events (register, enable, inject)
- Events with different priorities
- Global events dispatch on different harts
- Local events on all harts
And now also double trap and mask/unmask.
Thanks,
drew
Re: [kvm-unit-tests PATCH v3 4/4] riscv: sbi: Add SSE extension tests
Quoted 10 lines · Andrew Jones
Quoted 7 lines · Cl?ment L?ger
Add SBI SSE extension tests for the following features:
- Test attributes errors (invalid values, RO, etc)
- Registration errors
- Simple events (register, enable, inject)
- Events with different priorities
- Global events dispatch on different harts
- Local events on all hartsAnd now also double trap and mask/unmask.
Hi drew,
It does not really tests double trap though, only the double trap SSE event (similar to the RAS one or whatever SSE local event). I'll update it with mask/unmask at least.
Cl?ment
Quoted 3 lines
Thanks,
drew