Commit 13ac4bbc authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Marc Zyngier
Browse files

kvm: arm64: Switch to per VM IPA limit 



Now that we can manage the stage2 page table per VM, switch the
configuration details to per VM instance. The VTCR is updated
with the values specific to the VM based on the configuration.
We store the IPA size and the number of stage2 page table levels
for the guest already in VTCR. Decode it back from the vtcr
field wherever we need it.

Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <cdall@kernel.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 7e813045

arch/arm64/include/asm/kvm_arm.h

+2 −0
Original line number Diff line number Diff line
@@ -197,6 +197,8 @@ 
	VTCR_EL2_SL0_TO_LVLS(((vtcr) & VTCR_EL2_SL0_MASK) >> VTCR_EL2_SL0_SHIFT)



#define VTCR_EL2_FLAGS			(VTCR_EL2_COMMON_BITS | VTCR_EL2_TGRAN)

#define VTCR_EL2_IPA(vtcr)		(64 - ((vtcr) & VTCR_EL2_T0SZ_MASK))



/*

 * ARM VMSAv8-64 defines an algorithm for finding the translation table

 * descriptors in section D4.2.8 in ARM DDI 0487C.a.

arch/arm64/include/asm/kvm_mmu.h

+1 −1
Original line number Diff line number Diff line
@@ -142,7 +142,7 @@ static inline unsigned long __kern_hyp_va(unsigned long v) 
 */

#define KVM_PHYS_SHIFT	(40)



#define kvm_phys_shift(kvm)		KVM_PHYS_SHIFT

#define kvm_phys_shift(kvm)		VTCR_EL2_IPA(kvm->arch.vtcr)

#define kvm_phys_size(kvm)		(_AC(1, ULL) << kvm_phys_shift(kvm))

#define kvm_phys_mask(kvm)		(kvm_phys_size(kvm) - _AC(1, ULL))

arch/arm64/include/asm/stage2_pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
 */

#define stage2_pgtable_levels(ipa)	ARM64_HW_PGTABLE_LEVELS((ipa) - 4)

#define STAGE2_PGTABLE_LEVELS		stage2_pgtable_levels(KVM_PHYS_SHIFT)

#define kvm_stage2_levels(kvm)		stage2_pgtable_levels(kvm_phys_shift(kvm))

#define kvm_stage2_levels(kvm)		VTCR_EL2_LVLS(kvm->arch.vtcr)



/*

 * With all the supported VA_BITs and 40bit guest IPA, the following condition

arch/arm64/kvm/reset.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ int kvm_arm_config_vm(struct kvm *kvm, unsigned long type) 
	if (phys_shift > KVM_PHYS_SHIFT)

		phys_shift = KVM_PHYS_SHIFT;

	vtcr |= VTCR_EL2_T0SZ(phys_shift);

	vtcr |= VTCR_EL2_LVLS_TO_SL0(kvm_stage2_levels(kvm));

	vtcr |= VTCR_EL2_LVLS_TO_SL0(stage2_pgtable_levels(phys_shift));



	/*

	 * Enable the Hardware Access Flag management, unconditionally

CRA Git | Maintained and supported by SUSTech CRA and CCSE