4.9-stable patches

added patches:
	kvm-nvmx-invvpid-handling-improvements.patch
	kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch

diff --git a/queue-4.9/kvm-nvmx-invvpid-handling-improvements.patch b/queue-4.9/kvm-nvmx-invvpid-handling-improvements.patch
new file mode 100644 (file)
index 0000000..8c90e75
--- /dev/null
+++ b/queue-4.9/kvm-nvmx-invvpid-handling-improvements.patch
@@ -0,0 +1,99 @@
+From foo@baz Fri Feb 23 17:34:09 CET 2018
+From: Jack Wang <jinpu.wang@profitbricks.com>
+Date: Fri, 23 Feb 2018 11:42:18 +0100
+Subject: KVM: nVMX: invvpid handling improvements
+To: gregkh@linuxfoundation.org, stable@vger.kernel.org
+Cc: "Jan Dakinevich" <jan.dakinevich@gmail.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Jack Wang" <jinpu.wang@profitbricks.com>
+Message-ID: <1519382538-15143-30-git-send-email-jinpu.wangl@profitbricks.com>
+
+From: Jan Dakinevich <jan.dakinevich@gmail.com>
+
+commit bcdde302b8268ef7dbc4ddbdaffb5b44eafe9a1e upstream
+
+ - Expose all invalidation types to the L1
+
+ - Reject invvpid instruction, if L1 passed zero vpid value to single
+   context invalidations
+
+Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
+Tested-by: Ladi Prosek <lprosek@redhat.com>
+Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
+[jwang: port to 4.4]
+Signed-off-by: Jack Wang <jinpu.wang@profitbricks.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/kvm/vmx.c |   36 ++++++++++++++++++++++++------------
+ 1 file changed, 24 insertions(+), 12 deletions(-)
+
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -142,6 +142,12 @@ module_param_named(preemption_timer, ena
+ 
+ #define VMX_MISC_EMULATED_PREEMPTION_TIMER_RATE 5
+ 
++#define VMX_VPID_EXTENT_SUPPORTED_MASK                \
++      (VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT |  \
++      VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |    \
++      VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT |    \
++      VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT)
++
+ /*
+  * These 2 parameters are used to config the controls for Pause-Loop Exiting:
+  * ple_gap:    upper bound on the amount of time between two successive
+@@ -2839,8 +2845,7 @@ static void nested_vmx_setup_ctls_msrs(s
+        */
+       if (enable_vpid)
+               vmx->nested.nested_vmx_vpid_caps = VMX_VPID_INVVPID_BIT |
+-                              VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT |
+-                              VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT;
++                      VMX_VPID_EXTENT_SUPPORTED_MASK;
+       else
+               vmx->nested.nested_vmx_vpid_caps = 0;
+ 
+@@ -7685,7 +7690,8 @@ static int handle_invvpid(struct kvm_vcp
+       vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);
+       type = kvm_register_readl(vcpu, (vmx_instruction_info >> 28) & 0xf);
+ 
+-      types = (vmx->nested.nested_vmx_vpid_caps >> 8) & 0x7;
++      types = (vmx->nested.nested_vmx_vpid_caps &
++                      VMX_VPID_EXTENT_SUPPORTED_MASK) >> 8;
+ 
+       if (type >= 32 || !(types & (1 << type))) {
+               nested_vmx_failValid(vcpu,
+@@ -7707,21 +7713,27 @@ static int handle_invvpid(struct kvm_vcp
+       }
+ 
+       switch (type) {
++      case VMX_VPID_EXTENT_INDIVIDUAL_ADDR:
+       case VMX_VPID_EXTENT_SINGLE_CONTEXT:
+-              /*
+-               * Old versions of KVM use the single-context version so we
+-               * have to support it; just treat it the same as all-context.
+-               */
++      case VMX_VPID_EXTENT_SINGLE_NON_GLOBAL:
++              if (!vpid) {
++                      nested_vmx_failValid(vcpu,
++                              VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);
++                      skip_emulated_instruction(vcpu);
++                      return 1;
++              }
++              break;
+       case VMX_VPID_EXTENT_ALL_CONTEXT:
+-              __vmx_flush_tlb(vcpu, to_vmx(vcpu)->nested.vpid02);
+-              nested_vmx_succeed(vcpu);
+               break;
+       default:
+-              /* Trap individual address invalidation invvpid calls */
+-              BUG_ON(1);
+-              break;
++              WARN_ON_ONCE(1);
++              skip_emulated_instruction(vcpu);
++              return 1;
+       }
+ 
++      __vmx_flush_tlb(vcpu, vmx->nested.vpid02);
++      nested_vmx_succeed(vcpu);
++
+       skip_emulated_instruction(vcpu);
+       return 1;
+ }

diff --git a/queue-4.9/kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch b/queue-4.9/kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch
new file mode 100644 (file)
index 0000000..6277cd3
--- /dev/null
+++ b/queue-4.9/kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch
@@ -0,0 +1,53 @@
+From foo@baz Fri Feb 23 17:34:09 CET 2018
+From: Jack Wang <jinpu.wang@profitbricks.com>
+Date: Fri, 23 Feb 2018 11:42:17 +0100
+Subject: KVM: VMX: clean up declaration of VPID/EPT invalidation types
+To: gregkh@linuxfoundation.org, stable@vger.kernel.org
+Cc: "Jan Dakinevich" <jan.dakinevich@gmail.com>, "Radim Krčmář" <rkrcmar@redhat.com>, "Jack Wang" <jinpu.wang@profitbricks.com>
+Message-ID: <1519382538-15143-29-git-send-email-jinpu.wangl@profitbricks.com>
+
+From: Jan Dakinevich <jan.dakinevich@gmail.com>
+
+commit 63f3ac48133a19110c8a3666028dbd9b1bf3dcb3 upstream
+
+- Remove VMX_EPT_EXTENT_INDIVIDUAL_ADDR, since there is no such type of
+   EPT invalidation
+
+ - Add missing VPID types names
+
+Signed-off-by: Jan Dakinevich <jan.dakinevich@gmail.com>
+Tested-by: Ladi Prosek <lprosek@redhat.com>
+Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
+[jwang: port to 4.4]
+Signed-off-by: Jack Wang <jinpu.wang@profitbricks.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/include/asm/vmx.h |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/include/asm/vmx.h
++++ b/arch/x86/include/asm/vmx.h
+@@ -399,10 +399,11 @@ enum vmcs_field {
+ #define IDENTITY_PAGETABLE_PRIVATE_MEMSLOT    (KVM_USER_MEM_SLOTS + 2)
+ 
+ #define VMX_NR_VPIDS                          (1 << 16)
++#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR               0
+ #define VMX_VPID_EXTENT_SINGLE_CONTEXT                1
+ #define VMX_VPID_EXTENT_ALL_CONTEXT           2
++#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL     3
+ 
+-#define VMX_EPT_EXTENT_INDIVIDUAL_ADDR                0
+ #define VMX_EPT_EXTENT_CONTEXT                        1
+ #define VMX_EPT_EXTENT_GLOBAL                 2
+ #define VMX_EPT_EXTENT_SHIFT                  24
+@@ -419,8 +420,10 @@ enum vmcs_field {
+ #define VMX_EPT_EXTENT_GLOBAL_BIT             (1ull << 26)
+ 
+ #define VMX_VPID_INVVPID_BIT                    (1ull << 0) /* (32 - 32) */
++#define VMX_VPID_EXTENT_INDIVIDUAL_ADDR_BIT     (1ull << 8) /* (40 - 32) */
+ #define VMX_VPID_EXTENT_SINGLE_CONTEXT_BIT      (1ull << 9) /* (41 - 32) */
+ #define VMX_VPID_EXTENT_GLOBAL_CONTEXT_BIT      (1ull << 10) /* (42 - 32) */
++#define VMX_VPID_EXTENT_SINGLE_NON_GLOBAL_BIT   (1ull << 11) /* (43 - 32) */
+ 
+ #define VMX_EPT_DEFAULT_GAW                   3
+ #define VMX_EPT_MAX_GAW                               0x4

diff --git a/queue-4.9/series b/queue-4.9/series
index 600ba0bae9ce58c8c76f41cc77a28ebb6584faf7..4a35bf75127c1abcf32841eb9603640e2d069c20 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -140,3 +140,5 @@ arm64-fix-warning-about-swapper_pg_dir-overflow.patch
 usb-phy-msm-add-regulator-dependency.patch
 x86-microcode-amd-change-load_microcode_amd-s-param-to-bool-to-fix-preemptibility-bug.patch
 kvm-async_pf-fix-df-due-to-inject-page-not-present-and-page-ready-exceptions-simultaneously.patch
+kvm-vmx-clean-up-declaration-of-vpid-ept-invalidation-types.patch
+kvm-nvmx-invvpid-handling-improvements.patch