[xen master] x86/HVM: send mapcache invalidation request to qemu regardless of preemption

[patchbot@xxxxxxx]

commit 177cf860f0b7dcbb8e0f4b495cad677995444c7a
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Fri Oct 30 14:30:00 2020 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Fri Oct 30 14:30:00 2020 +0100

    x86/HVM: send mapcache invalidation request to qemu regardless of preemption
    
    Even if only part of a hypercall completed before getting preempted,
    invalidation ought to occur. Therefore fold the two return statements.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 xen/arch/x86/hvm/hypercall.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
index b6ccaf4457..ac573c8e94 100644
--- a/xen/arch/x86/hvm/hypercall.c
+++ b/xen/arch/x86/hvm/hypercall.c
@@ -326,14 +326,11 @@ int hvm_hypercall(struct cpu_user_regs *regs)
 
     HVM_DBG_LOG(DBG_LEVEL_HCALL, "hcall%lu -> %lx", eax, regs->rax);
 
-    if ( curr->hcall_preempted )
-        return HVM_HCALL_preempted;
-
     if ( unlikely(currd->arch.hvm.qemu_mapcache_invalidate) &&
          test_and_clear_bool(currd->arch.hvm.qemu_mapcache_invalidate) )
         send_invalidate_req();
 
-    return HVM_HCALL_completed;
+    return curr->hcall_preempted ? HVM_HCALL_preempted : HVM_HCALL_completed;
 }
 
 /*
--
generated by git-patchbot for /home/xen/git/xen.git#master