KVM: arm64: Check advertised Stage-2 page size capability
Marc Zyngier
maintainerPATCH 1/1 KVM: arm64: Check advertised Stage-2 page size capability
With ARMv8.5-GTG, the hardware (or more likely a hypervisor) can advertise the supported Stage-2 page sizes.
Let's check this at boot time.
---
Hi Will,
Can you please take this patch via the arm64 tree, and apply it to the for-next/cpufeature branch?
Thanks,
M. arch/arm64/include/asm/kvm_host.h | 2 +- arch/arm64/include/asm/sysreg.h | 3 +++ arch/arm64/kernel/cpufeature.c | 18 +++++++++++++++ arch/arm64/kvm/reset.c | 37 +++++++++++++++++++++++++++++-- virt/kvm/arm/arm.c | 4 +--- 5 files changed, 58 insertions(+), 6 deletions(-)
arch/arm64/include/asm/kvm_host.h +1 -1
@@ -670,7 +670,7 @@ static inline int kvm_arm_have_ssbd(void)void kvm_vcpu_load_sysregs (struct kvm_vcpu *vcpu);void kvm_vcpu_put_sysregs (struct kvm_vcpu *vcpu); -void kvm_set_ipa_limit (void ); +int kvm_set_ipa_limit (void );#define __KVM_HAVE_ARCH_VM_ALLOCstruct kvm *kvm_arch_alloc_vm (void );
arch/arm64/include/asm/sysreg.h +3 -0
@@ -703,6 +703,9 @@#define ID_AA64ZFR0_SVEVER_SVE2 0x1/* id_aa64mmfr0 */ +#define ID_AA64MMFR0_TGRAN4_2_SHIFT 40 +#define ID_AA64MMFR0_TGRAN64_2_SHIFT 36 +#define ID_AA64MMFR0_TGRAN16_2_SHIFT 32#define ID_AA64MMFR0_TGRAN4_SHIFT 28#define ID_AA64MMFR0_TGRAN64_SHIFT 24#define ID_AA64MMFR0_TGRAN16_SHIFT 20
arch/arm64/kernel/cpufeature.c +18 -0
@@ -267,6 +267,24 @@ static const struct arm64_ftr_bits ftr_id_aa64zfr0[] = { };static const struct arm64_ftr_bits ftr_id_aa64mmfr0[] = { +/* +* Page size not being supported at Stage-2 is not fatal. You +* just give up KVM if PAGE_SIZE isn't supported there. Go fix +* your favourite nesting hypervisor. +* +* There is a small corner case where the hypervisor explicitly +* advertises a given granule size at Stage-2 (value 2) on some +* vCPUs, and uses the fallback to Stage-1 (value 0) for other +* vCPUs. Although this is not forbidden by the architecture, it +* indicates that the hypervisor is being silly (or buggy). +* +* We make no effort to cope with this and pretend that if these +* fields are inconsistent across vCPUs, then it isn't worth +* trying to bring KVM up. +*/ +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_EXACT ,ID_AA64MMFR0_TGRAN4_2_SHIFT ,4 ,1 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_EXACT ,ID_AA64MMFR0_TGRAN64_2_SHIFT ,4 ,1 ), +ARM64_FTR_BITS (FTR_HIDDEN ,FTR_NONSTRICT ,FTR_EXACT ,ID_AA64MMFR0_TGRAN16_2_SHIFT ,4 ,1 ),/* * We already refuse to boot CPUs that don't support our configured * page size, so we can only detect mismatches for a page size other
arch/arm64/kvm/reset.c +35 -2
@@ -337,14 +337,45 @@ u32 get_kvm_ipa_limit(void)return kvm_ipa_limit; } -void kvm_set_ipa_limit (void ) +int kvm_set_ipa_limit (void ) { -unsigned int ipa_max, pa_max, va_max, parange; +unsigned int ipa_max, pa_max, va_max, parange, tgran_2;u64 mmfr0; mmfr0 =read_sanitised_ftr_reg (SYS_ID_AA64MMFR0_EL1 ); parange =cpuid_feature_extract_unsigned_field (mmfr0,ID_AA64MMFR0_PARANGE_SHIFT ); + +/* +* Check with ARMv8.5-GTG that our PAGE_SIZE is supported at +* Stage-2. If not, things will stop very quickly. +*/ +switch (PAGE_SIZE ) { +default : +case SZ_4K : + tgran_2 =ID_AA64MMFR0_TGRAN4_2_SHIFT ; +break ; +case SZ_16K : + tgran_2 =ID_AA64MMFR0_TGRAN16_2_SHIFT ; +break ; +case SZ_64K : + tgran_2 =ID_AA64MMFR0_TGRAN64_2_SHIFT ; +break ; + } + +switch (cpuid_feature_extract_unsigned_field (mmfr0, tgran_2)) { +default : +case 1 : +kvm_err ("PAGE_SIZE not supported at Stage-2, giving up\n" ); +return -EINVAL ; +case 0 : +kvm_debug ("PAGE_SIZE supported at Stage-2 (default)\n" ); +break ; +case 2 : +kvm_debug ("PAGE_SIZE supported at Stage-2 (advertised)\n" ); +break ; + } + pa_max =id_aa64mmfr0_parange_to_phys_shift (parange);/* Clamp the IPA limit to the PA size supported by the kernel */
@@ -378,6 +409,8 @@ void kvm_set_ipa_limit(void) "KVM IPA limit (%d bit) is smaller than default size\n", ipa_max); kvm_ipa_limit = ipa_max;kvm_info ("IPA Size Limit: %dbits\n" , kvm_ipa_limit); + +return 0 ; }/*
virt/kvm/arm/arm.c +1 -3
@@ -1387,9 +1387,7 @@ static inline void hyp_cpu_pm_exit(void)static int init_common_resources (void ) { -kvm_set_ipa_limit (); - -return 0 ; +return kvm_set_ipa_limit (); }static int init_subsystems (void )
Signature · 7 lines
2.26.2 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Marc Zyngier
maintainerPATCH 1/1 KVM: arm64: Move __load_guest_stage2 to kvm_mmu.h
Having __load_guest_stage2 in kvm_hyp.h is quickly going to trigger a circular include problem. In order to avoid this, let's move it to kvm_mmu.h, where it will be a better fit anyway.
In the process, drop the __hyp_text annotation, which doesn't help as the function is marked as __always_inline.
---
Hi Will,
Can you please take this patch via the arm64 tree, and apply it to the for-next/kvm/errata branch?
Thanks,
M.
arch/arm64/include/asm/kvm_hyp.h | 18 ------------------ arch/arm64/include/asm/kvm_mmu.h | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 18 deletions(-)
arch/arm64/include/asm/kvm_hyp.h +0 -18
@@ -10,7 +10,6 @@#include <linux/compiler.h> #include <linux/kvm_host.h> #include <asm/alternative.h> -#include <asm/kvm_mmu.h> #include <asm/sysreg.h> #define __hyp_text __section(.hyp.text) notrace
@@ -88,22 +87,5 @@ void deactivate_traps_vhe_put(void);u64 __guest_enter (struct kvm_vcpu *vcpu,struct kvm_cpu_context *host_ctxt);void __noreturn __hyp_do_panic (unsigned long , ...); -/* -* Must be called from hyp code running at EL2 with an updated VTTBR -* and interrupts disabled. -*/ -static __always_inline void __hyp_text __load_guest_stage2(struct kvm *kvm) -{ -write_sysreg (kvm->arch.vtcr, vtcr_el2); -write_sysreg (kvm_get_vttbr (kvm), vttbr_el2); - -/* -* ARM errata 1165522 and 1530923 require the actual execution of the -* above before we can switch to the EL1/EL0 translation regime used by -* the guest. -*/ - asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT)); -} -#endif /* __ARM64_KVM_HYP_H__ */
arch/arm64/include/asm/kvm_mmu.h +17 -0
@@ -604,5 +604,22 @@ static __always_inline u64 kvm_get_vttbr(struct kvm *kvm)return kvm_phys_to_vttbr (baddr) | vmid_field | cnp; } +/* +* Must be called from hyp code running at EL2 with an updated VTTBR +* and interrupts disabled. +*/ +static __always_inline void __load_guest_stage2(struct kvm *kvm) +{ +write_sysreg (kvm->arch.vtcr, vtcr_el2); +write_sysreg (kvm_get_vttbr (kvm), vttbr_el2); + +/* +* ARM errata 1165522 and 1530923 require the actual execution of the +* above before we can switch to the EL1/EL0 translation regime used by +* the guest. +*/ + asm(ALTERNATIVE("nop", "isb", ARM64_WORKAROUND_SPECULATIVE_AT)); +} +#endif /* __ASSEMBLY__ */ #endif /* __ARM64_KVM_MMU_H__ */
Signature · 1 line
2.26.2