RISC-V: Update the Hypervisor spec to v0.6.1
v3 cover RISC-V: Update the Hypervisor spec to v0.6.1
This series updates the experimental QEMU RISC-V Hypervisor spec to the v0.6.1 draft implementation.
THis includes support for the new 2-stage lookup instructions and the new CSRs.
It also includes the new 0.6.1 support for the virtual instruction fault.
This was tested by running 32-bit and 64-bit Xvisor on QEMU and starting Linux guests.
v3:
- Rebase on master
v2:
- Update to v0.6.1
Alistair Francis (13):
target/riscv: Allow setting a two-stage lookup in the virt status target/riscv: Allow generating hlv/hlvx/hsv instructions target/riscv: Do two-stage lookups on hlv/hlvx/hsv instructions target/riscv: Don't allow guest to write to htinst target/riscv: Convert MSTATUS MTL to GVA
target/riscv: Fix the interrupt cause code target/riscv: Update the Hypervisor trap return/entry target/riscv: Update the CSRs to the v0.6 Hyp extension target/riscv: Only support a single VSXL length target/riscv: Only support little endian guests target/riscv: Support the v0.6 Hypervisor extension CRSs target/riscv: Return the exception from invalid CSR accesses target/riscv: Support the Virtual Instruction fault
target/riscv/cpu.h | 2 + target/riscv/cpu_bits.h | 25 +- target/riscv/helper.h | 4 + target/riscv/insn32-64.decode | 5 + target/riscv/insn32.decode | 11 + target/riscv/cpu_helper.c | 123 +++++---- target/riscv/csr.c | 171 ++++++++++-- target/riscv/insn_trans/trans_rvh.inc.c | 342 +++++++++++++++++++++++- target/riscv/op_helper.c | 176 +++++++++++- target/riscv/translate.c | 10 - 10 files changed, 761 insertions(+), 108 deletions(-)
Signature · 1 line
2.27.0
PATCH v3 1/13 target/riscv: Allow setting a two-stage lookup in the virt status
--- target/riscv/cpu.h | 2 ++ target/riscv/cpu_bits.h | 1 + target/riscv/cpu_helper.c | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+)
target/riscv/cpu.h +2 -0
@@ -321,6 +321,8 @@ bool riscv_cpu_virt_enabled(CPURISCVState *env);void riscv_cpu_set_virt_enabled (CPURISCVState *env,bool enable);bool riscv_cpu_force_hs_excep_enabled (CPURISCVState *env);void riscv_cpu_set_force_hs_excep (CPURISCVState *env,bool enable); +bool riscv_cpu_two_stage_lookup (CPURISCVState *env); +void riscv_cpu_set_two_stage_lookup (CPURISCVState *env,bool enable);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,
target/riscv/cpu_bits.h +1 -0
@@ -467,6 +467,7 @@* page table fault. */ #define FORCE_HS_EXCEP 2 +#define HS_TWO_STAGE 4/* RV32 satp CSR field masks */ #define SATP32_MODE 0x80000000
target/riscv/cpu_helper.c +18 -0
@@ -220,6 +220,24 @@ void riscv_cpu_set_force_hs_excep(CPURISCVState *env, bool enable) env->virt =set_field (env->virt,FORCE_HS_EXCEP , enable); } +bool riscv_cpu_two_stage_lookup (CPURISCVState *env) +{ +if (!riscv_has_ext (env,RVH )) { +return false; + } + +return get_field (env->virt,HS_TWO_STAGE ); +} + +void riscv_cpu_set_two_stage_lookup (CPURISCVState *env,bool enable) +{ +if (!riscv_has_ext (env,RVH )) { +return ; + } + + env->virt =set_field (env->virt,HS_TWO_STAGE , enable); +} +int riscv_cpu_claim_interrupts (RISCVCPU *cpu,uint32_t interrupts) {CPURISCVState *env = &cpu->env;
Signature · 1 line
2.27.0
PATCH v3 2/13 target/riscv: Allow generating hlv/hlvx/hsv instructions
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 1 + target/riscv/helper.h | 3 + target/riscv/insn32-64.decode | 5 + target/riscv/insn32.decode | 11 + target/riscv/insn_trans/trans_rvh.inc.c | 340 ++++++++++++++++++++++++ target/riscv/op_helper.c | 114 ++++++++ 6 files changed, 474 insertions(+)
target/riscv/cpu_bits.h +1 -0
@@ -443,6 +443,7 @@#define HSTATUS_SP2V 0x00000200#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000 +#define HSTATUS_HU 0x00000200#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/helper.h +3 -0
@@ -80,6 +80,9 @@ DEF_HELPER_1(tlb_flush, void, env)/* Hypervisor functions */ #ifndef CONFIG_USER_ONLY DEF_HELPER_1(hyp_tlb_flush, void, env) +DEF_HELPER_4(hyp_load, tl, env, tl, tl, tl) +DEF_HELPER_5(hyp_store, void, env, tl, tl, tl, tl) +DEF_HELPER_4(hyp_x_load, tl, env, tl, tl, tl)#endif /* Vector functions */
target/riscv/insn32-64.decode +5 -0
@@ -81,3 +81,8 @@ fmv_x_d 1110001 00000 ..... 000 ..... 1010011 @r2 fcvt_d_l 1101001 00010 ..... ... ..... 1010011 @r2_rm fcvt_d_lu 1101001 00011 ..... ... ..... 1010011 @r2_rm fmv_d_x 1111001 00000 ..... 000 ..... 1010011 @r2 + +# *** RV32H Base Instruction Set *** +hlv_wu 0110100 00001 ..... 100 ..... 1110011 @r2 +hlv_d 0110110 00000 ..... 100 ..... 1110011 @r2 +hsv_d 0110111 ..... ..... 100 00000 1110011 @r2_s
target/riscv/insn32.decode +11 -0
@@ -78,6 +78,7 @@ @r_vm_0 ...... . ..... ..... ... ..... ....... &rmrr vm=0 %rs2 %rs1 %rd @r_wdvm ..... wd:1 vm:1 ..... ..... ... ..... ....... &rwdvm %rs2 %rs1 %rd @r2_zimm . zimm:11 ..... ... ..... ....... %rs1 %rd +@r2_s ....... ..... ..... ... ..... ....... %rs2 %rs1 @hfence_gvma ....... ..... ..... ... ..... ....... %rs2 %rs1 @hfence_vvma ....... ..... ..... ... ..... ....... %rs2 %rs1
@@ -223,6 +224,16 @@ fcvt_d_w 1101001 00000 ..... ... ..... 1010011 @r2_rm fcvt_d_wu 1101001 00001 ..... ... ..... 1010011 @r2_rm # *** RV32H Base Instruction Set *** +hlv_b 0110000 00000 ..... 100 ..... 1110011 @r2 +hlv_bu 0110000 00001 ..... 100 ..... 1110011 @r2 +hlv_h 0110010 00000 ..... 100 ..... 1110011 @r2 +hlv_hu 0110010 00001 ..... 100 ..... 1110011 @r2 +hlvx_hu 0110010 00011 ..... 100 ..... 1110011 @r2 +hlv_w 0110100 00000 ..... 100 ..... 1110011 @r2 +hlvx_wu 0110100 00011 ..... 100 ..... 1110011 @r2 +hsv_b 0110001 ..... ..... 100 00000 1110011 @r2_s +hsv_h 0110011 ..... ..... 100 00000 1110011 @r2_s +hsv_w 0110101 ..... ..... 100 00000 1110011 @r2_s hfence_gvma 0110001 ..... ..... 000 00000 1110011 @hfence_gvma hfence_vvma 0010001 ..... ..... 000 00000 1110011 @hfence_vvma
target/riscv/insn_trans/trans_rvh.inc.c +340 -0
346 lines not on this page · raw message
target/riscv/op_helper.c +114 -0
118 lines not on this page · raw message
Signature · 1 line
2.27.0
PATCH v3 3/13 target/riscv: Do two-stage lookups on hlv/hlvx/hsv instructions
In reply to Alistair Francis--- target/riscv/cpu_helper.c | 60 ++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 35 deletions(-)
target/riscv/cpu_helper.c +25 -35
@@ -340,22 +340,13 @@ static int get_physical_address(CPURISCVState *env, hwaddr *physical,* was called. Background registers will be used if the guest has * forced a two stage translation to be on (in HS or M mode). */ +if (riscv_cpu_two_stage_lookup (env) && access_type !=MMU_INST_FETCH ) { + use_background = true; + } +if (mode ==PRV_M && access_type !=MMU_INST_FETCH ) {if (get_field (env->mstatus,MSTATUS_MPRV )) { mode =get_field (env->mstatus,MSTATUS_MPP ); - -if (riscv_has_ext (env,RVH ) && -MSTATUS_MPV_ISSET (env)) { - use_background = true; - } - } - } - -if (mode ==PRV_S && access_type !=MMU_INST_FETCH && -riscv_has_ext (env,RVH ) && !riscv_cpu_virt_enabled (env)) { -if (get_field (env->hstatus,HSTATUS_SPRV )) { - mode =get_field (env->mstatus,SSTATUS_SPP ); - use_background = true; } }
@@ -607,7 +598,8 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address, }break ;case MMU_DATA_LOAD : -if (riscv_cpu_virt_enabled (env) && !first_stage) { +if ((riscv_cpu_virt_enabled (env) ||riscv_cpu_two_stage_lookup (env)) && + !first_stage) { cs->exception_index =RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT ; }else { cs->exception_index = page_fault_exceptions ?
@@ -615,7 +607,8 @@ static void raise_mmu_exception(CPURISCVState *env, target_ulong address, }break ;case MMU_DATA_STORE : -if (riscv_cpu_virt_enabled (env) && !first_stage) { +if ((riscv_cpu_virt_enabled (env) ||riscv_cpu_two_stage_lookup (env)) && + !first_stage) { cs->exception_index =RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT ; }else { cs->exception_index = page_fault_exceptions ?
@@ -705,8 +698,6 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,hwaddr pa =0 ;int prot, prot2;bool pmp_violation = false; -bool m_mode_two_stage = false; -bool hs_mode_two_stage = false;bool first_stage_error = true;int ret =TRANSLATE_FAIL ;int mode = mmu_idx;
@@ -716,30 +707,21 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size,qemu_log_mask (CPU_LOG_MMU ,"%s ad %" VADDR_PRIx" rw %d mmu_idx %d\n" , __func__, address, access_type, mmu_idx); -/* -* Determine if we are in M mode and MPRV is set or in HS mode and SPRV is -* set and we want to access a virtulisation address. -*/ -if (riscv_has_ext (env,RVH )) { - m_mode_two_stage = env->priv ==PRV_M && - access_type !=MMU_INST_FETCH && -get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env); - - hs_mode_two_stage = env->priv ==PRV_S && - !riscv_cpu_virt_enabled (env) && - access_type !=MMU_INST_FETCH && -get_field (env->hstatus,HSTATUS_SPRV ) && -get_field (env->hstatus,HSTATUS_SPV ); - } -if (mode ==PRV_M && access_type !=MMU_INST_FETCH ) {if (get_field (env->mstatus,MSTATUS_MPRV )) { mode =get_field (env->mstatus,MSTATUS_MPP ); } } -if (riscv_cpu_virt_enabled (env) || m_mode_two_stage || hs_mode_two_stage) { +if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && + access_type !=MMU_INST_FETCH && +get_field (env->mstatus,MSTATUS_MPRV ) && +MSTATUS_MPV_ISSET (env)) { +riscv_cpu_set_two_stage_lookup (env, true); + } + +if (riscv_cpu_virt_enabled (env) || + (riscv_cpu_two_stage_lookup (env) && access_type !=MMU_INST_FETCH )) {/* Two stage lookup */ ret =get_physical_address (env, &pa, &prot, address, access_type, mmu_idx, true, true);
@@ -791,6 +773,14 @@ bool riscv_cpu_tlb_fill(CPUState *cs, vaddr address, int size, __func__, address, ret, pa, prot); } +/* We did the two stage lookup based on MPRV, unset the lookup */ +if (riscv_has_ext (env,RVH ) && env->priv ==PRV_M && + access_type !=MMU_INST_FETCH && +get_field (env->mstatus,MSTATUS_MPRV ) && +MSTATUS_MPV_ISSET (env)) { +riscv_cpu_set_two_stage_lookup (env, false); + } +if (riscv_feature (env,RISCV_FEATURE_PMP ) && (ret ==TRANSLATE_SUCCESS ) && !pmp_hart_has_privs (env, pa, size,1 << access_type, mode)) {
Signature · 1 line
2.27.0
PATCH v3 4/13 target/riscv: Don't allow guest to write to htinst
In reply to Alistair Francis--- target/riscv/csr.c | 1 - 1 file changed, 1 deletion(-)
target/riscv/csr.c +0 -1
@@ -922,7 +922,6 @@ static int read_htinst(CPURISCVState *env, int csrno, target_ulong *val)static int write_htinst (CPURISCVState *env,int csrno,target_ulong val) { - env->htinst = val;return 0 ; }
Signature · 1 line
2.27.0
PATCH v3 5/13 target/riscv: Convert MSTATUS MTL to GVA
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 5 +++-- target/riscv/cpu_helper.c | 24 ++++++++++++++++++++---- target/riscv/csr.c | 6 +++--- 3 files changed, 26 insertions(+), 9 deletions(-)
target/riscv/cpu_bits.h +3 -2
@@ -379,10 +379,10 @@#define MSTATUS_TW 0x20000000/* since: priv-1.10 */ #define MSTATUS_TSR 0x40000000/* since: priv-1.10 */ #if defined(TARGET_RISCV64 ) -#define MSTATUS_MTL 0x4000000000ULL +#define MSTATUS_GVA 0x4000000000ULL#define MSTATUS_MPV 0x8000000000ULL#elif defined(TARGET_RISCV32 ) -#define MSTATUS_MTL 0x00000040 +#define MSTATUS_GVA 0x00000040#define MSTATUS_MPV 0x00000080#endif
@@ -444,6 +444,7 @@#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000#define HSTATUS_HU 0x00000200 +#define HSTATUS_GVA 0x00000040#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/cpu_helper.c +20 -4
@@ -894,6 +894,19 @@ void riscv_cpu_do_interrupt(CPUState *cs)if (riscv_has_ext (env,RVH )) {target_ulong hdeleg = async ? env->hideleg : env->hedeleg; +if ((riscv_cpu_virt_enabled (env) || +riscv_cpu_two_stage_lookup (env)) && tval) { +/* +* If we are writing a guest virtual address to stval, set +* this to 1. If we are trapping to VS we will set this to 0 +* later. +*/ + env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,1 ); + }else { +/* For other HS-mode traps, we set this to 0. */ + env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,0 ); + } +if (riscv_cpu_virt_enabled (env) && ((hdeleg >> cause) &1 ) && !force_hs_execp) {/*
@@ -904,6 +917,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) cause == IRQ_VS_EXT) cause = cause -1 ;/* Trap to VS mode */ + env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,0 ); }else if (riscv_cpu_virt_enabled (env)) {/* Trap into HS mode, from virt */ riscv_cpu_swap_hypervisor_regs (env);
@@ -952,13 +966,15 @@ void riscv_cpu_do_interrupt(CPUState *cs)#ifdef TARGET_RISCV32 env->mstatush =set_field (env->mstatush,MSTATUS_MPV ,riscv_cpu_virt_enabled (env)); - env->mstatush =set_field (env->mstatush,MSTATUS_MTL , -riscv_cpu_force_hs_excep_enabled (env)); +if (riscv_cpu_virt_enabled (env) && tval) { + env->mstatush =set_field (env->mstatush,MSTATUS_GVA ,1 ); + }#else env->mstatus =set_field (env->mstatus,MSTATUS_MPV ,riscv_cpu_virt_enabled (env)); - env->mstatus =set_field (env->mstatus,MSTATUS_MTL , -riscv_cpu_force_hs_excep_enabled (env)); +if (riscv_cpu_virt_enabled (env) && tval) { + env->mstatus =set_field (env->mstatus,MSTATUS_GVA ,1 ); + }#endif mtval2 = env->guest_phys_fault_addr;
target/riscv/csr.c +3 -3
@@ -403,10 +403,10 @@ static int write_mstatus(CPURISCVState *env, int csrno, target_ulong val)MSTATUS_TW ;#if defined(TARGET_RISCV64 )/* -* RV32: MPV and MTL are not in mstatus. The current plan is to +* RV32: MPV and GVA are not in mstatus. The current plan is to * add them to mstatush. For now, we just don't support it. */ - mask |=MSTATUS_MTL |MSTATUS_MPV ; + mask |=MSTATUS_MPV |MSTATUS_GVA ;#endif mstatus = (mstatus & ~mask) | (val & mask);
@@ -432,7 +432,7 @@ static int write_mstatush(CPURISCVState *env, int csrno, target_ulong val)tlb_flush (env_cpu (env)); } - val &=MSTATUS_MPV |MSTATUS_MTL ; + val &=MSTATUS_MPV |MSTATUS_GVA ; env->mstatush = val;
Signature · 1 line
2.27.0
PATCH v3 6/13 target/riscv: Fix the interrupt cause code
In reply to Alistair Francis--- target/riscv/cpu_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
target/riscv/cpu_helper.c +3 -2
@@ -909,14 +909,15 @@ void riscv_cpu_do_interrupt(CPUState *cs)if (riscv_cpu_virt_enabled (env) && ((hdeleg >> cause) &1 ) && !force_hs_execp) { +/* Trap to VS mode */ /* * See if we need to adjust cause. Yes if its VS mode interrupt * no if hypervisor has delegated one of hs mode's interrupt */ if (cause ==IRQ_VS_TIMER || cause ==IRQ_VS_SOFT || - cause ==IRQ_VS_EXT ) + cause ==IRQ_VS_EXT ) { cause = cause -1 ; -/* Trap to VS mode */ + } env->hstatus =set_field (env->hstatus,HSTATUS_GVA ,0 ); }else if (riscv_cpu_virt_enabled (env)) {/* Trap into HS mode, from virt */
Signature · 1 line
2.27.0
PATCH v3 7/13 target/riscv: Update the Hypervisor trap return/entry
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 1 + target/riscv/cpu_helper.c | 16 ++++++---------- target/riscv/op_helper.c | 8 ++------ target/riscv/translate.c | 10 ---------- 4 files changed, 9 insertions(+), 26 deletions(-)
target/riscv/cpu_bits.h +1 -0
@@ -445,6 +445,7 @@#define HSTATUS_VTSR 0x00400000#define HSTATUS_HU 0x00000200#define HSTATUS_GVA 0x00000040 +#define HSTATUS_SPVP 0x00000100#define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
target/riscv/cpu_helper.c +6 -10
@@ -922,9 +922,7 @@ void riscv_cpu_do_interrupt(CPUState *cs) }else if (riscv_cpu_virt_enabled (env)) {/* Trap into HS mode, from virt */ riscv_cpu_swap_hypervisor_regs (env); - env->hstatus =set_field (env->hstatus,HSTATUS_SP2V , -get_field (env->hstatus,HSTATUS_SPV )); - env->hstatus =set_field (env->hstatus,HSTATUS_SP2P , + env->hstatus =set_field (env->hstatus,HSTATUS_SPVP ,get_field (env->mstatus,SSTATUS_SPP )); env->hstatus =set_field (env->hstatus,HSTATUS_SPV ,riscv_cpu_virt_enabled (env));
@@ -935,13 +933,11 @@ void riscv_cpu_do_interrupt(CPUState *cs)riscv_cpu_set_force_hs_excep (env,0 ); }else {/* Trap into HS mode */ - env->hstatus =set_field (env->hstatus,HSTATUS_SP2V , -get_field (env->hstatus,HSTATUS_SPV )); - env->hstatus =set_field (env->hstatus,HSTATUS_SP2P , -get_field (env->mstatus,SSTATUS_SPP )); - env->hstatus =set_field (env->hstatus,HSTATUS_SPV , -riscv_cpu_virt_enabled (env)); - +if (!riscv_cpu_two_stage_lookup (env)) { + env->hstatus =set_field (env->hstatus,HSTATUS_SPV , +riscv_cpu_virt_enabled (env)); + } +riscv_cpu_set_two_stage_lookup (env, false); htval = env->guest_phys_fault_addr; } }
target/riscv/op_helper.c +2 -6
@@ -97,12 +97,8 @@ target_ulong helper_sret(CPURISCVState *env, target_ulong cpu_pc_deb) prev_priv =get_field (mstatus,MSTATUS_SPP ); prev_virt =get_field (hstatus,HSTATUS_SPV ); - hstatus =set_field (hstatus,HSTATUS_SPV , -get_field (hstatus,HSTATUS_SP2V )); - mstatus =set_field (mstatus,MSTATUS_SPP , -get_field (hstatus,HSTATUS_SP2P )); - hstatus =set_field (hstatus,HSTATUS_SP2V ,0 ); - hstatus =set_field (hstatus,HSTATUS_SP2P ,0 ); + hstatus =set_field (hstatus,HSTATUS_SPV ,0 ); + mstatus =set_field (mstatus,MSTATUS_SPP ,0 ); mstatus =set_field (mstatus,SSTATUS_SIE ,get_field (mstatus,SSTATUS_SPIE )); mstatus =set_field (mstatus,SSTATUS_SPIE ,1 );
target/riscv/translate.c +0 -10
@@ -768,16 +768,6 @@ static void riscv_tr_init_disas_context(DisasContextBase *dcbase, CPUState *cs)#if !defined(CONFIG_USER_ONLY )if (riscv_has_ext (env,RVH )) { ctx->virt_enabled =riscv_cpu_virt_enabled (env); -if (env->priv_ver ==PRV_M && -get_field (env->mstatus,MSTATUS_MPRV ) && -MSTATUS_MPV_ISSET (env)) { - ctx->virt_enabled = true; - }else if (env->priv ==PRV_S && - !riscv_cpu_virt_enabled (env) && -get_field (env->hstatus,HSTATUS_SPRV ) && -get_field (env->hstatus,HSTATUS_SPV )) { - ctx->virt_enabled = true; - } }else { ctx->virt_enabled = false; }
Signature · 1 line
2.27.0
PATCH v3 8/13 target/riscv: Update the CSRs to the v0.6 Hyp extension
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
target/riscv/cpu_bits.h +8 -6
@@ -437,15 +437,17 @@#endif /* hstatus CSR bits */ -#define HSTATUS_SPRV 0x00000001 +#define HSTATUS_VSBE 0x00000020 +#define HSTATUS_GVA 0x00000040#define HSTATUS_SPV 0x00000080 -#define HSTATUS_SP2P 0x00000100 -#define HSTATUS_SP2V 0x00000200 +#define HSTATUS_SPVP 0x00000100 +#define HSTATUS_HU 0x00000200 +#define HSTATUS_VGEIN 0x0003F000#define HSTATUS_VTVM 0x00100000#define HSTATUS_VTSR 0x00400000 -#define HSTATUS_HU 0x00000200 -#define HSTATUS_GVA 0x00000040 -#define HSTATUS_SPVP 0x00000100 +#if defined(TARGET_RISCV64 ) +#define HSTATUS_VSXL 0x300000000 +#endif #define HSTATUS32_WPRI 0xFF8FF87E#define HSTATUS64_WPRI 0xFFFFFFFFFF8FF87EULL
Signature · 1 line
2.27.0
PATCH v3 9/13 target/riscv: Only support a single VSXL length
In reply to Alistair Francis--- target/riscv/csr.c | 9 +++++++++ 1 file changed, 9 insertions(+)
target/riscv/csr.c +9 -0
@@ -836,12 +836,21 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val)static int read_hstatus (CPURISCVState *env,int csrno,target_ulong *val) { *val = env->hstatus; +#ifdef TARGET_RISCV64 +/* We only support 64-bit VSXL */ + *val =set_field (*val,HSTATUS_VSXL ,2 ); +#endif return 0 ; }static int write_hstatus (CPURISCVState *env,int csrno,target_ulong val) { env->hstatus = val; +#ifdef TARGET_RISCV64 +if (get_field (val,HSTATUS_VSXL ) !=2 ) { +qemu_log_mask (LOG_UNIMP ,"QEMU does not support mixed HSXLEN options." ); + } +#endif return 0 ; }
Signature · 1 line
2.27.0
PATCH v3 10/13 target/riscv: Only support little endian guests
In reply to Alistair Francis--- target/riscv/csr.c | 5 +++++ 1 file changed, 5 insertions(+)
target/riscv/csr.c +5 -0
@@ -840,6 +840,8 @@ static int read_hstatus(CPURISCVState *env, int csrno, target_ulong *val)/* We only support 64-bit VSXL */ *val =set_field (*val,HSTATUS_VSXL ,2 );#endif +/* We only support little endian */ + *val =set_field (*val,HSTATUS_VSBE ,0 );return 0 ; }
@@ -851,6 +853,9 @@ static int write_hstatus(CPURISCVState *env, int csrno, target_ulong val) qemu_log_mask(LOG_UNIMP, "QEMU does not support mixed HSXLEN options."); }#endif +if (get_field (val,HSTATUS_VSBE ) !=0 ) { +qemu_log_mask (LOG_UNIMP ,"QEMU does not support big endian guests." ); + }return 0 ; }
Signature · 1 line
2.27.0
PATCH v3 11/13 target/riscv: Support the v0.6 Hypervisor extension CRSs
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 3 +++ target/riscv/csr.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)
target/riscv/cpu_bits.h +3 -0
@@ -197,9 +197,12 @@#define CSR_HIDELEG 0x603#define CSR_HIE 0x604#define CSR_HCOUNTEREN 0x606 +#define CSR_HGEIE 0x607#define CSR_HTVAL 0x643 +#define CSR_HVIP 0x645#define CSR_HIP 0x644#define CSR_HTINST 0x64A +#define CSR_HGEIP 0xE12#define CSR_HGATP 0x680#define CSR_HTIMEDELTA 0x605#define CSR_HTIMEDELTAH 0x615
target/riscv/csr.c +40 -0
@@ -883,12 +883,25 @@ static int write_hideleg(CPURISCVState *env, int csrno, target_ulong val)return 0 ; } +static int rmw_hvip (CPURISCVState *env,int csrno,target_ulong *ret_value, +target_ulong new_value,target_ulong write_mask) +{ +int ret =rmw_mip (env,0 , ret_value, new_value, + write_mask & hip_writable_mask); + + *ret_value &= hip_writable_mask; + +return ret; +} +static int rmw_hip (CPURISCVState *env,int csrno,target_ulong *ret_value,target_ulong new_value,target_ulong write_mask) {int ret =rmw_mip (env,0 , ret_value, new_value, write_mask & hip_writable_mask); + *ret_value &= hip_writable_mask; +return ret; }
@@ -916,6 +929,18 @@ static int write_hcounteren(CPURISCVState *env, int csrno, target_ulong val)return 0 ; } +static int read_hgeie (CPURISCVState *env,int csrno,target_ulong *val) +{ +qemu_log_mask (LOG_UNIMP ,"No support for a non-zero GEILEN." ); +return 0 ; +} + +static int write_hgeie (CPURISCVState *env,int csrno,target_ulong val) +{ +qemu_log_mask (LOG_UNIMP ,"No support for a non-zero GEILEN." ); +return 0 ; +} +static int read_htval (CPURISCVState *env,int csrno,target_ulong *val) { *val = env->htval;
@@ -939,6 +964,18 @@ static int write_htinst(CPURISCVState *env, int csrno, target_ulong val)return 0 ; } +static int read_hgeip (CPURISCVState *env,int csrno,target_ulong *val) +{ +qemu_log_mask (LOG_UNIMP ,"No support for a non-zero GEILEN." ); +return 0 ; +} + +static int write_hgeip (CPURISCVState *env,int csrno,target_ulong val) +{ +qemu_log_mask (LOG_UNIMP ,"No support for a non-zero GEILEN." ); +return 0 ; +} +static int read_hgatp (CPURISCVState *env,int csrno,target_ulong *val) { *val = env->hgatp;
@@ -1341,11 +1378,14 @@ static riscv_csr_operations csr_ops[CSR_TABLE_SIZE] = { [CSR_HSTATUS] = { hmode, read_hstatus, write_hstatus }, [CSR_HEDELEG] = { hmode, read_hedeleg, write_hedeleg }, [CSR_HIDELEG] = { hmode, read_hideleg, write_hideleg }, + [CSR_HVIP] = { hmode, NULL, NULL, rmw_hvip }, [CSR_HIP] = { hmode, NULL, NULL, rmw_hip }, [CSR_HIE] = { hmode, read_hie, write_hie }, [CSR_HCOUNTEREN] = { hmode, read_hcounteren, write_hcounteren }, + [CSR_HGEIE] = { hmode, read_hgeie, write_hgeie }, [CSR_HTVAL] = { hmode, read_htval, write_htval }, [CSR_HTINST] = { hmode, read_htinst, write_htinst }, + [CSR_HGEIP] = { hmode, read_hgeip, write_hgeip }, [CSR_HGATP] = { hmode, read_hgatp, write_hgatp }, [CSR_HTIMEDELTA ] = { hmode, read_htimedelta, write_htimedelta }, #if defined(TARGET_RISCV32)
Signature · 1 line
2.27.0
PATCH v3 12/13 target/riscv: Return the exception from invalid CSR accesses
In reply to Alistair FrancisWhen performing a CSR access let's return a negative exception value on an error instead of -1. This will allow us to specify the exception in future patches.
--- target/riscv/csr.c | 46 ++++++++++++++++++++-------------------- target/riscv/op_helper.c | 18 ++++++++++------ 2 files changed, 35 insertions(+), 29 deletions(-)
target/riscv/csr.c +23 -23
@@ -51,7 +51,7 @@ static int fs(CPURISCVState *env, int csrno) return 0; }if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#endif return 0 ;
@@ -73,7 +73,7 @@ static int ctr(CPURISCVState *env, int csrno)if (!cpu->cfg.ext_counters) {/* The Counters extensions is not enabled */ -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#endif return 0 ;
@@ -101,7 +101,7 @@ static int hmode(CPURISCVState *env, int csrno) } } -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }static int pmp (CPURISCVState *env,int csrno)
@@ -115,7 +115,7 @@ static int read_fflags(CPURISCVState *env, int csrno, target_ulong *val) {#if !defined(CONFIG_USER_ONLY )if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#endif *val =riscv_cpu_get_fflags (env);
@@ -126,7 +126,7 @@ static int write_fflags(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY )if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } env->mstatus |=MSTATUS_FS ;#endif
@@ -138,7 +138,7 @@ static int read_frm(CPURISCVState *env, int csrno, target_ulong *val) {#if !defined(CONFIG_USER_ONLY )if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#endif *val = env->frm;
@@ -149,7 +149,7 @@ static int write_frm(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY )if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } env->mstatus |=MSTATUS_FS ;#endif
@@ -161,7 +161,7 @@ static int read_fcsr(CPURISCVState *env, int csrno, target_ulong *val) {#if !defined(CONFIG_USER_ONLY )if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#endif *val = (riscv_cpu_get_fflags (env) <<FSR_AEXC_SHIFT )
@@ -177,7 +177,7 @@ static int write_fcsr(CPURISCVState *env, int csrno, target_ulong val) {#if !defined(CONFIG_USER_ONLY )if (!env->debugger && !riscv_cpu_fp_enabled (env)) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } env->mstatus |=MSTATUS_FS ;#endif
@@ -291,7 +291,7 @@ static int read_time(CPURISCVState *env, int csrno, target_ulong *val)uint64_t delta =riscv_cpu_virt_enabled (env) ? env->htimedelta :0 ;if (!env->rdtime_fn) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } *val = env->rdtime_fn () + delta;
@@ -304,7 +304,7 @@ static int read_timeh(CPURISCVState *env, int csrno, target_ulong *val)uint64_t delta =riscv_cpu_virt_enabled (env) ? env->htimedelta :0 ;if (!env->rdtime_fn) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } *val = (env->rdtime_fn () + delta) >>32 ;
@@ -570,7 +570,7 @@ static int write_mcounteren(CPURISCVState *env, int csrno, target_ulong val)static int read_mscounteren (CPURISCVState *env,int csrno,target_ulong *val) {if (env->priv_ver <PRIV_VERSION_1_11_0 ) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } *val = env->mcounteren;return 0 ;
@@ -580,7 +580,7 @@ static int read_mscounteren(CPURISCVState *env, int csrno, target_ulong *val)static int write_mscounteren (CPURISCVState *env,int csrno,target_ulong val) {if (env->priv_ver <PRIV_VERSION_1_11_0 ) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } env->mcounteren = val;return 0 ;
@@ -804,7 +804,7 @@ static int read_satp(CPURISCVState *env, int csrno, target_ulong *val) }if (env->priv ==PRV_S &&get_field (env->mstatus,MSTATUS_TVM )) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }else { *val = env->satp; }
@@ -821,7 +821,7 @@ static int write_satp(CPURISCVState *env, int csrno, target_ulong val) ((val ^ env->satp) & (SATP_MODE | SATP_ASID | SATP_PPN))) {if (env->priv ==PRV_S &&get_field (env->mstatus,MSTATUS_TVM )) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }else {if ((val ^ env->satp) &SATP_ASID ) {tlb_flush (env_cpu (env));
@@ -991,7 +991,7 @@ static int write_hgatp(CPURISCVState *env, int csrno, target_ulong val)static int read_htimedelta (CPURISCVState *env,int csrno,target_ulong *val) {if (!env->rdtime_fn) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#if defined(TARGET_RISCV32 )
@@ -1005,7 +1005,7 @@ static int read_htimedelta(CPURISCVState *env, int csrno, target_ulong *val)static int write_htimedelta (CPURISCVState *env,int csrno,target_ulong val) {if (!env->rdtime_fn) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#if defined(TARGET_RISCV32 )
@@ -1020,7 +1020,7 @@ static int write_htimedelta(CPURISCVState *env, int csrno, target_ulong val)static int read_htimedeltah (CPURISCVState *env,int csrno,target_ulong *val) {if (!env->rdtime_fn) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } *val = env->htimedelta >>32 ;
@@ -1030,7 +1030,7 @@ static int read_htimedeltah(CPURISCVState *env, int csrno, target_ulong *val)static int write_htimedeltah (CPURISCVState *env,int csrno,target_ulong val) {if (!env->rdtime_fn) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; } env->htimedelta =deposit64 (env->htimedelta,32 ,32 , (uint64_t )val);
@@ -1228,18 +1228,18 @@ int riscv_csrrw(CPURISCVState *env, int csrno, target_ulong *ret_value,if ((write_mask && read_only) || (!env->debugger && (effective_priv <get_field (csrno,0x300 )))) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }#endif /* ensure the CSR extension is enabled. */ if (!cpu->cfg.ext_icsr) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }/* check predicate */ if (!csr_ops[csrno].predicate || csr_ops[csrno].predicate (env, csrno) <0 ) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }/* execute combined read/write operation if it exists */
@@ -1249,7 +1249,7 @@ int riscv_csrrw(CPURISCVState *env, int csrno, target_ulong *ret_value,/* if no accessor exists then return failure */ if (!csr_ops[csrno].read) { -return -1 ; +return -RISCV_EXCP_ILLEGAL_INST ; }/* read old value */
target/riscv/op_helper.c +12 -6
@@ -43,8 +43,10 @@ target_ulong helper_csrrw(CPURISCVState *env, target_ulong src, target_ulong csr) {target_ulong val =0 ; -if (riscv_csrrw (env, csr, &val, src,-1 ) <0 ) { -riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); +int ret =riscv_csrrw (env, csr, &val, src,-1 ); + +if (ret <0 ) { +riscv_raise_exception (env, -ret,GETPC ()); }return val; }
@@ -53,8 +55,10 @@ target_ulong helper_csrrs(CPURISCVState *env, target_ulong src, target_ulong csr, target_ulong rs1_pass) {target_ulong val =0 ; -if (riscv_csrrw (env, csr, &val,-1 , rs1_pass ? src :0 ) <0 ) { -riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); +int ret =riscv_csrrw (env, csr, &val,-1 , rs1_pass ? src :0 ); + +if (ret <0 ) { +riscv_raise_exception (env, -ret,GETPC ()); }return val; }
@@ -63,8 +67,10 @@ target_ulong helper_csrrc(CPURISCVState *env, target_ulong src, target_ulong csr, target_ulong rs1_pass) {target_ulong val =0 ; -if (riscv_csrrw (env, csr, &val,0 , rs1_pass ? src :0 ) <0 ) { -riscv_raise_exception (env,RISCV_EXCP_ILLEGAL_INST ,GETPC ()); +int ret =riscv_csrrw (env, csr, &val,0 , rs1_pass ? src :0 ); + +if (ret <0 ) { +riscv_raise_exception (env, -ret,GETPC ()); }return val; }
Signature · 1 line
2.27.0
PATCH v3 13/13 target/riscv: Support the Virtual Instruction fault
In reply to Alistair Francis--- target/riscv/cpu_bits.h | 6 +++ target/riscv/helper.h | 1 + target/riscv/csr.c | 64 ++++++++++++++++++++++++- target/riscv/insn_trans/trans_rvh.inc.c | 2 +- target/riscv/op_helper.c | 42 ++++++++++++++-- 5 files changed, 109 insertions(+), 6 deletions(-)
target/riscv/cpu_bits.h +6 -0
@@ -461,6 +461,11 @@#define HSTATUS_WPRI HSTATUS64_WPRI#endif +#define HCOUNTEREN_CY (1 << 0) +#define HCOUNTEREN_TM (1 << 1) +#define HCOUNTEREN_IR (1 << 2) +#define HCOUNTEREN_HPM3 (1 << 3) +/* Privilege modes */ #define PRV_U 0#define PRV_S 1
@@ -553,6 +558,7 @@#define RISCV_EXCP_STORE_PAGE_FAULT 0xf/* since: priv-1.10.0 */ #define RISCV_EXCP_INST_GUEST_PAGE_FAULT 0x14#define RISCV_EXCP_LOAD_GUEST_ACCESS_FAULT 0x15 +#define RISCV_EXCP_VIRT_INSTRUCTION_FAULT 0x16#define RISCV_EXCP_STORE_GUEST_AMO_ACCESS_FAULT 0x17#define RISCV_EXCP_INT_FLAG 0x80000000
target/riscv/helper.h +1 -0
@@ -80,6 +80,7 @@ DEF_HELPER_1(tlb_flush, void, env)/* Hypervisor functions */ #ifndef CONFIG_USER_ONLY DEF_HELPER_1(hyp_tlb_flush, void, env) +DEF_HELPER_1(hyp_gvma_tlb_flush, void, env) DEF_HELPER_4(hyp_load, tl, env, tl, tl, tl) DEF_HELPER_5(hyp_store, void, env, tl, tl, tl, tl)DEF_HELPER_4 (hyp_x_load, tl, env, tl, tl, tl)
target/riscv/csr.c +63 -1
90 lines not on this page · raw message
target/riscv/insn_trans/trans_rvh.inc.c +1 -1
@@ -360,7 +360,7 @@ static bool trans_hfence_gvma(DisasContext *ctx, arg_sfence_vma *a) {REQUIRE_EXT (ctx,RVH );#ifndef CONFIG_USER_ONLY -gen_helper_hyp_tlb_flush (cpu_env); +gen_helper_hyp_gvma_tlb_flush (cpu_env);return true;#endif return false;
target/riscv/op_helper.c +38 -4
90 lines not on this page · raw message
Signature · 1 line
2.27.0
Quoted 11 lines · Alistair Francis
This series updates the experimental QEMU RISC-V Hypervisor spec to the v0.6.1 draft implementation.
THis includes support for the new 2-stage lookup instructions and the new CSRs.
It also includes the new 0.6.1 support for the virtual instruction fault.
This was tested by running 32-bit and 64-bit Xvisor on QEMU and starting Linux guests.
Hi Alistair,
I am reading Christoper Dall's article on ARM virtualization. As far as I can see, Xvisor is type 1 hypervisor.
I want to try this patch set. Could you share the method? Thanks very much.
Best Regards,
Zhiwei
Quoted 34 lines
v3:
- Rebase on master
v2:
- Update to v0.6.1Alistair Francis (13):
target/riscv: Allow setting a two-stage lookup in the virt status target/riscv: Allow generating hlv/hlvx/hsv instructions target/riscv: Do two-stage lookups on hlv/hlvx/hsv instructions target/riscv: Don't allow guest to write to htinst target/riscv: Convert MSTATUS MTL to GVA
target/riscv: Fix the interrupt cause code target/riscv: Update the Hypervisor trap return/entry target/riscv: Update the CSRs to the v0.6 Hyp extension target/riscv: Only support a single VSXL length target/riscv: Only support little endian guests target/riscv: Support the v0.6 Hypervisor extension CRSs target/riscv: Return the exception from invalid CSR accesses target/riscv: Support the Virtual Instruction faulttarget/riscv/cpu.h | 2 + target/riscv/cpu_bits.h | 25 +- target/riscv/helper.h | 4 + target/riscv/insn32-64.decode | 5 + target/riscv/insn32.decode | 11 + target/riscv/cpu_helper.c | 123 +++++---- target/riscv/csr.c | 171 ++++++++++-- target/riscv/insn_trans/trans_rvh.inc.c | 342 +++++++++++++++++++++++- target/riscv/op_helper.c | 176 +++++++++++- target/riscv/translate.c | 10 - 10 files changed, 761 insertions(+), 108 deletions(-)
Quoted 13 lines · LIU Zhiwei
Quoted 9 lines · Alistair Francis
This series updates the experimental QEMU RISC-V Hypervisor spec to the v0.6.1 draft implementation.
THis includes support for the new 2-stage lookup instructions and the new CSRs.
It also includes the new 0.6.1 support for the virtual instruction fault.
Quoted 6 lines
Quoted 2 lines
This was tested by running 32-bit and 64-bit Xvisor on QEMU and starting Linux guests.
Hi Alistair,
I am reading Christoper Dall's article on ARM virtualization. As far as I can see, Xvisor is type 1 hypervisor.
Yep, it's a bare metal Hypervisor.
Quoted 2 lines
I want to try this patch set. Could you share the method? Thanks very much.
There are some details in the origins submission, you can see them
here: https://patchew.org/QEMU/[email protected]/
I'm also working on improving the support in meta-virtualisation to help as well.
Thanks for helping test.
Alistair
Quoted 38 lines
Best Regards,
ZhiweiQuoted 34 lines
v3:
- Rebase on master
v2:
- Update to v0.6.1Alistair Francis (13):
target/riscv: Allow setting a two-stage lookup in the virt status target/riscv: Allow generating hlv/hlvx/hsv instructions target/riscv: Do two-stage lookups on hlv/hlvx/hsv instructions target/riscv: Don't allow guest to write to htinst target/riscv: Convert MSTATUS MTL to GVA
target/riscv: Fix the interrupt cause code target/riscv: Update the Hypervisor trap return/entry target/riscv: Update the CSRs to the v0.6 Hyp extension target/riscv: Only support a single VSXL length target/riscv: Only support little endian guests target/riscv: Support the v0.6 Hypervisor extension CRSs target/riscv: Return the exception from invalid CSR accesses target/riscv: Support the Virtual Instruction faulttarget/riscv/cpu.h | 2 + target/riscv/cpu_bits.h | 25 +- target/riscv/helper.h | 4 + target/riscv/insn32-64.decode | 5 + target/riscv/insn32.decode | 11 + target/riscv/cpu_helper.c | 123 +++++---- target/riscv/csr.c | 171 ++++++++++-- target/riscv/insn_trans/trans_rvh.inc.c | 342 +++++++++++++++++++++++- target/riscv/op_helper.c | 176 +++++++++++- target/riscv/translate.c | 10 - 10 files changed, 761 insertions(+), 108 deletions(-)