4 files changed, 31 insertions, 2 deletions

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 8e90488c3d56..bffb25b50425 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1055,6 +1055,7 @@ struct kvm_x86_ops {
         bool (*umip_emulated)(void);
 
         int (*check_nested_events)(struct kvm_vcpu *vcpu, bool external_intr);
+        void (*request_immediate_exit)(struct kvm_vcpu *vcpu);
 
         void (*sched_in)(struct kvm_vcpu *kvm, int cpu);
 
@@ -1482,6 +1483,7 @@ extern bool kvm_find_async_pf_gfn(struct kvm_vcpu *vcpu, gfn_t gfn);
 
 int kvm_skip_emulated_instruction(struct kvm_vcpu *vcpu);
 int kvm_complete_insn_gp(struct kvm_vcpu *vcpu, int err);
+void __kvm_request_immediate_exit(struct kvm_vcpu *vcpu);
 
 int kvm_is_in_guest(void);
 
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index c7f1c3fd782d..d96092b35936 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -7148,6 +7148,8 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
         .check_intercept = svm_check_intercept,
         .handle_external_intr = svm_handle_external_intr,
 
+        .request_immediate_exit = __kvm_request_immediate_exit,
+
         .sched_in = svm_sched_in,
 
         .pmu_ops = &amd_pmu_ops,
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 62670b2f6d48..a4a1585f47f1 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -1020,6 +1020,8 @@ struct vcpu_vmx {
         int ple_window;
         bool ple_window_dirty;
 
+        bool req_immediate_exit;
+
         /* Support for PML */
 #define PML_ENTITY_NUM          512
         struct page *pml_pg;
@@ -2865,6 +2867,8 @@ static void vmx_prepare_switch_to_guest(struct kvm_vcpu *vcpu)
         u16 fs_sel, gs_sel;
         int i;
 
+        vmx->req_immediate_exit = false;
+
         if (vmx->loaded_cpu_state)
                 return;
 
@@ -7967,6 +7971,9 @@ static __init int hardware_setup(void)
                 kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
         }
 
+        if (!cpu_has_vmx_preemption_timer())
+                kvm_x86_ops->request_immediate_exit = __kvm_request_immediate_exit;
+
         if (cpu_has_vmx_preemption_timer() && enable_preemption_timer) {
                 u64 vmx_msr;
 
@@ -9209,7 +9216,8 @@ static int handle_pml_full(struct kvm_vcpu *vcpu)
 
 static int handle_preemption_timer(struct kvm_vcpu *vcpu)
 {
-        kvm_lapic_expired_hv_timer(vcpu);
+        if (!to_vmx(vcpu)->req_immediate_exit)
+                kvm_lapic_expired_hv_timer(vcpu);
         return 1;
 }
 
@@ -10611,6 +10619,11 @@ static void vmx_update_hv_timer(struct kvm_vcpu *vcpu)
         u64 tscl;
         u32 delta_tsc;
 
+        if (vmx->req_immediate_exit) {
+                vmx_arm_hv_timer(vmx, 0);
+                return;
+        }
+
         if (vmx->hv_deadline_tsc != -1) {
                 tscl = rdtsc();
                 if (vmx->hv_deadline_tsc > tscl)
@@ -12879,6 +12892,11 @@ static int vmx_check_nested_events(struct kvm_vcpu *vcpu, bool external_intr)
         return 0;
 }
 
+static void vmx_request_immediate_exit(struct kvm_vcpu *vcpu)
+{
+        to_vmx(vcpu)->req_immediate_exit = true;
+}
+
 static u32 vmx_get_preemption_timer_value(struct kvm_vcpu *vcpu)
 {
         ktime_t remaining =
@@ -14135,6 +14153,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
         .umip_emulated = vmx_umip_emulated,
 
         .check_nested_events = vmx_check_nested_events,
+        .request_immediate_exit = vmx_request_immediate_exit,
 
         .sched_in = vmx_sched_in,
 
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 5c870203737f..9d0fda9056de 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7361,6 +7361,12 @@ void kvm_vcpu_reload_apic_access_page(struct kvm_vcpu *vcpu)
 }
 EXPORT_SYMBOL_GPL(kvm_vcpu_reload_apic_access_page);
 
+void __kvm_request_immediate_exit(struct kvm_vcpu *vcpu)
+{
+        smp_send_reschedule(vcpu->cpu);
+}
+EXPORT_SYMBOL_GPL(__kvm_request_immediate_exit);
+
 /*
  * Returns 1 to let vcpu_run() continue the guest execution loop without
  * exiting to the userspace.  Otherwise, the value will be returned to the
@@ -7565,7 +7571,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
 
         if (req_immediate_exit) {
                 kvm_make_request(KVM_REQ_EVENT, vcpu);
-                smp_send_reschedule(vcpu->cpu);
+                kvm_x86_ops->request_immediate_exit(vcpu);
         }
 
         trace_kvm_entry(vcpu->vcpu_id);