[xen staging] x86/vmx: Avoid using domain_crash_syncrhonous() in vmx_vmentry_failure()

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen staging] x86/vmx: Avoid using domain_crash_syncrhonous() in vmx_vmentry_failure()

patchbot
commit 499a76634d74f4ec663629fe85239e05d0352bb9
Author:     Andrew Cooper <[hidden email]>
AuthorDate: Tue Feb 6 12:01:08 2018 +0000
Commit:     Andrew Cooper <[hidden email]>
CommitDate: Thu Aug 2 10:10:43 2018 +0100

    x86/vmx: Avoid using domain_crash_syncrhonous() in vmx_vmentry_failure()
   
    There is no need for the syncrhonous varient, as the vmentry failure path can
    just return to processing softirqs.
   
    This is in aid of trying to remove domain_crash_syncrhonous() from the
    codebase.
   
    Signed-off-by: Andrew Cooper <[hidden email]>
    Reviewed-by: Jan Beulich <[hidden email]>
    Acked-by: Kevin Tian <[hidden email]>
---
 xen/arch/x86/hvm/vmx/entry.S | 2 +-
 xen/arch/x86/hvm/vmx/vmcs.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S
index a7d1356354..d18c149376 100644
--- a/xen/arch/x86/hvm/vmx/entry.S
+++ b/xen/arch/x86/hvm/vmx/entry.S
@@ -128,7 +128,7 @@ UNLIKELY_END(realmode)
         /* WARNING! `ret`, `call *`, `jmp *` not safe before this point. */
 
         call vmx_vmentry_failure
-        BUG  /* vmx_vmentry_failure() shouldn't return. */
+        jmp  .Lvmx_process_softirqs
 
 ENTRY(vmx_asm_do_vmentry)
         GET_CURRENT(bx)
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 096a26a36f..262c25260f 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -1784,7 +1784,7 @@ void vmx_vmentry_failure(void)
          error == VMX_INSN_INVALID_HOST_STATE )
         vmcs_dump_vcpu(curr);
 
-    domain_crash_synchronous();
+    domain_crash(curr->domain);
 }
 
 void vmx_do_resume(struct vcpu *v)
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog