Skip to content

Add RISC-V Hypervisor Extension v0.4

Alistair Francis qemu-devel qemu-riscv 2 versions – New

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest27 patches 0 repliesNew
  2. v128 patches 46 repliesSuperseded

Changes in v2 from the cover letter

- Rebase on for-master
- Consolidate patches requested by Palmer
- Other updates based on feedback

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/27target/riscv: Don't set write permissions on dirty PTEstarget/riscv/cpu_helper.c+2 -40 replies
2/27target/riscv: Add the Hypervisor extensiontarget/riscv/cpu.h+1 -00 replies
3/27target/riscv: Add the virtulisation modetarget/riscv/cpu.h target/riscv/cpu_bits.h target/riscv/cpu_helper.c+25 -00 replies
4/27target/riscv: Add the force HS exception modetarget/riscv/cpu.h target/riscv/cpu_bits.h target/riscv/cpu_helper.c+26 -00 replies
5/27target/riscv: Fix CSR perm checking for HS modetarget/riscv/csr.c+14 -40 replies
6/27target/riscv: Add the Hypervisor CSRs to CPUStatetarget/riscv/cpu.h+17 -00 replies
7/27target/riscv: Print priv and virt in disas logtarget/riscv/translate.c+8 -00 replies
8/27target/riscv: Dump Hypervisor registers if enabledtarget/riscv/cpu.c+34 -00 replies
9/27target/riscv: Add Hypervisor CSR access functionstarget/riscv/csr.c+68 -00 replies
10/27target/riscv: Add Hypervisor virtual CSRs accessestarget/riscv/cpu_bits.h target/riscv/csr.c+130 -00 replies
11/27target/riscv: Convert mie and mstatus to pointerstarget/riscv/cpu.c target/riscv/cpu.h target/riscv/cpu_helper.c +2 more+59 -430 replies
12/27target/riscv: Add virtual register swapping functiontarget/riscv/cpu.h target/riscv/cpu_bits.h target/riscv/cpu_helper.c+107 -10 replies
13/27target/riscv: Add support for virtual interrupt settingtarget/riscv/cpu_helper.c+17 -20 replies
14/27target/ricsv: Flush the TLB on virtulisation mode changestarget/riscv/cpu_helper.c+5 -00 replies
15/27target/riscv: Generate illegal instruction on WFI when V=1target/riscv/op_helper.c+3 -20 replies
16/27riscv: plic: Always set sip.SEIP bit for HShw/riscv/sifive_plic.c+11 -10 replies
17/27target/riscv: Add hypvervisor trap supporttarget/riscv/cpu_bits.h target/riscv/cpu_helper.c target/riscv/csr.c+65 -140 replies
18/27target/riscv: Add Hypervisor trap return supporttarget/riscv/op_helper.c+54 -120 replies
19/27target/riscv: Add hfence instructionstarget/riscv/insn32.decode target/riscv/insn_trans/trans_privileged.inc.c+54 -90 replies
20/27target/riscv: Disable guest FP support based on virtual statustarget/riscv/cpu_helper.c+3 -00 replies
21/27target/riscv: Mark both sstatus and vsstatus as dirtytarget/riscv/translate.c+12 -00 replies
22/27target/riscv: Respect MPRV and SPRV for floating point opstarget/riscv/translate.c+15 -10 replies
23/27target/riscv: Allow specifying MMU stagetarget/riscv/cpu_helper.c+30 -90 replies
24/27target/riscv: Implement second stage MMUtarget/riscv/cpu_helper.c+174 -190 replies
25/27target/riscv: Add support for the 32-bit MSTATUSH CSRtarget/riscv/cpu.c target/riscv/cpu.h target/riscv/cpu_bits.h +3 more+52 -00 replies
26/27target/riscv: Add the MSTATUS_MPV_ISSET helper macrotarget/riscv/cpu_bits.h target/riscv/cpu_helper.c target/riscv/op_helper.c +1 more+15 -40 replies
27/27target/riscv: Allow enabling the Hypervisor extensiontarget/riscv/cpu.c target/riscv/cpu.h+6 -00 replies

Reviews trailers per patch

17 of 27 patches have a Reviewed-by or Acked-by.

PatchBin MengChih-Min ChaoPalmer Dabbelt
1/27R-b
2/27R-b R-b
3/27
4/27
5/27
6/27R-b R-b
7/27R-b
8/27R-b
9/27R-b
10/27R-b
11/27R-b
12/27
13/27R-b
14/27R-b
15/27R-b
16/27
17/27R-b
18/27R-b
19/27R-b
20/27R-b
21/27R-b
22/27
23/27
24/27
25/27
26/27
27/27R-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v2 thread

Cover letter [PATCH v2 00/27] Add RISC-V Hypervisor Extension v0.4

This patch series adds the RISC-V Hypervisor extension v0.4. This is the latest draft spec of the Hypervisor extension.

