diff options
| author | Suzuki K Poulose <suzuki.poulose@arm.com> | 2017-05-16 11:34:54 +0200 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-05-16 11:54:00 +0200 |
| commit | 2952a6070e07ebdd5896f1f5b861acad677caded (patch) | |
| tree | 086d1ec9783ef2b11a15588dc07a15b006c33798 /virt/kvm/arm/mmu.c | |
| parent | KVM: arm: rename pm_fake handler to trap_raz_wi (diff) | |
| download | linux-2952a6070e07ebdd5896f1f5b861acad677caded.tar.xz linux-2952a6070e07ebdd5896f1f5b861acad677caded.zip | |
kvm: arm/arm64: Force reading uncached stage2 PGD
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>
Cc: stable@vger.kernel.org
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Reviewed-by: Christoffer Dall <cdall@linaro.org>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'virt/kvm/arm/mmu.c')
| -rw-r--r-- | virt/kvm/arm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/arm/mmu.c b/virt/kvm/arm/mmu.c index 909a1a793b31..704e35f312a4 100644 --- a/virt/kvm/arm/mmu.c +++ b/virt/kvm/arm/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); |