From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 26 Feb 2021 09:49:06 +0000 (-0500)
Subject: KVM: xen: flush deferred static key before checking it
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c462f859f895840e7cd4f20f822ad4c6df2db489;p=linux.git

KVM: xen: flush deferred static key before checking it

A missing flush would cause the static branch to trigger incorrectly.

Cc: David Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 1d2bc89431a22..bfc928495bd44 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8039,6 +8039,7 @@ void kvm_arch_exit(void)
 	kvm_mmu_module_exit();
 	free_percpu(user_return_msrs);
 	kmem_cache_destroy(x86_fpu_cache);
+	static_key_deferred_flush(&kvm_xen_enabled);
 	WARN_ON(static_branch_unlikely(&kvm_xen_enabled.key));
 }