[PATCH 4.9 17/18] kvm: arm/arm64: Force reading uncached stage2 PGD

[Greg Kroah-Hartman]

4.9-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Suzuki K Poulose <suzuki.poul...@arm.com>

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.zyng...@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
Reviewed-by: Christoffer Dall <cd...@linaro.org>
Signed-off-by: Christoffer Dall <cd...@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>


---
 arch/arm/kvm/mmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -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);