RISC-V: Hypervisor prep work part 2
Subsystems (2)
v3 cover RISC-V: Hypervisor prep work part 2
The first three patches are ones that I have pulled out of my original Hypervisor series at an attempt to reduce the number of patches in the series.
These three patches all make sense without the Hypervisor series so can be merged seperatley and will reduce the review burden of the next version of the patches.
The fource patch is a prep patch for the new v0.4 Hypervisor spec.
The fifth patch is unreleated to Hypervisor that I'm just slipping in here because it seems easier then sending it by itself.
The final two patches are issues I discovered while adding the v0.4 Hypervisor extension.
v3:
- Change names of all GP registers
- Add two more patches
v2:
- Small corrections based on feedback
- Remove the CSR permission check patch
Alistair Francis (6):
target/riscv: Don't set write permissions on dirty PTEs
riscv: plic: Remove unused interrupt functions target/riscv: Create function to test if FP is enabled target/riscv: Update the Hypervisor CSRs to v0.4 target/riscv: Fix mstatus dirty mask target/riscv: Convert mip to target_ulong
Atish Patra (1):
target/riscv: Use both register name and ABI name
hw/riscv/sifive_plic.c | 12 ------------ include/hw/riscv/sifive_plic.h | 3 --- target/riscv/cpu.c | 19 ++++++++++-------- target/riscv/cpu.h | 8 ++++++-- target/riscv/cpu_bits.h | 35 +++++++++++++++++----------------- target/riscv/cpu_helper.c | 16 ++++++++++++---- target/riscv/csr.c | 22 +++++++++++---------- 7 files changed, 59 insertions(+), 56 deletions(-)
Signature · 1 line
2.22.0
PATCH v3 1/7 target/riscv: Don't set write permissions on dirty PTEs
Setting write permission on dirty PTEs results in userspace inside a Hypervisor guest (VU) becoming corrupted. This appears to be because it ends up with write permission in the second stage translation in cases where we aren't doing a store.
--- target/riscv/cpu_helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
target/riscv/cpu_helper.c +2 -4
@@ -340,10 +340,8 @@ restart:if ((pte &PTE_X )) { *prot |=PAGE_EXEC ; } -/* add write permission on stores or if the page is already dirty, -so that we TLB miss on later writes to update the dirty bit */ -if ((pte &PTE_W ) && - (access_type ==MMU_DATA_STORE || (pte &PTE_D ))) { +/* add write permission on stores */ +if ((pte &PTE_W ) && (access_type ==MMU_DATA_STORE )) { *prot |=PAGE_WRITE ; }return TRANSLATE_SUCCESS ;
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 1/7] target/riscv: Don't set write permissions on dirty PTEs
Quoted 11 lines · Alistair Francis
Setting write permission on dirty PTEs results in userspace inside a Hypervisor guest (VU) becoming corrupted. This appears to be because it ends up with write permission in the second stage translation in cases where we aren't doing a store.
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu_helper.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
PATCH v3 2/7 riscv: plic: Remove unused interrupt functions
In reply to Alistair Francis--- hw/riscv/sifive_plic.c | 12 ------------ include/hw/riscv/sifive_plic.h | 3 --- 2 files changed, 15 deletions(-)
hw/riscv/sifive_plic.c +0 -12
@@ -161,18 +161,6 @@ static void sifive_plic_update(SiFivePLICState *plic) } } -void sifive_plic_raise_irq (SiFivePLICState *plic,uint32_t irq) -{ -sifive_plic_set_pending (plic, irq, true); -sifive_plic_update (plic); -} - -void sifive_plic_lower_irq (SiFivePLICState *plic,uint32_t irq) -{ -sifive_plic_set_pending (plic, irq, false); -sifive_plic_update (plic); -} -static uint32_t sifive_plic_claim (SiFivePLICState *plic,uint32_t addrid) {int i, j;
include/hw/riscv/sifive_plic.h +0 -3
@@ -69,9 +69,6 @@ typedef struct SiFivePLICState {uint32_t aperture_size; } SiFivePLICState; -void sifive_plic_raise_irq (SiFivePLICState *plic,uint32_t irq); -void sifive_plic_lower_irq (SiFivePLICState *plic,uint32_t irq); - DeviceState *sifive_plic_create(hwaddr addr, char *hart_config, uint32_t num_sources, uint32_t num_priorities, uint32_t priority_base, uint32_t pending_base,
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 2/7] riscv: plic: Remove unused interrupt functions
Quoted 10 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Jonathan Behrens <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Chih-Min Chao <[email protected]>--- hw/riscv/sifive_plic.c | 12 ------------ include/hw/riscv/sifive_plic.h | 3 --- 2 files changed, 15 deletions(-)
PATCH v3 3/7 target/riscv: Create function to test if FP is enabled
In reply to Alistair FrancisLet's create a function that tests if floating point support is enabled. We can then protect all floating point operations based on if they are enabled.
This patch so far doesn't change anything, it's just preparing for the Hypervisor support for floating point operations.
--- target/riscv/cpu.h | 6 +++++- target/riscv/cpu_helper.c | 10 ++++++++++ target/riscv/csr.c | 20 +++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-)
target/riscv/cpu.h +5 -1
@@ -255,6 +255,7 @@ void riscv_cpu_do_interrupt(CPUState *cpu);int riscv_cpu_gdb_read_register (CPUState *cpu,uint8_t *buf,int reg);int riscv_cpu_gdb_write_register (CPUState *cpu,uint8_t *buf,int reg);bool riscv_cpu_exec_interrupt (CPUState *cs,int interrupt_request); +bool riscv_cpu_fp_enabled (CPURISCVState *env);int riscv_cpu_mmu_index (CPURISCVState *env,bool ifetch);hwaddr riscv_cpu_get_phys_page_debug (CPUState *cpu,vaddr addr); void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
@@ -298,7 +299,10 @@ static inline void cpu_get_tb_cpu_state(CPURISCVState *env, target_ulong *pc,#ifdef CONFIG_USER_ONLY *flags =TB_FLAGS_MSTATUS_FS ;#else - *flags =cpu_mmu_index (env,0 ) | (env->mstatus &MSTATUS_FS ); + *flags =cpu_mmu_index (env,0 ); +if (riscv_cpu_fp_enabled (env)) { + *flags |= env->mstatus &MSTATUS_FS ; + }#endif }
target/riscv/cpu_helper.c +10 -0
@@ -71,6 +71,16 @@ bool riscv_cpu_exec_interrupt(CPUState *cs, int interrupt_request)#if !defined(CONFIG_USER_ONLY ) +/* Return true is floating point support is currently enabled */ +bool riscv_cpu_fp_enabled (CPURISCVState *env) +{ +if (env->mstatus &MSTATUS_FS ) { +return true; + } + +return false; +} +int riscv_cpu_claim_interrupts (RISCVCPU *cpu,uint32_t interrupts) {CPURISCVState *env = &cpu->env;
target/riscv/csr.c +11 -9
@@ -46,7 +46,7 @@ void riscv_set_csr_ops(int csrno, riscv_csr_operations *ops)static int fs (CPURISCVState *env,int csrno) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -108,7 +108,7 @@ static int pmp(CPURISCVState *env, int csrno)static int read_fflags (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -119,7 +119,7 @@ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val)static int write_fflags (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; } env->mstatus |=MSTATUS_FS ;
@@ -131,7 +131,7 @@ static int write_fflags(CPURISCVState *env, int csrno, target_ulong val)static int read_frm (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -142,7 +142,7 @@ static int read_frm(CPURISCVState *env, int csrno, target_ulong *val)static int write_frm (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; } env->mstatus |=MSTATUS_FS ;
@@ -154,7 +154,7 @@ static int write_frm(CPURISCVState *env, int csrno, target_ulong val)static int read_fcsr (CPURISCVState *env,int csrno,target_ulong *val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; }#endif
@@ -166,7 +166,7 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val)static int write_fcsr (CPURISCVState *env,int csrno,target_ulong val) {#if !defined(CONFIG_USER_ONLY ) -if (!env->debugger && !(env->mstatus &MSTATUS_FS )) { +if (!env->debugger && !riscv_cpu_fp_enabled (env)) {return -1 ; } env->mstatus |=MSTATUS_FS ;
@@ -307,6 +307,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) {target_ulong mstatus = env->mstatus;target_ulong mask =0 ; +int dirty;/* flush tlb on mstatus fields that affect VM */ if (env->priv_ver <=PRIV_VERSION_1_09_1 ) {
@@ -340,8 +341,9 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val) mstatus = (mstatus & ~mask) | (val & mask); -int dirty = ((mstatus &MSTATUS_FS ) ==MSTATUS_FS ) | - ((mstatus &MSTATUS_XS ) ==MSTATUS_XS ); + dirty = (riscv_cpu_fp_enabled (env) && + ((mstatus &MSTATUS_FS ) ==MSTATUS_FS )) | + ((mstatus &MSTATUS_XS ) ==MSTATUS_XS ); mstatus =set_field (mstatus,MSTATUS_SD , dirty); env->mstatus = mstatus;
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 3/7] target/riscv: Create function to test if FP is enabled
Quoted 12 lines · Alistair Francis
Let's create a function that tests if floating point support is enabled. We can then protect all floating point operations based on if they are enabled.
This patch so far doesn't change anything, it's just preparing for the Hypervisor support for floating point operations.
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Reviewed-by Christophe de Dinechin <[email protected]>Reviewed-by Chih-Min Chao <[email protected]>
Quoted 6 lines
--- target/riscv/cpu.h | 6 +++++- target/riscv/cpu_helper.c | 10 ++++++++++ target/riscv/csr.c | 20 +++++++++++--------- 3 files changed, 26 insertions(+), 10 deletions(-)
PATCH v3 4/7 target/riscv: Update the Hypervisor CSRs to v0.4
In reply to Alistair FrancisUpdate the Hypervisor CSR addresses to match the v0.4 spec.
--- target/riscv/cpu_bits.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
target/riscv/cpu_bits.h +18 -17
@@ -173,6 +173,24 @@#define CSR_SPTBR 0x180#define CSR_SATP 0x180 +/* Hpervisor CSRs */ +#define CSR_HSTATUS 0x600 +#define CSR_HEDELEG 0x602 +#define CSR_HIDELEG 0x603 +#define CSR_HCOUNTERNEN 0x606 +#define CSR_HGATP 0x680 + +#if defined(TARGET_RISCV32 ) +#define HGATP_MODE SATP32_MODE +#define HGATP_VMID SATP32_ASID +#define HGATP_PPN SATP32_PPN +#endif +#if defined(TARGET_RISCV64 ) +#define HGATP_MODE SATP64_MODE +#define HGATP_VMID SATP64_ASID +#define HGATP_PPN SATP64_PPN +#endif +/* Physical Memory Protection */ #define CSR_PMPCFG0 0x3a0#define CSR_PMPCFG1 0x3a1
@@ -206,23 +224,6 @@#define CSR_DPC 0x7b1#define CSR_DSCRATCH 0x7b2 -/* Hpervisor CSRs */ -#define CSR_HSTATUS 0xa00 -#define CSR_HEDELEG 0xa02 -#define CSR_HIDELEG 0xa03 -#define CSR_HGATP 0xa80 - -#if defined(TARGET_RISCV32 ) -#define HGATP_MODE SATP32_MODE -#define HGATP_ASID SATP32_ASID -#define HGATP_PPN SATP32_PPN -#endif -#if defined(TARGET_RISCV64 ) -#define HGATP_MODE SATP64_MODE -#define HGATP_ASID SATP64_ASID -#define HGATP_PPN SATP64_PPN -#endif -/* Performance Counters */ #define CSR_MHPMCOUNTER3 0xb03#define CSR_MHPMCOUNTER4 0xb04
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 4/7] target/riscv: Update the Hypervisor CSRs to v0.4
Quoted 9 lines · Alistair Francis
Update the Hypervisor CSR addresses to match the v0.4 spec.
Signed-off-by Alistair Francis <[email protected]>Reviewed-by Chih-Min Chao <[email protected]>--- target/riscv/cpu_bits.h | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-)
PATCH v3 5/7 target/riscv: Use both register name and ABI name
In reply to Alistair FrancisFrom: Atish Patra <[email protected]>
Use both the generic register name and ABI name for the general purpose registers and floating point registers.
--- target/riscv/cpu.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
target/riscv/cpu.c +11 -8
@@ -33,17 +33,20 @@static const char riscv_exts[26 ] ="IEMAFDQCLBJTPVNSUHKORWXYZG" ;const char *const riscv_int_regnames[] = { -"zero" ,"ra" ,"sp" ,"gp" ,"tp" ,"t0" ,"t1" ,"t2" , -"s0" ,"s1" ,"a0" ,"a1" ,"a2" ,"a3" ,"a4" ,"a5" , -"a6" ,"a7" ,"s2" ,"s3" ,"s4" ,"s5" ,"s6" ,"s7" , -"s8" ,"s9" ,"s10" ,"s11" ,"t3" ,"t4" ,"t5" ,"t6" +"x0/zero" ,"x1/ra" ,"x2/sp" ,"x3/gp" ,"x4/tp" ,"x5/t0" ,"x6/t1" , +"x7/t2" ,"x8/s0" ,"x9/s1" ,"x10/a0" ,"x11/a1" ,"x12/a2" ,"x13/a3" , +"x14/a4" ,"x15/a5" ,"x16/a6" ,"x17/a7" ,"x18/s2" ,"x19/s3" ,"x20/s4" , +"x21/s5" ,"x22/s6" ,"x23/s7" ,"x24/s8" ,"x25/s9" ,"x26/s10" ,"x27/s11" , +"x28/t3" ,"x29/t4" ,"x30/t5" ,"x31/t6" };const char *const riscv_fpr_regnames[] = { -"ft0" ,"ft1" ,"ft2" ,"ft3" ,"ft4" ,"ft5" ,"ft6" ,"ft7" , -"fs0" ,"fs1" ,"fa0" ,"fa1" ,"fa2" ,"fa3" ,"fa4" ,"fa5" , -"fa6" ,"fa7" ,"fs2" ,"fs3" ,"fs4" ,"fs5" ,"fs6" ,"fs7" , -"fs8" ,"fs9" ,"fs10" ,"fs11" ,"ft8" ,"ft9" ,"ft10" ,"ft11" +"f0/ft0" ,"f1/ft1" ,"f2/ft2" ,"f3/ft3" ,"f4/ft4" ,"f5/ft5" , +"f6/ft6" ,"f7/ft7" ,"f8/fs0" ,"f9/fs1" ,"f10/fa0" ,"f11/fa1" , +"f12/fa2" ,"f13/fa3" ,"f14/fa4" ,"f15/fa5" ,"f16/fa6" ,"f17/fa7" , +"f18/fs2" ,"f19/fs3" ,"f20/fs4" ,"f21/fs5" ,"f22/fs6" ,"f23/fs7" , +"f24/fs8" ,"f25/fs9" ,"f26/fs10" ,"f27/fs11" ,"f28/ft8" ,"f29/ft9" , +"f30/ft10" ,"f31/ft11" };const char *const riscv_excp_names[] = {
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 5/7] target/riscv: Use both register name and ABI name
Quoted 12 lines · Alistair Francis
From: Atish Patra <[email protected]>
Use both the generic register name and ABI name for the general purpose registers and floating point registers.
Signed-off-by Atish Patra <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
PATCH v3 6/7 target/riscv: Fix mstatus dirty mask
In reply to Alistair Francis--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/csr.c +1 -1
@@ -335,7 +335,7 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)* RV32: MPV and MTL are not in mstatus. The current plan is to * add them to mstatush. For now, we just don't support it. */ - mask |=MSTATUS_MPP |MSTATUS_MPV ; + mask |=MSTATUS_MTL |MSTATUS_MPV ;#endif }
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 6/7] target/riscv: Fix mstatus dirty mask
Quoted 6 lines · Alistair Francis
Signed-off-by Alistair Francis <[email protected]>--- target/riscv/csr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
PATCH v3 7/7 target/riscv: Convert mip to target_ulong
In reply to Alistair FrancisThe mip register is an MXLEN-bit long register. Convert it to a target_ulong type instead of uint32_t.
--- target/riscv/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/cpu.h +1 -1
@@ -130,7 +130,7 @@ struct CPURISCVState {* wuth the invariant that CPU_INTERRUPT_HARD is set iff mip is non-zero. * mip is 32-bits to allow atomic_read on 32-bit hosts. */ -uint32_t mip; +target_ulong mip;uint32_t miclaim;target_ulong mie;
Signature · 1 line
2.22.0
Re: [Qemu-devel] [PATCH v3 7/7] target/riscv: Convert mip to target_ulong
Quoted 9 lines · Alistair Francis
The mip register is an MXLEN-bit long register. Convert it to a
target_ulongtype instead ofuint32_t.Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Re: [Qemu-devel] [PATCH v3 7/7] target/riscv: Convert mip to target_ulong
In reply to Alistair FrancisQuoted 5 lines · Alistair Francis
The mip register is an MXLEN-bit long register. Convert it to a
target_ulongtype instead ofuint32_t.Signed-off-by Alistair Francis <[email protected]>
MIP is 32-bit to allow atomic access on 32-bit hosts, so I am going to send a v4 with this patch dropped.
Alistair
Quoted 20 lines
--- target/riscv/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)target/riscv/cpu.h +1
-2@@ -130,7 +130,7 @@ struct CPURISCVState {* wuth the invariant that CPU_INTERRUPT_HARD is set iff mip is non-zero. * mip is 32-bits to allow atomic_read on 32-bit hosts. */ -uint32_t mip; +target_ulong mip;uint32_t miclaim;target_ulong mie; --2.22.0
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series failed build test on s390x host. Please find the details below.
=== TEST SCRIPT BEGIN ===
#!/bin/bash
# Testing script will be invoked under the git checkout with # HEAD pointing to a commit that has the patches applied on top of "base"
# branch set -e
echo
echo "=== ENV ==="
env
echo
echo "=== PACKAGES ==="
rpm -qa
echo
echo "=== UNAME ==="
uname -a
CC=$HOME/bin/cc
INSTALL=$PWD/install
BUILD=$PWD/build
mkdir -p $BUILD $INSTALL
SRC=$PWD
cd $BUILD
$SRC/configure --cc=$CC --prefix=$INSTALL
make -j4
# XXX: we need reliable clean up
# make check -j4 V=1 make install === TEST SCRIPT END ===
CC mips-softmmu/hw/vfio/display.o CC mips-softmmu/hw/virtio/virtio.o GEN nios2-softmmu/hmp-commands.h collect2: error: ld returned 1 exit status GEN nios2-softmmu/hmp-commands-info.h GEN nios2-softmmu/config-devices.h GEN nios2-softmmu/config-target.h --- CC aarch64-softmmu/hw/misc/nrf51_rng.o CC aarch64-softmmu/hw/net/virtio-net.o CC aarch64-softmmu/hw/nvram/nrf51_nvm.o
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:209: qemu-system-nios2] Error 1
make: *** [Makefile:472: nios2-softmmu/all] Error 2
CC aarch64-softmmu/hw/pcmcia/pxa2xx.o
---
make[1]: *** [/var/tmp/patchew-tester-tmp-ma8jqv0u/src/rules.mak:69: hw/vfio/pci.o] Error 1 make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:472: aarch64-softmmu/all] Error 2
collect2: error: ld returned 1 exit status
make[1]: *** [Makefile:209: qemu-system-mips] Error 1
make: *** [Makefile:472: mips-softmmu/all] Error 2
=== OUTPUT END ===
The full log is available at
http://patchew.org/logs/[email protected]/testing.s390x/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]