KVM: arm64: Fix handling of TCR2_EL1
Marc Zyngier
maintainercover KVM: arm64: Fix handling of TCR2_EL1
As I'm inching towards supporting FEAT_S1PIE in a NV guest (oh, the fun I'm having!), it has become obvious that we're missing the basics when it comes to:
- VM configuration: HCRX_EL2.TCR2En is forced to 1, and we blindly save/restore stuff.
- trap bit description and routing: none, obviously, since we make a point in not trapping.
Given that these are prerequisites for the NV work and that we should have had that from the beginning, I would like to plug them before piling more patches on top.
Marc Zyngier (5):
KVM: arm64: Correctly honor the presence of FEAT_TCRX
KVM: arm64: Get rid of HCRX_GUEST_FLAGS
KVM: arm64: Make TCR2_EL1 save/restore dependent on the VM features
KVM: arm64: Make PIR{,E0}_EL1 save/restore conditional on FEAT_TCRX
KVM: arm64: Honor trap routing for TCR2_EL1
arch/arm64/include/asm/kvm_arm.h | 1 - arch/arm64/kvm/emulate-nested.c | 13 ++++++++ arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 35 +++++++++++++++------- arch/arm64/kvm/sys_regs.c | 17 ++++++++++- 4 files changed, 54 insertions(+), 12 deletions(-)
Signature · 1 line
2.39.2
Marc Zyngier
maintainerPATCH 1/5 KVM: arm64: Correctly honor the presence of FEAT_TCRX
We currently blindly enable TCR2_EL1 use in a guest, irrespective of the feature set. This is obviously wrong, and we should actually honor the guest configuration and handle the possible trap resulting from the guest being buggy.
--- arch/arm64/include/asm/kvm_arm.h | 2 +- arch/arm64/kvm/sys_regs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)
arch/arm64/include/asm/kvm_arm.h +1 -1
@@ -102,7 +102,7 @@#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) -#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME | HCRX_EL2_TCR2En) +#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)/* TCR_EL2 Registers bits */
arch/arm64/kvm/sys_regs.c +9 -0
@@ -383,6 +383,12 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,bool was_enabled =vcpu_has_cache_enabled (vcpu);u64 val, mask, shift; +if (reg_to_encoding (r) ==SYS_TCR2_EL1 && + !kvm_has_feat (vcpu->kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) { +kvm_inject_undefined (vcpu); +return false; + } +BUG_ON (!p->is_write);get_access_mask (r, &mask, &shift);
@@ -4060,6 +4066,9 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu)if (kvm_has_feat (kvm,ID_AA64ISAR2_EL1 ,MOPS ,IMP )) vcpu->arch.hcrx_el2 |= (HCRX_EL2_MSCEn |HCRX_EL2_MCE2 ); + +if (kvm_has_feat (kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) + vcpu->arch.hcrx_el2 |= HCRX_EL2_TCR2En; }if (test_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags))
Signature · 1 line
2.39.2
Re: [PATCH 1/5] KVM: arm64: Correctly honor the presence of FEAT_TCRX
Quoted 29 lines · Marc Zyngier
We currently blindly enable
TCR2_EL1use in a guest, irrespective of the feature set. This is obviously wrong, and we should actually honor the guest configuration and handle the possible trap resulting from the guest being buggy.Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/include/asm/kvm_arm.h | 2 +- arch/arm64/kvm/sys_regs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)arch/arm64/include/asm/kvm_arm.h +1
-1@@ -102,7 +102,7 @@#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) -#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME | HCRX_EL2_TCR2En) +#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)/* TCR_EL2 Registers bits */ arch/arm64/kvm/sys_regs.c +0
-0
arch/arm64/kvm/sys_regs.c static bool access_vm_reg(struct kvm_vcpu *vcpu, · line 391
Quoted 9 lines
arch/arm64/kvm/sys_regs.c +6
-0@@ -383,6 +383,12 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,bool was_enabled =vcpu_has_cache_enabled (vcpu);u64 val, mask, shift; +if (reg_to_encoding (r) ==SYS_TCR2_EL1 && + !kvm_has_feat (vcpu->kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) { +kvm_inject_undefined (vcpu); +return false; + } +
If we need to start doing this with more vm(sa) registers, it might make sense to think of a way to do this without putting a big if/else in here. For now this is seems fine.
arch/arm64/kvm/sys_regs.c void kvm_init_sysreg(struct kvm_vcpu *vcpu) · line 4074
Quoted 13 lines
arch/arm64/kvm/sys_regs.c +3
-0BUG_ON (!p->is_write);get_access_mask (r, &mask, &shift);@@ -4060,6 +4066,9 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu)if (kvm_has_feat (kvm,ID_AA64ISAR2_EL1 ,MOPS ,IMP )) vcpu->arch.hcrx_el2 |= (HCRX_EL2_MSCEn |HCRX_EL2_MCE2 ); + +if (kvm_has_feat (kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) + vcpu->arch.hcrx_el2 |= HCRX_EL2_TCR2En; }if (test_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags))
Marc Zyngier
maintainerRe: [PATCH 1/5] KVM: arm64: Correctly honor the presence of FEAT_TCRX
Quoted 34 lines · Joey Gouly
Quoted 32 lines · Marc Zyngier
We currently blindly enable
TCR2_EL1use in a guest, irrespective of the feature set. This is obviously wrong, and we should actually honor the guest configuration and handle the possible trap resulting from the guest being buggy.Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/include/asm/kvm_arm.h | 2 +- arch/arm64/kvm/sys_regs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)arch/arm64/include/asm/kvm_arm.h +1
-1@@ -102,7 +102,7 @@#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) -#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME | HCRX_EL2_TCR2En) +#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)/* TCR_EL2 Registers bits */ arch/arm64/kvm/sys_regs.c +0
-0@@ -383,6 +383,12 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,bool was_enabled =vcpu_has_cache_enabled (vcpu);u64 val, mask, shift;
Quoted 10 lines
arch/arm64/kvm/sys_regs.c static bool access_vm_reg(struct kvm_vcpu *vcpu, · line 391
Quoted 6 lines
arch/arm64/kvm/sys_regs.c +6
-0+if (reg_to_encoding (r) ==SYS_TCR2_EL1 && + !kvm_has_feat (vcpu->kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) { +kvm_inject_undefined (vcpu); +return false; + } +If we need to start doing this with more vm(sa) registers, it might make sense to think of a way to do this without putting a big if/else in here. For now this is seems fine.
One possible solution would be to mimic the FGU behaviour and have a shadow version of HCRX_EL2 that only indicates the trap routing code that something trapped through that bit needs to UNDEF.
And yes, I'd expect we'll see a whole lot of new VMSA registers going the same way.
Quoted 13 lines
Quoted 13 lines
arch/arm64/kvm/sys_regs.c +3
-0BUG_ON (!p->is_write);get_access_mask (r, &mask, &shift);@@ -4060,6 +4066,9 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu)if (kvm_has_feat (kvm,ID_AA64ISAR2_EL1 ,MOPS ,IMP )) vcpu->arch.hcrx_el2 |= (HCRX_EL2_MSCEn |HCRX_EL2_MCE2 ); + +if (kvm_has_feat (kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) + vcpu->arch.hcrx_el2 |= HCRX_EL2_TCR2En; }
Quoted 3 lines
arch/arm64/kvm/sys_regs.c void kvm_init_sysreg(struct kvm_vcpu *vcpu) · line 4074
Quoted 1 line
arch/arm64/kvm/sys_regs.c +0
-0if (test_bit (KVM_ARCH_FLAG_FGU_INITIALIZED , &kvm->arch.flags))Reviewed-by Joey Gouly <[email protected]>
Thanks!
M.
Signature · 1 line
Without deviation from the norm, progress is not possible.
Re: [PATCH 1/5] KVM: arm64: Correctly honor the presence of FEAT_TCRX
Quoted 47 lines · Marc Zyngier
Quoted 34 lines · Joey Gouly
Quoted 32 lines · Marc Zyngier
We currently blindly enable
TCR2_EL1use in a guest, irrespective of the feature set. This is obviously wrong, and we should actually honor the guest configuration and handle the possible trap resulting from the guest being buggy.Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/include/asm/kvm_arm.h | 2 +- arch/arm64/kvm/sys_regs.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)arch/arm64/include/asm/kvm_arm.h +1
-1@@ -102,7 +102,7 @@#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) -#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME | HCRX_EL2_TCR2En) +#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)/* TCR_EL2 Registers bits */ arch/arm64/kvm/sys_regs.c +0
-0@@ -383,6 +383,12 @@ static bool access_vm_reg(struct kvm_vcpu *vcpu,bool was_enabled =vcpu_has_cache_enabled (vcpu);u64 val, mask, shift;Quoted 10 lines
arch/arm64/kvm/sys_regs.c static bool access_vm_reg(struct kvm_vcpu *vcpu, · line 391
Quoted 6 lines
arch/arm64/kvm/sys_regs.c +6
-0+if (reg_to_encoding (r) ==SYS_TCR2_EL1 && + !kvm_has_feat (vcpu->kvm,ID_AA64MMFR3_EL1 ,TCRX ,IMP )) { +kvm_inject_undefined (vcpu); +return false; + } +If we need to start doing this with more vm(sa) registers, it might make sense to think of a way to do this without putting a big if/else in here. For now this is seems fine.
Quoted 3 lines
One possible solution would be to mimic the FGU behaviour and have a shadow version of
HCRX_EL2that only indicates the trap routing code that something trapped through that bit needs to UNDEF.
Seems reasonable, but that'll be the problem for the _next_ person to add an affected register ;-)
Signature · 2 lines
Thanks, Oliver
Marc Zyngier
maintainerPATCH 2/5 KVM: arm64: Get rid of HCRX_GUEST_FLAGS
In reply to Marc ZyngierHCRX_GUEST_FLAGS gives random KVM hackers the impression that they can stuff bits in this macro and unconditionally enable features in the guest.
In general, this is wrong (we have been there with FEAT_MOPS, and again with FEAT_TCRX).
Document that HCRX_EL2.SMPME is an exception rather than the rule, and get rid of HCRX_GUEST_FLAGS.
--- arch/arm64/include/asm/kvm_arm.h | 1 - arch/arm64/kvm/sys_regs.c | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)
arch/arm64/include/asm/kvm_arm.h +0 -1
@@ -102,7 +102,6 @@#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) -#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)/* TCR_EL2 Registers bits */
arch/arm64/kvm/sys_regs.c +7 -1
@@ -4062,7 +4062,13 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) vcpu->arch.hcr_el2 |=HCR_TTLBOS ;if (cpus_have_final_cap (ARM64_HAS_HCX )) { - vcpu->arch.hcrx_el2 =HCRX_GUEST_FLAGS ; +/* +* In general, all HCRX_EL2 bits are gated by a feature. +* The only reason we can set SMPME without checking any +* feature is that its effects are not directly observable +* from the guest. +*/ + vcpu->arch.hcrx_el2 =HCRX_EL2_SMPME ;if (kvm_has_feat (kvm,ID_AA64ISAR2_EL1 ,MOPS ,IMP )) vcpu->arch.hcrx_el2 |= (HCRX_EL2_MSCEn |HCRX_EL2_MCE2 );
Signature · 1 line
2.39.2
Re: [PATCH 2/5] KVM: arm64: Get rid of HCRX_GUEST_FLAGS
Quoted 37 lines · Marc Zyngier
HCRX_GUEST_FLAGSgives random KVM hackers the impression that they can stuff bits in this macro and unconditionally enable features in the guest.In general, this is wrong (we have been there with
FEAT_MOPS, and again withFEAT_TCRX).Document that HCRX_EL2.SMPME is an exception rather than the rule, and get rid of
HCRX_GUEST_FLAGS.Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/include/asm/kvm_arm.h | 1 - arch/arm64/kvm/sys_regs.c | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-)arch/arm64/include/asm/kvm_arm.h +0
-1@@ -102,7 +102,6 @@#define HCR_HOST_NVHE_PROTECTED_FLAGS (HCR_HOST_NVHE_FLAGS | HCR_TSC)#define HCR_HOST_VHE_FLAGS (HCR_RW | HCR_TGE | HCR_E2H) -#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)#define HCRX_HOST_FLAGS (HCRX_EL2_MSCEn | HCRX_EL2_TCR2En | HCRX_EL2_EnFPM)/* TCR_EL2 Registers bits */ arch/arm64/kvm/sys_regs.c +0
-1@@ -4062,7 +4062,13 @@ void kvm_init_sysreg(struct kvm_vcpu *vcpu) vcpu->arch.hcr_el2 |=HCR_TTLBOS ;if (cpus_have_final_cap (ARM64_HAS_HCX )) { - vcpu->arch.hcrx_el2 =HCRX_GUEST_FLAGS ;
arch/arm64/kvm/sys_regs.c void kvm_init_sysreg(struct kvm_vcpu *vcpu) · line 4074
Quoted 10 lines
arch/arm64/kvm/sys_regs.c +7
-0+/* +* In general, all HCRX_EL2 bits are gated by a feature. +* The only reason we can set SMPME without checking any +* feature is that its effects are not directly observable +* from the guest. +*/ + vcpu->arch.hcrx_el2 =HCRX_EL2_SMPME ;if (kvm_has_feat (kvm,ID_AA64ISAR2_EL1 ,MOPS ,IMP )) vcpu->arch.hcrx_el2 |= (HCRX_EL2_MSCEn |HCRX_EL2_MCE2 );
Marc Zyngier
maintainerPATCH 3/5 KVM: arm64: Make TCR2_EL1 save/restore dependent on the VM features
In reply to Marc ZyngierAs for other registers, save/restore of TCR2_EL1 should be gated on the feature being actually present.
In the case of a nVHE hypervisor, it is perfectly fine to leave the host value in the register, as HCRX_EL2.TCREn==0 imposes that TCR2_EL1 is treated as 0.
--- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h +13 -2
@@ -55,6 +55,17 @@ static inline bool ctxt_has_s1pie(struct kvm_cpu_context *ctxt)return kvm_has_feat (kern_hyp_va (vcpu->kvm),ID_AA64MMFR3_EL1 ,S1PIE ,IMP ); } +static inline bool ctxt_has_tcrx (struct kvm_cpu_context *ctxt) +{ +struct kvm_vcpu *vcpu; + +if (!cpus_have_final_cap (ARM64_HAS_TCR2 )) +return false; + + vcpu =ctxt_to_vcpu (ctxt); +return kvm_has_feat (kern_hyp_va (vcpu->kvm),ID_AA64MMFR3_EL1 ,TCRX ,IMP ); +} +static inline void __sysreg_save_el1_state (struct kvm_cpu_context *ctxt) {ctxt_sys_reg (ctxt,SCTLR_EL1 ) =read_sysreg_el1 (SYS_SCTLR );
@@ -62,7 +73,7 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt)ctxt_sys_reg (ctxt,TTBR0_EL1 ) =read_sysreg_el1 (SYS_TTBR0 );ctxt_sys_reg (ctxt,TTBR1_EL1 ) =read_sysreg_el1 (SYS_TTBR1 );ctxt_sys_reg (ctxt,TCR_EL1 ) =read_sysreg_el1 (SYS_TCR ); -if (cpus_have_final_cap (ARM64_HAS_TCR2 )) +if (ctxt_has_tcrx (ctxt))ctxt_sys_reg (ctxt,TCR2_EL1 ) =read_sysreg_el1 (SYS_TCR2 );ctxt_sys_reg (ctxt,ESR_EL1 ) =read_sysreg_el1 (SYS_ESR );ctxt_sys_reg (ctxt,AFSR0_EL1 ) =read_sysreg_el1 (SYS_AFSR0 );
@@ -138,7 +149,7 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt)write_sysreg_el1 (ctxt_sys_reg (ctxt,CPACR_EL1 ),SYS_CPACR );write_sysreg_el1 (ctxt_sys_reg (ctxt,TTBR0_EL1 ),SYS_TTBR0 );write_sysreg_el1 (ctxt_sys_reg (ctxt,TTBR1_EL1 ),SYS_TTBR1 ); -if (cpus_have_final_cap (ARM64_HAS_TCR2 )) +if (ctxt_has_tcrx (ctxt))write_sysreg_el1 (ctxt_sys_reg (ctxt,TCR2_EL1 ),SYS_TCR2 );write_sysreg_el1 (ctxt_sys_reg (ctxt,ESR_EL1 ),SYS_ESR );write_sysreg_el1 (ctxt_sys_reg (ctxt,AFSR0_EL1 ),SYS_AFSR0 );
Signature · 1 line
2.39.2
Marc Zyngier
maintainerPATCH 4/4 KVM: arm64: Honor trap routing for TCR2_EL1
In reply to Marc ZyngierTCR2_EL1 handling is missing the handling of its trap configuration:
- HCRX_EL2.TCR2En must be handled in conjunction with HCR_EL2.{TVM,TRVM}
- HFG{R,W}TR_EL2.TCR_EL1 does apply to TCR2_EL1 as well
Without these two controls being implemented, it is impossible to correctly route TCR2_EL1 traps.
--- arch/arm64/kvm/emulate-nested.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/kvm/emulate-nested.c +13 -0
@@ -79,6 +79,8 @@ enum cgt_group_id {CGT_MDCR_E2TB ,CGT_MDCR_TDCC , + CGT_HCRX_TCR2En, +/* * Anything after this point is a combination of coarse trap * controls, which must all be evaluated to decide what to do.
@@ -89,6 +91,7 @@ enum cgt_group_id {CGT_HCR_TTLB_TTLBIS ,CGT_HCR_TTLB_TTLBOS ,CGT_HCR_TVM_TRVM , + CGT_HCR_TVM_TRVM_HCRX_TCR2En,CGT_HCR_TPU_TICAB ,CGT_HCR_TPU_TOCU , CGT_HCR_NV1_nNV2_ENSCXT,
@@ -345,6 +348,12 @@ static const struct trap_bits coarse_trap_bits[] = { .mask = MDCR_EL2_TDCC, .behaviour = BEHAVE_FORWARD_ANY, }, + [CGT_HCRX_TCR2En] = { + .index = HCRX_EL2, + .value = 0, + .mask = HCRX_EL2_TCR2En, + .behaviour = BEHAVE_FORWARD_ANY, + }, };#define MCB (id, ...) \
@@ -359,6 +368,8 @@ static const enum cgt_group_id *coarse_control_combo[] = {MCB (CGT_HCR_TTLB_TTLBIS ,CGT_HCR_TTLB ,CGT_HCR_TTLBIS ),MCB (CGT_HCR_TTLB_TTLBOS ,CGT_HCR_TTLB ,CGT_HCR_TTLBOS ),MCB (CGT_HCR_TVM_TRVM ,CGT_HCR_TVM ,CGT_HCR_TRVM ), +MCB (CGT_HCR_TVM_TRVM_HCRX_TCR2En, +CGT_HCR_TVM ,CGT_HCR_TRVM , CGT_HCRX_TCR2En),MCB (CGT_HCR_TPU_TICAB ,CGT_HCR_TPU ,CGT_HCR_TICAB ),MCB (CGT_HCR_TPU_TOCU ,CGT_HCR_TPU ,CGT_HCR_TOCU ), MCB(CGT_HCR_NV1_nNV2_ENSCXT, CGT_HCR_NV1_nNV2, CGT_HCR_ENSCXT),
@@ -622,6 +633,7 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = {SR_TRAP (SYS_MAIR_EL1 ,CGT_HCR_TVM_TRVM ),SR_TRAP (SYS_AMAIR_EL1 ,CGT_HCR_TVM_TRVM ),SR_TRAP (SYS_CONTEXTIDR_EL1 ,CGT_HCR_TVM_TRVM ), +SR_TRAP (SYS_TCR2_EL1 , CGT_HCR_TVM_TRVM_HCRX_TCR2En),SR_TRAP (SYS_DC_ZVA ,CGT_HCR_TDZ ),SR_TRAP (SYS_DC_GVA ,CGT_HCR_TDZ ), SR_TRAP(SYS_DC_GZVA, CGT_HCR_TDZ),
@@ -1071,6 +1083,7 @@ static const struct encoding_to_trap_config encoding_to_fgt[] __initconst = {SR_FGT (SYS_TPIDRRO_EL0 , HFGxTR,TPIDRRO_EL0 ,1 ),SR_FGT (SYS_TPIDR_EL1 , HFGxTR,TPIDR_EL1 ,1 ),SR_FGT (SYS_TCR_EL1 , HFGxTR,TCR_EL1 ,1 ), +SR_FGT (SYS_TCR2_EL1 , HFGxTR,TCR_EL1 ,1 ),SR_FGT (SYS_SCXTNUM_EL0 , HFGxTR,SCXTNUM_EL0 ,1 ),SR_FGT (SYS_SCXTNUM_EL1 , HFGxTR,SCXTNUM_EL1 ,1 ), SR_FGT(SYS_SCTLR_EL1, HFGxTR, SCTLR_EL1, 1),
Signature · 1 line
2.39.2
Marc Zyngier
maintainerRe: [PATCH 4/4] KVM: arm64: Honor trap routing for TCR2_EL1
Quoted 7 lines · Marc Zyngier
TCR2_EL1handling is missing the handling of its trap configuration:- HCRX_EL2.TCR2En must be handled in conjunction with HCR_EL2.{TVM,TRVM}
- HFG{R,W}TR_EL2.TCR_EL1 does apply to
TCR2_EL1as well
Quoted 7 lines
Without these two controls being implemented, it is impossible to correctly route
TCR2_EL1traps.Signed-off-by Marc Zyngier <[email protected]>--- arch/arm64/kvm/emulate-nested.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
Gahh, stale staging directory, please ignore this patch (5/5 is the same).
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Marc Zyngier
maintainerPATCH 4/5 KVM: arm64: Make PIR{,E0}_EL1 save/restore conditional on FEAT_TCRX
In reply to Marc ZyngierAs per the architecture, if FEAT_S1PIE is implemented, then FEAT_TCRX must be implemented as well.
Take advantage of this to avoid checking for S1PIE when TCRX isn't implemented.
--- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-)
arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h +14 -10
@@ -73,8 +73,14 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt)ctxt_sys_reg (ctxt,TTBR0_EL1 ) =read_sysreg_el1 (SYS_TTBR0 );ctxt_sys_reg (ctxt,TTBR1_EL1 ) =read_sysreg_el1 (SYS_TTBR1 );ctxt_sys_reg (ctxt,TCR_EL1 ) =read_sysreg_el1 (SYS_TCR ); -if (ctxt_has_tcrx (ctxt)) +if (ctxt_has_tcrx (ctxt)) {ctxt_sys_reg (ctxt,TCR2_EL1 ) =read_sysreg_el1 (SYS_TCR2 ); + +if (ctxt_has_s1pie (ctxt)) { +ctxt_sys_reg (ctxt,PIR_EL1 ) =read_sysreg_el1 (SYS_PIR ); +ctxt_sys_reg (ctxt,PIRE0_EL1 ) =read_sysreg_el1 (SYS_PIRE0 ); + } + }ctxt_sys_reg (ctxt,ESR_EL1 ) =read_sysreg_el1 (SYS_ESR );ctxt_sys_reg (ctxt,AFSR0_EL1 ) =read_sysreg_el1 (SYS_AFSR0 );ctxt_sys_reg (ctxt,AFSR1_EL1 ) =read_sysreg_el1 (SYS_AFSR1 );
@@ -84,10 +90,6 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt)ctxt_sys_reg (ctxt,CONTEXTIDR_EL1 ) =read_sysreg_el1 (SYS_CONTEXTIDR );ctxt_sys_reg (ctxt,AMAIR_EL1 ) =read_sysreg_el1 (SYS_AMAIR );ctxt_sys_reg (ctxt,CNTKCTL_EL1 ) =read_sysreg_el1 (SYS_CNTKCTL ); -if (ctxt_has_s1pie (ctxt)) { -ctxt_sys_reg (ctxt,PIR_EL1 ) =read_sysreg_el1 (SYS_PIR ); -ctxt_sys_reg (ctxt,PIRE0_EL1 ) =read_sysreg_el1 (SYS_PIRE0 ); - }ctxt_sys_reg (ctxt,PAR_EL1 ) =read_sysreg_par ();ctxt_sys_reg (ctxt,TPIDR_EL1 ) =read_sysreg (tpidr_el1);
@@ -149,8 +151,14 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt)write_sysreg_el1 (ctxt_sys_reg (ctxt,CPACR_EL1 ),SYS_CPACR );write_sysreg_el1 (ctxt_sys_reg (ctxt,TTBR0_EL1 ),SYS_TTBR0 );write_sysreg_el1 (ctxt_sys_reg (ctxt,TTBR1_EL1 ),SYS_TTBR1 ); -if (ctxt_has_tcrx (ctxt)) +if (ctxt_has_tcrx (ctxt)) {write_sysreg_el1 (ctxt_sys_reg (ctxt,TCR2_EL1 ),SYS_TCR2 ); + +if (ctxt_has_s1pie (ctxt)) { +write_sysreg_el1 (ctxt_sys_reg (ctxt,PIR_EL1 ),SYS_PIR ); +write_sysreg_el1 (ctxt_sys_reg (ctxt,PIRE0_EL1 ),SYS_PIRE0 ); + } + }write_sysreg_el1 (ctxt_sys_reg (ctxt,ESR_EL1 ),SYS_ESR );write_sysreg_el1 (ctxt_sys_reg (ctxt,AFSR0_EL1 ),SYS_AFSR0 );write_sysreg_el1 (ctxt_sys_reg (ctxt,AFSR1_EL1 ),SYS_AFSR1 );
@@ -160,10 +168,6 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt)write_sysreg_el1 (ctxt_sys_reg (ctxt,CONTEXTIDR_EL1 ),SYS_CONTEXTIDR );write_sysreg_el1 (ctxt_sys_reg (ctxt,AMAIR_EL1 ),SYS_AMAIR );write_sysreg_el1 (ctxt_sys_reg (ctxt,CNTKCTL_EL1 ),SYS_CNTKCTL ); -if (ctxt_has_s1pie (ctxt)) { -write_sysreg_el1 (ctxt_sys_reg (ctxt,PIR_EL1 ),SYS_PIR ); -write_sysreg_el1 (ctxt_sys_reg (ctxt,PIRE0_EL1 ),SYS_PIRE0 ); - }write_sysreg (ctxt_sys_reg (ctxt,PAR_EL1 ), par_el1);write_sysreg (ctxt_sys_reg (ctxt,TPIDR_EL1 ), tpidr_el1);
Signature · 1 line
2.39.2
Marc Zyngier
maintainerPATCH 5/5 KVM: arm64: Honor trap routing for TCR2_EL1
In reply to Marc ZyngierTCR2_EL1 handling is missing the handling of its trap configuration:
- HCRX_EL2.TCR2En must be handled in conjunction with HCR_EL2.{TVM,TRVM}
- HFG{R,W}TR_EL2.TCR_EL1 does apply to TCR2_EL1 as well
Without these two controls being implemented, it is impossible to correctly route TCR2_EL1 traps.
--- arch/arm64/kvm/emulate-nested.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/kvm/emulate-nested.c +13 -0
@@ -79,6 +79,8 @@ enum cgt_group_id {CGT_MDCR_E2TB ,CGT_MDCR_TDCC , + CGT_HCRX_TCR2En, +/* * Anything after this point is a combination of coarse trap * controls, which must all be evaluated to decide what to do.
@@ -89,6 +91,7 @@ enum cgt_group_id {CGT_HCR_TTLB_TTLBIS ,CGT_HCR_TTLB_TTLBOS ,CGT_HCR_TVM_TRVM , + CGT_HCR_TVM_TRVM_HCRX_TCR2En,CGT_HCR_TPU_TICAB ,CGT_HCR_TPU_TOCU , CGT_HCR_NV1_nNV2_ENSCXT,
@@ -345,6 +348,12 @@ static const struct trap_bits coarse_trap_bits[] = { .mask = MDCR_EL2_TDCC, .behaviour = BEHAVE_FORWARD_ANY, }, + [CGT_HCRX_TCR2En] = { + .index = HCRX_EL2, + .value = 0, + .mask = HCRX_EL2_TCR2En, + .behaviour = BEHAVE_FORWARD_ANY, + }, };#define MCB (id, ...) \
@@ -359,6 +368,8 @@ static const enum cgt_group_id *coarse_control_combo[] = {MCB (CGT_HCR_TTLB_TTLBIS ,CGT_HCR_TTLB ,CGT_HCR_TTLBIS ),MCB (CGT_HCR_TTLB_TTLBOS ,CGT_HCR_TTLB ,CGT_HCR_TTLBOS ),MCB (CGT_HCR_TVM_TRVM ,CGT_HCR_TVM ,CGT_HCR_TRVM ), +MCB (CGT_HCR_TVM_TRVM_HCRX_TCR2En, +CGT_HCR_TVM ,CGT_HCR_TRVM , CGT_HCRX_TCR2En),MCB (CGT_HCR_TPU_TICAB ,CGT_HCR_TPU ,CGT_HCR_TICAB ),MCB (CGT_HCR_TPU_TOCU ,CGT_HCR_TPU ,CGT_HCR_TOCU ), MCB(CGT_HCR_NV1_nNV2_ENSCXT, CGT_HCR_NV1_nNV2, CGT_HCR_ENSCXT),
@@ -622,6 +633,7 @@ static const struct encoding_to_trap_config encoding_to_cgt[] __initconst = {SR_TRAP (SYS_MAIR_EL1 ,CGT_HCR_TVM_TRVM ),SR_TRAP (SYS_AMAIR_EL1 ,CGT_HCR_TVM_TRVM ),SR_TRAP (SYS_CONTEXTIDR_EL1 ,CGT_HCR_TVM_TRVM ), +SR_TRAP (SYS_TCR2_EL1 , CGT_HCR_TVM_TRVM_HCRX_TCR2En),SR_TRAP (SYS_DC_ZVA ,CGT_HCR_TDZ ),SR_TRAP (SYS_DC_GVA ,CGT_HCR_TDZ ), SR_TRAP(SYS_DC_GZVA, CGT_HCR_TDZ),
@@ -1071,6 +1083,7 @@ static const struct encoding_to_trap_config encoding_to_fgt[] __initconst = {SR_FGT (SYS_TPIDRRO_EL0 , HFGxTR,TPIDRRO_EL0 ,1 ),SR_FGT (SYS_TPIDR_EL1 , HFGxTR,TPIDR_EL1 ,1 ),SR_FGT (SYS_TCR_EL1 , HFGxTR,TCR_EL1 ,1 ), +SR_FGT (SYS_TCR2_EL1 , HFGxTR,TCR_EL1 ,1 ),SR_FGT (SYS_SCXTNUM_EL0 , HFGxTR,SCXTNUM_EL0 ,1 ),SR_FGT (SYS_SCXTNUM_EL1 , HFGxTR,SCXTNUM_EL1 ,1 ), SR_FGT(SYS_SCTLR_EL1, HFGxTR, SCTLR_EL1, 1),
Signature · 1 line
2.39.2
Oliver Upton
AppliedQuoted 8 lines · Marc Zyngier
As I'm inching towards supporting
FEAT_S1PIEin a NV guest (oh, the fun I'm having!), it has become obvious that we're missing the basics when it comes to:- VM configuration: HCRX_EL2.TCR2En is forced to 1, and we blindly save/restore stuff.
[...]
Applied to kvmarm/next, thanks!
[1/5] KVM: arm64: Correctly honor the presence of FEAT_TCRX
https://git.kernel.org/kvmarm/kvmarm/c/9b58e665d6b2 [2/5] KVM: arm64: Get rid of HCRX_GUEST_FLAGS https://git.kernel.org/kvmarm/kvmarm/c/a3ee9ce88ba3 [3/5] KVM: arm64: Make TCR2_EL1 save/restore dependent on the VM features https://git.kernel.org/kvmarm/kvmarm/c/1b04fd40275e [4/5] KVM: arm64: Make PIR{,E0}_EL1 save/restore conditional on FEAT_TCRX https://git.kernel.org/kvmarm/kvmarm/c/663abf04ee4d [5/5] KVM: arm64: Honor trap routing for TCR2_EL1 https://git.kernel.org/kvmarm/kvmarm/c/91e9cc70b775
--
Best,
Oliver