4.9-stable patches

added patches:
	kvm-nvmx-kmap-can-t-fail.patch

diff --git a/queue-4.9/kvm-nvmx-eliminate-vmcs02-pool.patch b/queue-4.9/kvm-nvmx-eliminate-vmcs02-pool.patch
index b0cb27e97a95bee65a10b457d791d196b17d660d..9f973853582e69ba60c900c0ac908954f2d58962 100644 (file)
--- a/queue-4.9/kvm-nvmx-eliminate-vmcs02-pool.patch
+++ b/queue-4.9/kvm-nvmx-eliminate-vmcs02-pool.patch
@@ -79,7 +79,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
         */
        struct page *apic_access_page;
        struct page *virtual_apic_page;
-@@ -6682,94 +6674,6 @@ static int handle_monitor(struct kvm_vcp
+@@ -6678,94 +6670,6 @@ static int handle_monitor(struct kvm_vcp
  }
  
  /*
@@ -174,7 +174,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
   * set the success or error code of an emulated VMX instruction, as specified
   * by Vol 2B, VMX Instruction Reference, "Conventions".
-@@ -7082,6 +6986,12 @@ static int handle_vmon(struct kvm_vcpu *
+@@ -7078,6 +6982,12 @@ static int handle_vmon(struct kvm_vcpu *
                return 1;
        }
  
@@ -187,7 +187,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (cpu_has_vmx_msr_bitmap()) {
                vmx->nested.msr_bitmap =
                                (unsigned long *)__get_free_page(GFP_KERNEL);
-@@ -7104,9 +7014,6 @@ static int handle_vmon(struct kvm_vcpu *
+@@ -7100,9 +7010,6 @@ static int handle_vmon(struct kvm_vcpu *
                vmx->vmcs01.shadow_vmcs = shadow_vmcs;
        }
  
@@ -197,7 +197,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        hrtimer_init(&vmx->nested.preemption_timer, CLOCK_MONOTONIC,
                     HRTIMER_MODE_REL_PINNED);
        vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;
-@@ -7124,6 +7031,9 @@ out_cached_vmcs12:
+@@ -7120,6 +7027,9 @@ out_cached_vmcs12:
        free_page((unsigned long)vmx->nested.msr_bitmap);
  
  out_msr_bitmap:
@@ -207,7 +207,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        return -ENOMEM;
  }
  
-@@ -7209,7 +7119,7 @@ static void free_nested(struct vcpu_vmx
+@@ -7205,7 +7115,7 @@ static void free_nested(struct vcpu_vmx
                vmx->vmcs01.shadow_vmcs = NULL;
        }
        kfree(vmx->nested.cached_vmcs12);
@@ -216,7 +216,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (vmx->nested.apic_access_page) {
                nested_release_page(vmx->nested.apic_access_page);
                vmx->nested.apic_access_page = NULL;
-@@ -7225,7 +7135,7 @@ static void free_nested(struct vcpu_vmx
+@@ -7221,7 +7131,7 @@ static void free_nested(struct vcpu_vmx
                vmx->nested.pi_desc = NULL;
        }
  
@@ -225,7 +225,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  /* Emulate the VMXOFF instruction */
-@@ -7259,8 +7169,6 @@ static int handle_vmclear(struct kvm_vcp
+@@ -7255,8 +7165,6 @@ static int handle_vmclear(struct kvm_vcp
                        vmptr + offsetof(struct vmcs12, launch_state),
                        &zero, sizeof(zero));
  
@@ -234,7 +234,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        skip_emulated_instruction(vcpu);
        nested_vmx_succeed(vcpu);
        return 1;
-@@ -8049,10 +7957,11 @@ static bool nested_vmx_exit_handled(stru
+@@ -8045,10 +7953,11 @@ static bool nested_vmx_exit_handled(stru
  
        /*
         * The host physical addresses of some pages of guest memory
@@ -250,7 +250,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
         *
         * Mark them dirty on every exit from L2 to prevent them from
         * getting out of sync with dirty tracking.
-@@ -10221,7 +10130,6 @@ static int nested_vmx_run(struct kvm_vcp
+@@ -10212,7 +10121,6 @@ static int nested_vmx_run(struct kvm_vcp
        struct vmcs12 *vmcs12;
        struct vcpu_vmx *vmx = to_vmx(vcpu);
        int cpu;
@@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        bool ia32e;
        u32 msr_entry_idx;
  
-@@ -10361,17 +10269,13 @@ static int nested_vmx_run(struct kvm_vcp
+@@ -10352,17 +10260,13 @@ static int nested_vmx_run(struct kvm_vcp
         * the nested entry.
         */
  
@@ -277,7 +277,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        vmx_vcpu_put(vcpu);
        vmx_vcpu_load(vcpu, cpu);
        vcpu->cpu = cpu;
-@@ -10886,10 +10790,6 @@ static void nested_vmx_vmexit(struct kvm
+@@ -10877,10 +10781,6 @@ static void nested_vmx_vmexit(struct kvm
        vm_exit_controls_reset_shadow(vmx);
        vmx_segment_cache_clear(vmx);
  

diff --git a/queue-4.9/kvm-nvmx-kmap-can-t-fail.patch b/queue-4.9/kvm-nvmx-kmap-can-t-fail.patch
new file mode 100644 (file)
index 0000000..9a09c53
--- /dev/null
+++ b/queue-4.9/kvm-nvmx-kmap-can-t-fail.patch
@@ -0,0 +1,45 @@
+From 42cf014d38d8822cce63703a467e00f65d000952 Mon Sep 17 00:00:00 2001
+From: David Hildenbrand <david@redhat.com>
+Date: Wed, 25 Jan 2017 11:58:57 +0100
+Subject: KVM: nVMX: kmap() can't fail
+
+From: David Hildenbrand <david@redhat.com>
+
+commit 42cf014d38d8822cce63703a467e00f65d000952 upstream.
+
+kmap() can't fail, therefore it will always return a valid pointer. Let's
+just get rid of the unnecessary checks.
+
+Signed-off-by: David Hildenbrand <david@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kvm/vmx.c |    9 ---------
+ 1 file changed, 9 deletions(-)
+
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -4756,10 +4756,6 @@ static int vmx_complete_nested_posted_in
+                       return 0;
+ 
+               vapic_page = kmap(vmx->nested.virtual_apic_page);
+-              if (!vapic_page) {
+-                      WARN_ON(1);
+-                      return -ENOMEM;
+-              }
+               __kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);
+               kunmap(vmx->nested.virtual_apic_page);
+ 
+@@ -9584,11 +9580,6 @@ static inline bool nested_vmx_merge_msr_
+       if (!page)
+               return false;
+       msr_bitmap_l1 = (unsigned long *)kmap(page);
+-      if (!msr_bitmap_l1) {
+-              nested_release_page_clean(page);
+-              WARN_ON(1);
+-              return false;
+-      }
+ 
+       memset(msr_bitmap_l0, 0xff, PAGE_SIZE);
+ 

diff --git a/queue-4.9/kvm-nvmx-mark-vmcs12-pages-dirty-on-l2-exit.patch b/queue-4.9/kvm-nvmx-mark-vmcs12-pages-dirty-on-l2-exit.patch
index cfb55bb78755e444964d0df8a05c8541b6e2ca25..1aba75d866cc4b793d5f22e95eb03ab6226a121e 100644 (file)
--- a/queue-4.9/kvm-nvmx-mark-vmcs12-pages-dirty-on-l2-exit.patch
+++ b/queue-4.9/kvm-nvmx-mark-vmcs12-pages-dirty-on-l2-exit.patch
@@ -82,9 +82,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +      max_irr = find_last_bit((unsigned long *)vmx->nested.pi_desc->pir, 256);
 +      if (max_irr != 256) {
                vapic_page = kmap(vmx->nested.virtual_apic_page);
-               if (!vapic_page) {
-                       WARN_ON(1);
-@@ -4770,6 +4789,8 @@ static void vmx_complete_nested_posted_i
+               __kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);
+               kunmap(vmx->nested.virtual_apic_page);
+@@ -4766,6 +4785,8 @@ static void vmx_complete_nested_posted_i
                        vmcs_write16(GUEST_INTR_STATUS, status);
                }
        }
@@ -93,7 +93,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu)
-@@ -8026,6 +8047,18 @@ static bool nested_vmx_exit_handled(stru
+@@ -8022,6 +8043,18 @@ static bool nested_vmx_exit_handled(stru
                                vmcs_read32(VM_EXIT_INTR_ERROR_CODE),
                                KVM_ISA_VMX);
  

diff --git a/queue-4.9/kvm-nvmx-vmx_complete_nested_posted_interrupt-can-t-fail.patch b/queue-4.9/kvm-nvmx-vmx_complete_nested_posted_interrupt-can-t-fail.patch
index d9bb84b01b95b46649ee0cbaf653b51ab0666ede..c546be42341978962d8372de89d84ed0c9be5de5 100644 (file)
--- a/queue-4.9/kvm-nvmx-vmx_complete_nested_posted_interrupt-can-t-fail.patch
+++ b/queue-4.9/kvm-nvmx-vmx_complete_nested_posted_interrupt-can-t-fail.patch
@@ -45,8 +45,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +                      return;
  
                vapic_page = kmap(vmx->nested.virtual_apic_page);
-               if (!vapic_page) {
-@@ -4770,7 +4770,6 @@ static int vmx_complete_nested_posted_in
+               __kvm_apic_update_irr(vmx->nested.pi_desc->pir, vapic_page);
+@@ -4766,7 +4766,6 @@ static int vmx_complete_nested_posted_in
                        vmcs_write16(GUEST_INTR_STATUS, status);
                }
        }
@@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu)
-@@ -10491,7 +10490,8 @@ static int vmx_check_nested_events(struc
+@@ -10482,7 +10481,8 @@ static int vmx_check_nested_events(struc
                return 0;
        }
  

diff --git a/queue-4.9/kvm-vmx-allow-direct-access-to-msr_ia32_spec_ctrl.patch b/queue-4.9/kvm-vmx-allow-direct-access-to-msr_ia32_spec_ctrl.patch
index 12f32771f1c8d96ec2207de863b8a0f854ef1a6b..142edaef8d4d4d20dfdbf367153baf819e277854 100644 (file)
--- a/queue-4.9/kvm-vmx-allow-direct-access-to-msr_ia32_spec_ctrl.patch
+++ b/queue-4.9/kvm-vmx-allow-direct-access-to-msr_ia32_spec_ctrl.patch
@@ -198,7 +198,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        case MSR_IA32_PRED_CMD:
                if (!msr_info->host_initiated &&
                    !guest_cpuid_has_ibpb(vcpu))
-@@ -5243,6 +5304,7 @@ static void vmx_vcpu_reset(struct kvm_vc
+@@ -5239,6 +5300,7 @@ static void vmx_vcpu_reset(struct kvm_vc
        u64 cr0;
  
        vmx->rmode.vm86_active = 0;
@@ -206,7 +206,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        vmx->soft_vnmi_blocked = 0;
  
-@@ -8828,6 +8890,15 @@ static void __noclone vmx_vcpu_run(struc
+@@ -8824,6 +8886,15 @@ static void __noclone vmx_vcpu_run(struc
  
        vmx_arm_hv_timer(vcpu);
  
@@ -222,7 +222,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        vmx->__launched = vmx->loaded_vmcs->launched;
        asm(
                /* Store host registers */
-@@ -8946,6 +9017,27 @@ static void __noclone vmx_vcpu_run(struc
+@@ -8942,6 +9013,27 @@ static void __noclone vmx_vcpu_run(struc
  #endif
              );
  
@@ -250,7 +250,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        /* Eliminate branch target predictions from guest mode */
        vmexit_fill_RSB();
  
-@@ -9505,7 +9597,7 @@ static inline bool nested_vmx_merge_msr_
+@@ -9501,7 +9593,7 @@ static inline bool nested_vmx_merge_msr_
        unsigned long *msr_bitmap_l1;
        unsigned long *msr_bitmap_l0 = to_vmx(vcpu)->nested.vmcs02.msr_bitmap;
        /*
@@ -259,7 +259,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
         *
         * 1. L0 gave a permission to L1 to actually passthrough the MSR. This
         *    ensures that we do not accidentally generate an L02 MSR bitmap
-@@ -9518,9 +9610,10 @@ static inline bool nested_vmx_merge_msr_
+@@ -9514,9 +9606,10 @@ static inline bool nested_vmx_merge_msr_
         *    the MSR.
         */
        bool pred_cmd = msr_write_intercepted_l01(vcpu, MSR_IA32_PRED_CMD);
@@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                return false;
  
        page = nested_get_page(vcpu, vmcs12->msr_bitmap);
-@@ -9559,6 +9652,12 @@ static inline bool nested_vmx_merge_msr_
+@@ -9550,6 +9643,12 @@ static inline bool nested_vmx_merge_msr_
                }
        }
  

diff --git a/queue-4.9/kvm-vmx-emulate-msr_ia32_arch_capabilities.patch b/queue-4.9/kvm-vmx-emulate-msr_ia32_arch_capabilities.patch
index 4e57abb2ce5b8c3e3ebc22fe37675585ebe37b17..ca95c0355a6f3d1b801304f5bc0c21ad93ee5d21 100644 (file)
--- a/queue-4.9/kvm-vmx-emulate-msr_ia32_arch_capabilities.patch
+++ b/queue-4.9/kvm-vmx-emulate-msr_ia32_arch_capabilities.patch
@@ -127,7 +127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        case MSR_IA32_CR_PAT:
                if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) {
                        if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data))
-@@ -5200,6 +5213,8 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -5196,6 +5209,8 @@ static int vmx_vcpu_setup(struct vcpu_vm
                ++vmx->nmsrs;
        }
  

diff --git a/queue-4.9/kvm-vmx-introduce-alloc_loaded_vmcs.patch b/queue-4.9/kvm-vmx-introduce-alloc_loaded_vmcs.patch
index 5a011cec496ceb3cfb5fee31a3d1d5138fdb7d2e..0fd8bb320501e72db4c024b9aa9269f664e11e9f 100644 (file)
--- a/queue-4.9/kvm-vmx-introduce-alloc_loaded_vmcs.patch
+++ b/queue-4.9/kvm-vmx-introduce-alloc_loaded_vmcs.patch
@@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static void free_kvm_area(void)
  {
        int cpu;
-@@ -6947,6 +6958,7 @@ static int handle_vmon(struct kvm_vcpu *
+@@ -6943,6 +6954,7 @@ static int handle_vmon(struct kvm_vcpu *
        struct vmcs *shadow_vmcs;
        const u64 VMXON_NEEDED_FEATURES = FEATURE_CONTROL_LOCKED
                | FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;
@@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        /* The Intel VMX Instruction Reference lists a bunch of bits that
         * are prerequisite to running VMXON, most notably cr4.VMXE must be
-@@ -6986,11 +6998,9 @@ static int handle_vmon(struct kvm_vcpu *
+@@ -6982,11 +6994,9 @@ static int handle_vmon(struct kvm_vcpu *
                return 1;
        }
  
@@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        if (cpu_has_vmx_msr_bitmap()) {
                vmx->nested.msr_bitmap =
-@@ -9111,17 +9121,15 @@ static struct kvm_vcpu *vmx_create_vcpu(
+@@ -9107,17 +9117,15 @@ static struct kvm_vcpu *vmx_create_vcpu(
        if (!vmx->guest_msrs)
                goto free_pml;
  

diff --git a/queue-4.9/kvm-vmx-make-msr-bitmaps-per-vcpu.patch b/queue-4.9/kvm-vmx-make-msr-bitmaps-per-vcpu.patch
index 311396544dc220a43cc06ddf6979e6b2fa01cffe..254ecd2a7f945a95e2c14491f1feddfa57022b49 100644 (file)
--- a/queue-4.9/kvm-vmx-make-msr-bitmaps-per-vcpu.patch
+++ b/queue-4.9/kvm-vmx-make-msr-bitmaps-per-vcpu.patch
@@ -314,7 +314,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static bool vmx_get_enable_apicv(void)
-@@ -4980,7 +4983,7 @@ static void vmx_refresh_apicv_exec_ctrl(
+@@ -4976,7 +4979,7 @@ static void vmx_refresh_apicv_exec_ctrl(
        }
  
        if (cpu_has_vmx_msr_bitmap())
@@ -323,7 +323,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static u32 vmx_exec_control(struct vcpu_vmx *vmx)
-@@ -5069,7 +5072,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
+@@ -5065,7 +5068,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
                vmcs_write64(VMWRITE_BITMAP, __pa(vmx_vmwrite_bitmap));
        }
        if (cpu_has_vmx_msr_bitmap())
@@ -332,7 +332,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        vmcs_write64(VMCS_LINK_POINTER, -1ull); /* 22.3.1.5 */
  
-@@ -6400,7 +6403,7 @@ static void wakeup_handler(void)
+@@ -6396,7 +6399,7 @@ static void wakeup_handler(void)
  
  static __init int hardware_setup(void)
  {
@@ -341,7 +341,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        rdmsrl_safe(MSR_EFER, &host_efer);
  
-@@ -6415,41 +6418,13 @@ static __init int hardware_setup(void)
+@@ -6411,41 +6414,13 @@ static __init int hardware_setup(void)
        if (!vmx_io_bitmap_b)
                goto out;
  
@@ -385,7 +385,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        memset(vmx_vmread_bitmap, 0xff, PAGE_SIZE);
        memset(vmx_vmwrite_bitmap, 0xff, PAGE_SIZE);
-@@ -6458,12 +6433,9 @@ static __init int hardware_setup(void)
+@@ -6454,12 +6429,9 @@ static __init int hardware_setup(void)
  
        memset(vmx_io_bitmap_b, 0xff, PAGE_SIZE);
  
@@ -399,7 +399,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        }
  
        if (boot_cpu_has(X86_FEATURE_NX))
-@@ -6520,47 +6492,8 @@ static __init int hardware_setup(void)
+@@ -6516,47 +6488,8 @@ static __init int hardware_setup(void)
                kvm_tsc_scaling_ratio_frac_bits = 48;
        }
  
@@ -447,7 +447,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (enable_ept) {
                kvm_mmu_set_mask_ptes(VMX_EPT_READABLE_MASK,
                        (enable_ept_ad_bits) ? VMX_EPT_ACCESS_BIT : 0ull,
-@@ -6606,22 +6539,10 @@ static __init int hardware_setup(void)
+@@ -6602,22 +6535,10 @@ static __init int hardware_setup(void)
  
        return alloc_kvm_area();
  
@@ -472,7 +472,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  out1:
        free_page((unsigned long)vmx_io_bitmap_b);
  out:
-@@ -6632,12 +6553,6 @@ out:
+@@ -6628,12 +6549,6 @@ out:
  
  static __exit void hardware_unsetup(void)
  {
@@ -485,7 +485,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        free_page((unsigned long)vmx_io_bitmap_b);
        free_page((unsigned long)vmx_io_bitmap_a);
        free_page((unsigned long)vmx_vmwrite_bitmap);
-@@ -7002,13 +6917,6 @@ static int handle_vmon(struct kvm_vcpu *
+@@ -6998,13 +6913,6 @@ static int handle_vmon(struct kvm_vcpu *
        if (r < 0)
                goto out_vmcs02;
  
@@ -499,7 +499,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        vmx->nested.cached_vmcs12 = kmalloc(VMCS12_SIZE, GFP_KERNEL);
        if (!vmx->nested.cached_vmcs12)
                goto out_cached_vmcs12;
-@@ -7038,9 +6946,6 @@ out_shadow_vmcs:
+@@ -7034,9 +6942,6 @@ out_shadow_vmcs:
        kfree(vmx->nested.cached_vmcs12);
  
  out_cached_vmcs12:
@@ -509,7 +509,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        free_loaded_vmcs(&vmx->nested.vmcs02);
  
  out_vmcs02:
-@@ -7119,10 +7024,6 @@ static void free_nested(struct vcpu_vmx
+@@ -7115,10 +7020,6 @@ static void free_nested(struct vcpu_vmx
        vmx->nested.vmxon = false;
        free_vpid(vmx->nested.vpid02);
        nested_release_vmcs12(vmx);
@@ -520,7 +520,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (enable_shadow_vmcs) {
                vmcs_clear(vmx->vmcs01.shadow_vmcs);
                free_vmcs(vmx->vmcs01.shadow_vmcs);
-@@ -8469,7 +8370,7 @@ static void vmx_set_virtual_x2apic_mode(
+@@ -8465,7 +8366,7 @@ static void vmx_set_virtual_x2apic_mode(
        }
        vmcs_write32(SECONDARY_VM_EXEC_CONTROL, sec_exec_control);
  
@@ -529,7 +529,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static void vmx_set_apic_access_page_addr(struct kvm_vcpu *vcpu, hpa_t hpa)
-@@ -9089,6 +8990,7 @@ static struct kvm_vcpu *vmx_create_vcpu(
+@@ -9085,6 +8986,7 @@ static struct kvm_vcpu *vmx_create_vcpu(
  {
        int err;
        struct vcpu_vmx *vmx = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL);
@@ -537,7 +537,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        int cpu;
  
        if (!vmx)
-@@ -9129,6 +9031,15 @@ static struct kvm_vcpu *vmx_create_vcpu(
+@@ -9125,6 +9027,15 @@ static struct kvm_vcpu *vmx_create_vcpu(
        if (err < 0)
                goto free_msrs;
  
@@ -553,7 +553,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        vmx->loaded_vmcs = &vmx->vmcs01;
        cpu = get_cpu();
        vmx_vcpu_load(&vmx->vcpu, cpu);
-@@ -9523,7 +9434,7 @@ static inline bool nested_vmx_merge_msr_
+@@ -9519,7 +9430,7 @@ static inline bool nested_vmx_merge_msr_
        int msr;
        struct page *page;
        unsigned long *msr_bitmap_l1;
@@ -562,7 +562,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
        /* This shortcut is ok because we support only x2APIC MSRs so far. */
        if (!nested_cpu_has_virt_x2apic_mode(vmcs12))
-@@ -10043,6 +9954,9 @@ static void prepare_vmcs02(struct kvm_vc
+@@ -10034,6 +9945,9 @@ static void prepare_vmcs02(struct kvm_vc
        if (kvm_has_tsc_control)
                decache_tsc_multiplier(vmx);
  
@@ -572,7 +572,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (enable_vpid) {
                /*
                 * There is no direct mapping between vpid02 and vpid12, the
-@@ -10747,7 +10661,7 @@ static void load_vmcs12_host_state(struc
+@@ -10738,7 +10652,7 @@ static void load_vmcs12_host_state(struc
        vmcs_write64(GUEST_IA32_DEBUGCTL, 0);
  
        if (cpu_has_vmx_msr_bitmap())

diff --git a/queue-4.9/kvm-x86-add-ibpb-support.patch b/queue-4.9/kvm-x86-add-ibpb-support.patch
index 2fba2d6f3c827771a40c3755ae1a19efb7178ef9..1f3a39625f651581a2b78e251bb3d198d0c649e0 100644 (file)
--- a/queue-4.9/kvm-x86-add-ibpb-support.patch
+++ b/queue-4.9/kvm-x86-add-ibpb-support.patch
@@ -302,7 +302,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        case MSR_IA32_CR_PAT:
                if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT) {
                        if (!kvm_mtrr_valid(vcpu, MSR_IA32_CR_PAT, data))
-@@ -9435,9 +9489,23 @@ static inline bool nested_vmx_merge_msr_
+@@ -9431,9 +9485,23 @@ static inline bool nested_vmx_merge_msr_
        struct page *page;
        unsigned long *msr_bitmap_l1;
        unsigned long *msr_bitmap_l0 = to_vmx(vcpu)->nested.vmcs02.msr_bitmap;
@@ -328,7 +328,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                return false;
  
        page = nested_get_page(vcpu, vmcs12->msr_bitmap);
-@@ -9475,6 +9543,13 @@ static inline bool nested_vmx_merge_msr_
+@@ -9466,6 +9534,13 @@ static inline bool nested_vmx_merge_msr_
                                MSR_TYPE_W);
                }
        }

diff --git a/queue-4.9/series b/queue-4.9/series
index aa24141bdf567c850374e19fe096166a0b22c0f0..9cdacf3311cbec62a27dfc341af53c0fc8302d99 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -73,6 +73,7 @@ x86-retpoline-avoid-retpolines-for-built-in-__init-functions.patch
 x86-spectre-simplify-spectre_v2-command-line-parsing.patch
 x86-pti-mark-constant-arrays-as-__initconst.patch
 x86-speculation-fix-typo-ibrs_att-which-should-be-ibrs_all.patch
+kvm-nvmx-kmap-can-t-fail.patch
 kvm-nvmx-vmx_complete_nested_posted_interrupt-can-t-fail.patch
 kvm-nvmx-mark-vmcs12-pages-dirty-on-l2-exit.patch
 kvm-nvmx-eliminate-vmcs02-pool.patch