3.10-stable patches

added patches:
	mips-kvm-allocate-at-least-16kb-for-exception-handlers.patch

diff --git a/queue-3.10/mips-kvm-allocate-at-least-16kb-for-exception-handlers.patch b/queue-3.10/mips-kvm-allocate-at-least-16kb-for-exception-handlers.patch
new file mode 100644 (file)
index 0000000..786e620
--- /dev/null
+++ b/queue-3.10/mips-kvm-allocate-at-least-16kb-for-exception-handlers.patch
@@ -0,0 +1,50 @@
+From 7006e2dfda9adfa40251093604db76d7e44263b3 Mon Sep 17 00:00:00 2001
+From: James Hogan <james.hogan@imgtec.com>
+Date: Thu, 29 May 2014 10:16:23 +0100
+Subject: MIPS: KVM: Allocate at least 16KB for exception handlers
+
+From: James Hogan <james.hogan@imgtec.com>
+
+commit 7006e2dfda9adfa40251093604db76d7e44263b3 upstream.
+
+Each MIPS KVM guest has its own copy of the KVM exception vector. This
+contains the TLB refill exception handler at offset 0x000, the general
+exception handler at offset 0x180, and interrupt exception handlers at
+offset 0x200 in case Cause_IV=1. A common handler is copied to offset
+0x2000 and offset 0x3000 is used for temporarily storing k1 during entry
+from guest.
+
+However the amount of memory allocated for this purpose is calculated as
+0x200 rounded up to the next page boundary, which is insufficient if 4KB
+pages are in use. This can lead to the common handler at offset 0x2000
+being overwritten and infinitely recursive exceptions on the next exit
+from the guest.
+
+Increase the minimum size from 0x200 to 0x4000 to cover the full use of
+the page.
+
+Signed-off-by: James Hogan <james.hogan@imgtec.com>
+Cc: Paolo Bonzini <pbonzini@redhat.com>
+Cc: Gleb Natapov <gleb@kernel.org>
+Cc: kvm@vger.kernel.org
+Cc: Ralf Baechle <ralf@linux-mips.org>
+Cc: linux-mips@linux-mips.org
+Cc: Sanjay Lal <sanjayl@kymasys.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/mips/kvm/kvm_mips.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/kvm/kvm_mips.c
++++ b/arch/mips/kvm/kvm_mips.c
+@@ -299,7 +299,7 @@ struct kvm_vcpu *kvm_arch_vcpu_create(st
+       if (cpu_has_veic || cpu_has_vint) {
+               size = 0x200 + VECTORSPACING * 64;
+       } else {
+-              size = 0x200;
++              size = 0x4000;
+       }
+ 
+       /* Save Linux EBASE */

diff --git a/queue-3.10/series b/queue-3.10/series
index 2107a7b4ba160b4c455e1cd1bbc1c8dfad0bf3de..c0417aa1404348831a299347b903709c5cba65f8 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -26,3 +26,4 @@ net-mlx4_core-pass-pci_device_id.driver_data-to-__mlx4_init_one-during-reset.pat
 net-mlx4_core-preserve-pci_dev_data-after-__mlx4_remove_one.patch
 kvm-lapic-sync-highest-isr-to-hardware-apic-on-eoi.patch
 arm-at91-fix-at91_sysirq_mask_rtc-for-sam9x5-socs.patch
+mips-kvm-allocate-at-least-16kb-for-exception-handlers.patch