The Hypervisor extension is disabled by default, so this series should result in no changes to anyone using QEMU unless they enable the extension. The extention can be enabled with the -cpu property (see below).

At the moment the spec does not include information about the mstatush register. Although this information has since been merged into the master spec. As it is only adding support for 32-bit I have added this register to this series.

Testing of this implementation has been done by using the baremetal Xvisor Hypervisor. We are able to run two Linux guests (that's all I have tried) as guests in 64-bit. In 32-bit so far I can only run baremetal guests, but I think this is a baremetal boot loader issue and not an issue in QEMU.

The RISC-V KVM implementation was also written using these patches. The KVM implementation is currently under review.

These patches result in a reproducable race when booting a SMP Linux guest inside a SMP Linux KVM host. This will need to be fixed.

At the moment this spec is in a draft state and is subject to change. As QEMU is extreamly useful in early bring up I think it makes sense for QEMU to support non-frozen extensions.

Thanks to Anup for doing the initial port of Xvisor. The port is avaliable here:
https://github.com/avpatel/xvisor-next and will run on QEMU.

Also thanks to Atish for implementing the SBI call support in Xvisor and for lots of help debugging.

To run this yourself:
1. Apply this patch series to QEMU. The latest branch can be found here:
https://github.com/alistair23/qemu/tree/mainline/alistair/riscv-hyp-ext-v0.4.next
2. Get the version of OpenSBI that supports the H extension. This can be found here:
https://github.com/riscv/opensbi/tree/hyp_ext_changes_v1
3. Build the next release of Xvisor. It is available here:
https://github.com/avpatel/xvisor-next
4. Make sure you build the Xvisor tests, see here for details:
https://github.com/avpatel/xvisor-next/tree/master/tests/riscv/virt64/linux
5. Run QEMU:

     ./riscv64-softmmu/qemu-system-riscv64 -nographic \
       -machine virt -cpu rv64,x-h=true \
       -serial mon:stdio -serial null -m 4G \
       -device loader,file=vmm.bin,addr=0x80200000 \
       -kernel fw_jump.elf \
       -initrd vmm-disk-linux.img \
       -append "vmm.console=uart@10000000 vmm.bootcmd=\"vfs mount initrd /;vfs run /boot.xscript;vfs cat /system/banner.txt\""

Once you get to the prompt you can start the geust by running:
guest kick guest0
You can then bind to the serial port using:
vserial bind guest0/uart0
Then you can start Linux using:
autoexec

This was all tested with the mainline 5.2/5.3 kernels.

There is very early work on a Xen port as well which is avaliable here:
https://github.com/alistair23/xen/tree/alistair/riscv-port

ToDo/Issues
- Get 32-bit fully working

This series is based on Palmers for-master branch:
https://github.com/palmer-dabbelt/qemu/commits/for-master

v2:
- Rebase on for-master
- Consolidate patches requested by Palmer
- Other updates based on feedback

Alistair Francis (27):
target/riscv: Don't set write permissions on dirty PTEs target/riscv: Add the Hypervisor extension target/riscv: Add the virtulisation mode target/riscv: Add the force HS exception mode target/riscv: Fix CSR perm checking for HS mode target/riscv: Add the Hypervisor CSRs to CPUState target/riscv: Print priv and virt in disas log target/riscv: Dump Hypervisor registers if enabled target/riscv: Add Hypervisor CSR access functions target/riscv: Add Hypervisor virtual CSRs accesses target/riscv: Convert mie and mstatus to pointers target/riscv: Add virtual register swapping function target/riscv: Add support for virtual interrupt setting target/ricsv: Flush the TLB on virtulisation mode changes target/riscv: Generate illegal instruction on WFI when V=1
riscv: plic: Always set sip.SEIP bit for HS target/riscv: Add hypvervisor trap support target/riscv: Add Hypervisor trap return support target/riscv: Add hfence instructions
target/riscv: Disable guest FP support based on virtual status target/riscv: Mark both sstatus and vsstatus as dirty target/riscv: Respect MPRV and SPRV for floating point ops target/riscv: Allow specifying MMU stage target/riscv: Implement second stage MMU target/riscv: Add support for the 32-bit MSTATUSH CSR target/riscv: Add the MSTATUS_MPV_ISSET helper macro target/riscv: Allow enabling the Hypervisor extension

 hw/riscv/sifive_plic.c                        |  12 +-
 target/riscv/cpu.c                            |  61 ++-
 target/riscv/cpu.h                            |  55 +-
 target/riscv/cpu_bits.h                       |  45 +-
 target/riscv/cpu_helper.c                     | 481 ++++++++++++++++--
 target/riscv/csr.c                            | 262 +++++++++-
 target/riscv/insn32.decode                    |  23 +-
 .../riscv/insn_trans/trans_privileged.inc.c   |  40 ++
 target/riscv/op_helper.c                      |  81 ++-
 target/riscv/translate.c                      |  34 ++
 10 files changed, 988 insertions(+), 106 deletions(-)
Signature · 1 line
2.23.0