Commit 306b4c9f authored by Kristina Martsenko's avatar Kristina Martsenko Committed by Catalin Marinas
Browse files

KVM: arm64: switch HCRX_EL2 between host and guest 



Switch the HCRX_EL2 register between host and guest configurations, in
order to enable different features in the host and guest.

Now that there are separate guest flags, we can also remove SMPME from
the host flags, as SMPME is used for virtualizing SME priorities and has
no use in the host.

Signed-off-by: default avatarKristina Martsenko <kristina.martsenko@arm.com>
Acked-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20230509142235.3284028-4-kristina.martsenko@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent b0c756fe

arch/arm64/include/asm/kvm_arm.h

+2 −1
Original line number Diff line number Diff line
@@ -93,7 +93,8 @@ 
#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_HOST_FLAGS (HCRX_EL2_SMPME)

#define HCRX_GUEST_FLAGS (HCRX_EL2_SMPME)

#define HCRX_HOST_FLAGS 0



/* TCR_EL2 Registers bits */

#define TCR_EL2_RES1		((1U << 31) | (1 << 23))

arch/arm64/kvm/hyp/include/hyp/switch.h

+6 −0
Original line number Diff line number Diff line
@@ -130,6 +130,9 @@ static inline void ___activate_traps(struct kvm_vcpu *vcpu) 


	if (cpus_have_final_cap(ARM64_HAS_RAS_EXTN) && (hcr & HCR_VSE))

		write_sysreg_s(vcpu->arch.vsesr_el2, SYS_VSESR_EL2);



	if (cpus_have_final_cap(ARM64_HAS_HCX))

		write_sysreg_s(HCRX_GUEST_FLAGS, SYS_HCRX_EL2);

}



static inline void ___deactivate_traps(struct kvm_vcpu *vcpu)
@@ -144,6 +147,9 @@ static inline void ___deactivate_traps(struct kvm_vcpu *vcpu) 
		vcpu->arch.hcr_el2 &= ~HCR_VSE;

		vcpu->arch.hcr_el2 |= read_sysreg(hcr_el2) & HCR_VSE;

	}



	if (cpus_have_final_cap(ARM64_HAS_HCX))

		write_sysreg_s(HCRX_HOST_FLAGS, SYS_HCRX_EL2);

}



static inline bool __populate_fault_info(struct kvm_vcpu *vcpu)