1 files changed, 26 insertions, 15 deletions

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 14c1a18d206a..ae4f6d35d19c 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2168,7 +2168,10 @@ static void vmx_set_msr_bitmap(struct kvm_vcpu *vcpu)
 {
         unsigned long *msr_bitmap;
 
-        if (irqchip_in_kernel(vcpu->kvm) && apic_x2apic_mode(vcpu->arch.apic)) {
+        if (is_guest_mode(vcpu))
+                msr_bitmap = vmx_msr_bitmap_nested;
+        else if (irqchip_in_kernel(vcpu->kvm) &&
+                apic_x2apic_mode(vcpu->arch.apic)) {
                 if (is_long_mode(vcpu))
                         msr_bitmap = vmx_msr_bitmap_longmode_x2apic;
                 else
@@ -2476,8 +2479,7 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)
         if (enable_ept) {
                 /* nested EPT: emulate EPT also to L1 */
                 vmx->nested.nested_vmx_secondary_ctls_high |=
-                        SECONDARY_EXEC_ENABLE_EPT |
-                        SECONDARY_EXEC_UNRESTRICTED_GUEST;
+                        SECONDARY_EXEC_ENABLE_EPT;
                 vmx->nested.nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
                          VMX_EPTP_WB_BIT | VMX_EPT_2MB_PAGE_BIT |
                          VMX_EPT_INVEPT_BIT;
@@ -2491,6 +2493,10 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx)
         } else
                 vmx->nested.nested_vmx_ept_caps = 0;
 
+        if (enable_unrestricted_guest)
+                vmx->nested.nested_vmx_secondary_ctls_high |=
+                        SECONDARY_EXEC_UNRESTRICTED_GUEST;
+
         /* miscellaneous data */
         rdmsr(MSR_IA32_VMX_MISC,
                 vmx->nested.nested_vmx_misc_low,
@@ -4367,6 +4373,18 @@ static int vmx_complete_nested_posted_interrupt(struct kvm_vcpu *vcpu)
         return 0;
 }
 
+static inline bool kvm_vcpu_trigger_posted_interrupt(struct kvm_vcpu *vcpu)
+{
+#ifdef CONFIG_SMP
+        if (vcpu->mode == IN_GUEST_MODE) {
+                apic->send_IPI_mask(get_cpu_mask(vcpu->cpu),
+                                POSTED_INTR_VECTOR);
+                return true;
+        }
+#endif
+        return false;
+}
+
 static int vmx_deliver_nested_posted_interrupt(struct kvm_vcpu *vcpu,
                                                 int vector)
 {
@@ -4375,9 +4393,7 @@ static int vmx_deliver_nested_posted_interrupt(struct kvm_vcpu *vcpu,
         if (is_guest_mode(vcpu) &&
             vector == vmx->nested.posted_intr_nv) {
                 /* the PIR and ON have been set by L1. */
-                if (vcpu->mode == IN_GUEST_MODE)
-                        apic->send_IPI_mask(get_cpu_mask(vcpu->cpu),
-                                POSTED_INTR_VECTOR);
+                kvm_vcpu_trigger_posted_interrupt(vcpu);
                 /*
                  * If a posted intr is not recognized by hardware,
                  * we will accomplish it in the next vmentry.
@@ -4409,12 +4425,7 @@ static void vmx_deliver_posted_interrupt(struct kvm_vcpu *vcpu, int vector)
 
         r = pi_test_and_set_on(&vmx->pi_desc);
         kvm_make_request(KVM_REQ_EVENT, vcpu);
-#ifdef CONFIG_SMP
-        if (!r && (vcpu->mode == IN_GUEST_MODE))
-                apic->send_IPI_mask(get_cpu_mask(vcpu->cpu),
-                                POSTED_INTR_VECTOR);
-        else
-#endif
+        if (r || !kvm_vcpu_trigger_posted_interrupt(vcpu))
                 kvm_vcpu_kick(vcpu);
 }
 
@@ -9213,9 +9224,9 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
         }
 
         if (cpu_has_vmx_msr_bitmap() &&
-            exec_control & CPU_BASED_USE_MSR_BITMAPS &&
-            nested_vmx_merge_msr_bitmap(vcpu, vmcs12)) {
-                vmcs_write64(MSR_BITMAP, __pa(vmx_msr_bitmap_nested));
+            exec_control & CPU_BASED_USE_MSR_BITMAPS) {
+                nested_vmx_merge_msr_bitmap(vcpu, vmcs12);
+                /* MSR_BITMAP will be set by following vmx_set_efer. */
         } else
                 exec_control &= ~CPU_BASED_USE_MSR_BITMAPS;