diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/svm/vmenter.S | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S index 38c22fc9cab4..1a3e83e5a277 100644 --- a/arch/x86/kvm/svm/vmenter.S +++ b/arch/x86/kvm/svm/vmenter.S @@ -179,16 +179,14 @@ SYM_FUNC_START(__svm_vcpu_run) /* "POP" @vmcb to RAX. */ pop %_ASM_AX - /* Enter guest mode */ - sti - -1: wrap_prime sev_vcpu_run - vmrun %_ASM_AX - wrap_probe sev_vcpu_run + sti +1: vmrun %_ASM_AX 2: cli + wrap_probe sev_vcpu_run + #ifdef CONFIG_RETPOLINE /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */ FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE @@ -285,17 +283,14 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run) /* Move @vmcb to RAX. */ mov %_ASM_ARG1, %_ASM_AX - /* Enter guest mode */ - sti - -1: - wrap_prime sev_es_vcpu_run - vmrun %_ASM_AX - wrap_probe sev_es_vcpu_run + sti +1: vmrun %_ASM_AX 2: cli + wrap_probe sev_es_vcpu_run + #ifdef CONFIG_RETPOLINE /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */ FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE |