4.9-stable patches

added patches:
	kvm-arm-arm64-force-reading-uncached-stage2-pgd.patch

diff --git a/queue-4.9/kvm-arm-arm64-force-reading-uncached-stage2-pgd.patch b/queue-4.9/kvm-arm-arm64-force-reading-uncached-stage2-pgd.patch
new file mode 100644 (file)
index 0000000..8b69e58
--- /dev/null
+++ b/queue-4.9/kvm-arm-arm64-force-reading-uncached-stage2-pgd.patch
@@ -0,0 +1,35 @@
+From 2952a6070e07ebdd5896f1f5b861acad677caded Mon Sep 17 00:00:00 2001
+From: Suzuki K Poulose <suzuki.poulose@arm.com>
+Date: Tue, 16 May 2017 10:34:54 +0100
+Subject: kvm: arm/arm64: Force reading uncached stage2 PGD
+
+From: Suzuki K Poulose <suzuki.poulose@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.zyngier@arm.com>
+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>
+Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@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);

diff --git a/queue-4.9/series b/queue-4.9/series
index 3a071a6cbbaab6d9ab8fd970fee102c795509276..d9a11c4bf01ad8bc5bb144416ef4e08a7833ad7d 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -14,3 +14,4 @@ wl1251-add-a-missing-spin_lock_init.patch
 lib-mpi-kunmap-after-finishing-accessing-buffer.patch
 xfrm-policy-check-policy-direction-value.patch
 drm-ttm-fix-accounting-error-when-fail-to-get-pages-for-pool.patch
+kvm-arm-arm64-force-reading-uncached-stage2-pgd.patch