| Message ID | 20240418142701.1493091-1-cleger@rivosinc.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | riscv: Add support for Ssdbltrp extension | expand |
On Thu, Apr 18, 2024 at 04:26:39PM +0200, Clément Léger wrote: > drivers/firmware/Kconfig | 7 + > drivers/firmware/Makefile | 1 + > drivers/firmware/riscv_dbltrp.c | 95 ++++++++++ From what we discussed with Arnd back when we started routing the dts and soc driver stuff via the soc tree, riscv stuff in drivers/firmware supposedly also falls under my remit, and gets merged via the soc tree, although I would expect that this and the initial SSE support series would go via the riscv tree since they touch a lot more than just drivers/firmware. Could you create a drivers/firmware/riscv directory for this dbltrp file and whichever of this or the SSE patch that lands first add a maintainers entry for drivers/firmware/riscv that links to my git tree? It probably also makes sense to create per-driver entries for each of the dbltrp and sse drivers that ensures you get CCed on any patches for them.
On 23/04/2024 18:24, Conor Dooley wrote: > On Thu, Apr 18, 2024 at 04:26:39PM +0200, Clément Léger wrote: > >> drivers/firmware/Kconfig | 7 + >> drivers/firmware/Makefile | 1 + >> drivers/firmware/riscv_dbltrp.c | 95 ++++++++++ > > From what we discussed with Arnd back when we started routing the dts > and soc driver stuff via the soc tree, riscv stuff in drivers/firmware > supposedly also falls under my remit, and gets merged via the soc tree, > although I would expect that this and the initial SSE support series > would go via the riscv tree since they touch a lot more than just > drivers/firmware. Yes indeed. > > Could you create a drivers/firmware/riscv directory for this dbltrp file > and whichever of this or the SSE patch that lands first add a maintainers > entry for drivers/firmware/riscv that links to my git tree? Yes sure, I'll modify this one as well as the SSE series. > It probably also makes sense to create per-driver entries for each of > the dbltrp and sse drivers that ensures you get CCed on any patches > for them. > Indeed, missed that. Thanks, Clément
A double trap typically arises during a sensitive phase in trap handling operations — when an exception or interrupt occurs while the trap handler (the component responsible for managing these events) is in a non-reentrant state. This non-reentrancy usually occurs in the early phase of trap handling, wherein the trap handler has not yet preserved the necessary state to handle and resume from the trap. The occurrence of such event is unlikely but can happen when dealing with hardware errors. This series adds support for Ssdbltrp[1]. It is based on SSE support as well as firmware feature to enable double trap. Ssdbltrp can be tested using qemu[1], opensbi[2], linux[3] and kvm-unit-tests[5]. Assuming you have a riscv environment available and configured (CROSS_COMPILE), it can be built for riscv64 using the following instructions: Qemu: $ git clone https://github.com/rivosinc/qemu.git $ cd qemu $ git switch dev/cleger/dbltrp_rfc_v1 $ mkdir build && cd build $ ../configure --target-list=riscv64-softmmu $ make OpenSBI: $ git clone https://github.com/rivosinc/opensbi.git $ cd opensbi $ git switch dev/cleger/dbltrp_rfc_v1 $ make O=build PLATFORM_RISCV_XLEN=64 PLATFORM=generic Linux: $ git clone https://github.com/rivosinc/linux.git $ cd linux $ git switch dev/cleger/dbltrp_rfc_v1 $ export ARCH=riscv $ make O=build defconfig $ ./script/config --file build/.config --enable RISCV_DBLTRP $ make O=build kvm-unit-tests: $ git clone https://github.com/clementleger/kvm-unit-tests.git $ cd kvm-unit-tests $ git switch dev/cleger/dbltrp_rfc_v1 $ ./configure --arch=riscv64 --cross-prefix=$CROSS_COMPILE $ make You will also need kvmtool in your rootfs. One can build a buildroot rootfs using the buildroot provided at [6] (which contains an update of kvmtool with riscv support). Run with kvm-unit-test test as kernel: $ qemu-system-riscv64 \ -M virt \ -cpu rv64,x-ssdbltrp=true,x-smdbltrp=true \ -nographic \ -serial mon:stdio \ -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ -kernel kvm-unit-tests-dbltrp/riscv/sbi_dbltrp.flat ... [OpenSBI boot partially elided] Boot HART ISA Extensions : sscofpmf,sstc,zicntr,zihpm,zicboz,zicbom,sdtrig,svadu,ssdbltrp ... ########################################################################## # kvm-unit-tests ########################################################################## PASS: sbi: fwft: FWFT extension probing no error PASS: sbi: fwft: FWFT extension is present PASS: sbi: fwft: dbltrp: Get double trap enable feature value PASS: sbi: fwft: dbltrp: Set double trap enable feature value == 0 PASS: sbi: fwft: dbltrp: Get double trap enable feature value == 0 PASS: sbi: fwft: dbltrp: Double trap disabled, trap first time ok PASS: sbi: fwft: dbltrp: Set double trap enable feature value == 1 PASS: sbi: fwft: dbltrp: Get double trap enable feature value == 1 PASS: sbi: fwft: dbltrp: Trapped twice allowed ok INFO: sbi: fwft: dbltrp: Should generate a double trap and crash ! sbi_trap_error: hart0: trap0: double trap handler failed (error -10) sbi_trap_error: hart0: trap0: mcause=0x0000000000000010 mtval=0x0000000000000000 sbi_trap_error: hart0: trap0: mtval2=0x0000000000000003 mtinst=0x0000000000000000 sbi_trap_error: hart0: trap0: mepc=0x00000000802000d8 mstatus=0x8000000a01006900 sbi_trap_error: hart0: trap0: ra=0x00000000802001fc sp=0x0000000080213e70 sbi_trap_error: hart0: trap0: gp=0x0000000000000000 tp=0x0000000080088000 sbi_trap_error: hart0: trap0: s0=0x0000000080213e80 s1=0x0000000000000001 sbi_trap_error: hart0: trap0: a0=0x0000000080213e80 a1=0x0000000080208193 sbi_trap_error: hart0: trap0: a2=0x000000008020dc20 a3=0x000000000000000f sbi_trap_error: hart0: trap0: a4=0x0000000080210cd8 a5=0x00000000802110d0 sbi_trap_error: hart0: trap0: a6=0x00000000802136e4 a7=0x0000000046574654 sbi_trap_error: hart0: trap0: s2=0x0000000080210cd9 s3=0x0000000000000000 sbi_trap_error: hart0: trap0: s4=0x0000000000000000 s5=0x0000000000000000 sbi_trap_error: hart0: trap0: s6=0x0000000000000000 s7=0x0000000000000001 sbi_trap_error: hart0: trap0: s8=0x0000000000002000 s9=0x0000000080083700 sbi_trap_error: hart0: trap0: s10=0x0000000000000000 s11=0x0000000000000000 sbi_trap_error: hart0: trap0: t0=0x0000000000000000 t1=0x0000000080213ed8 sbi_trap_error: hart0: trap0: t2=0x0000000000001000 t3=0x0000000080213ee0 sbi_trap_error: hart0: trap0: t4=0x0000000000000000 t5=0x000000008020f8d0 sbi_trap_error: hart0: trap0: t6=0x0000000000000000 Run with linux and kvm-unit-test test in kvm (testing VS-mode): $ qemu-system-riscv64 \ -M virt \ -cpu rv64,x-ssdbltrp=true,x-smdbltrp=true \ -nographic \ -serial mon:stdio \ -bios opensbi/build/platform/generic/firmware/fw_jump.bin \ -kernel linux/build/arch/riscv/boot/Image ... [Linux boot partially elided] [ 0.735079] riscv-dbltrp: Double trap handling registered ... $ lkvm run -k sbi_dbltrp.flat -m 128 -c 2 ########################################################################## # kvm-unit-tests ########################################################################## PASS: sbi: fwft: FWFT extension probing no error PASS: sbi: fwft: FWFT extension is present PASS: sbi: fwft: dbltrp: Get double trap enable feature value PASS: sbi: fwft: dbltrp: Set double trap enable feature value == 0 PASS: sbi: fwft: dbltrp: Get double trap enable feature value == 0 PASS: sbi: fwft: dbltrp: Double trap disabled, trap first time ok PASS: sbi: fwft: dbltrp: Set double trap enable feature value == 1 PASS: sbi: fwft: dbltrp: Get double trap enable feature value == 1 PASS: sbi: fwft: dbltrp: Trapped twice allowed ok INFO: sbi: fwft: dbltrp: Should generate a double trap and crash ! [ 51.939077] Guest double trap [ 51.939323] kvm [93]: VCPU exit error -95 [ 51.939683] kvm [93]: SEPC=0x802000d8 SSTATUS=0x200004520 HSTATUS=0x200200180 [ 51.939947] kvm [93]: SCAUSE=0x10 STVAL=0x0 HTVAL=0x3 HTINST=0x0 KVM_RUN failed: Operation not supported $ Link: https://github.com/riscv/riscv-double-trap/releases/download/v0.56/riscv-double-trap.pdf [1] Link: https://github.com/rivosinc/qemu/tree/dev/cleger/dbltrp_rfc_v1 [2] Link: https://github.com/rivosinc/opensbi/tree/dev/cleger/dbltrp_rfc_v1 [3] Link: https://github.com/rivosinc/linux/tree/dev/cleger/dbltrp_rfc_v1 [4] Link: https://github.com/clementleger/kvm-unit-tests/tree/dev/cleger/dbltrp_rfc_v1 [5] Link: https://github.com/clementleger/buildroot/tree/dev/cleger/kvmtool [6] --- Clément Léger (7): riscv: kvm: add support for FWFT SBI extension dt-bindings: riscv: add Ssdbltrp ISA extension description riscv: add Ssdbltrp ISA extension parsing riscv: handle Ssdbltrp mstatus SDT bit riscv: add double trap driver riscv: kvm: add SBI FWFT support for SBI_FWFT_DOUBLE_TRAP_ENABLE RISC-V: KVM: add support for double trap exception .../devicetree/bindings/riscv/extensions.yaml | 6 + arch/riscv/include/asm/csr.h | 3 + arch/riscv/include/asm/hwcap.h | 1 + arch/riscv/include/asm/kvm_host.h | 12 +- arch/riscv/include/asm/kvm_vcpu_sbi.h | 1 + arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h | 37 ++++ arch/riscv/include/asm/sbi.h | 1 + arch/riscv/include/uapi/asm/kvm.h | 2 + arch/riscv/kernel/cpufeature.c | 1 + arch/riscv/kernel/entry.S | 52 ++--- arch/riscv/kernel/head.S | 4 + arch/riscv/kernel/sse_entry.S | 4 +- arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/vcpu.c | 28 +-- arch/riscv/kvm/vcpu_exit.c | 33 +++- arch/riscv/kvm/vcpu_insn.c | 15 +- arch/riscv/kvm/vcpu_onereg.c | 2 + arch/riscv/kvm/vcpu_sbi.c | 8 +- arch/riscv/kvm/vcpu_sbi_fwft.c | 177 ++++++++++++++++++ arch/riscv/kvm/vcpu_switch.S | 19 +- drivers/firmware/Kconfig | 7 + drivers/firmware/Makefile | 1 + drivers/firmware/riscv_dbltrp.c | 95 ++++++++++ include/linux/riscv_dbltrp.h | 19 ++ 24 files changed, 466 insertions(+), 63 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_vcpu_sbi_fwft.h create mode 100644 arch/riscv/kvm/vcpu_sbi_fwft.c create mode 100644 drivers/firmware/riscv_dbltrp.c create mode 100644 include/linux/riscv_dbltrp.h