Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd2342ad authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

kvm: arm/arm64: Force reading uncached stage2 PGD 



commit 2952a6070e07ebdd5896f1f5b861acad677caded upstream.

Make sure we don't use a cached value of the KVM stage2 PGD while
resetting the PGD.

Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: default avatarChristoffer Dall <cdall@linaro.org>
Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70df301a

arch/arm/kvm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ void kvm_free_stage2_pgd(struct kvm *kvm) 
	spin_lock(&kvm->mmu_lock);

	if (kvm->arch.pgd) {

		unmap_stage2_range(kvm, 0, KVM_PHYS_SIZE);

		pgd = kvm->arch.pgd;

		pgd = READ_ONCE(kvm->arch.pgd);

		kvm->arch.pgd = NULL;

	}

	spin_unlock(&kvm->mmu_lock);