4.0-stable patches

added patches:
	kvm-nsvm-check-for-nrips-support-before-updating-control-field.patch

diff --git a/queue-4.0/kvm-nsvm-check-for-nrips-support-before-updating-control-field.patch b/queue-4.0/kvm-nsvm-check-for-nrips-support-before-updating-control-field.patch
new file mode 100644 (file)
index 0000000..f05be63
--- /dev/null
+++ b/queue-4.0/kvm-nsvm-check-for-nrips-support-before-updating-control-field.patch
@@ -0,0 +1,50 @@
+From f104765b4f81fd74d69e0eb161e89096deade2db Mon Sep 17 00:00:00 2001
+From: Bandan Das <bsd@redhat.com>
+Date: Thu, 11 Jun 2015 02:05:33 -0400
+Subject: KVM: nSVM: Check for NRIPS support before updating control field
+
+From: Bandan Das <bsd@redhat.com>
+
+commit f104765b4f81fd74d69e0eb161e89096deade2db upstream.
+
+If hardware doesn't support DecodeAssist - a feature that provides
+more information about the intercept in the VMCB, KVM decodes the
+instruction and then updates the next_rip vmcb control field.
+However, NRIP support itself depends on cpuid Fn8000_000A_EDX[NRIPS].
+Since skip_emulated_instruction() doesn't verify nrip support
+before accepting control.next_rip as valid, avoid writing this
+field if support isn't present.
+
+Signed-off-by: Bandan Das <bsd@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/svm.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/kvm/svm.c
++++ b/arch/x86/kvm/svm.c
+@@ -511,8 +511,10 @@ static void skip_emulated_instruction(st
+ {
+       struct vcpu_svm *svm = to_svm(vcpu);
+ 
+-      if (svm->vmcb->control.next_rip != 0)
++      if (svm->vmcb->control.next_rip != 0) {
++              WARN_ON(!static_cpu_has(X86_FEATURE_NRIPS));
+               svm->next_rip = svm->vmcb->control.next_rip;
++      }
+ 
+       if (!svm->next_rip) {
+               if (emulate_instruction(vcpu, EMULTYPE_SKIP) !=
+@@ -4310,7 +4312,9 @@ static int svm_check_intercept(struct kv
+               break;
+       }
+ 
+-      vmcb->control.next_rip  = info->next_rip;
++      /* TODO: Advertise NRIPS to guest hypervisor unconditionally */
++      if (static_cpu_has(X86_FEATURE_NRIPS))
++              vmcb->control.next_rip  = info->next_rip;
+       vmcb->control.exit_code = icpt_info.exit_code;
+       vmexit = nested_svm_exit_handled(svm);
+ 

diff --git a/queue-4.0/series b/queue-4.0/series
index b7475a03ba3487ae6d7c3ee7a37c17b9ee232156..b008e909c0a79045f91c8a2bcc42a8ba861ffb55 100644 (file)
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -1,3 +1,4 @@
 config-enable-need_dma_map_state-by-default-when-swiotlb-is-selected.patch
 netfilter-nft_rbtree-fix-locking.patch
 arm-clk-imx6q-refine-sata-s-parent.patch
+kvm-nsvm-check-for-nrips-support-before-updating-control-field.patch