From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 30 Nov 2021 12:36:41 +0000 (-0500)
Subject: KVM: VMX: clear vmx_x86_ops.sync_pir_to_irr if APICv is disabled
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6890c75c14b3d5dc8a1a355428457388cd830b82;p=linux.git

KVM: VMX: clear vmx_x86_ops.sync_pir_to_irr if APICv is disabled

[ Upstream commit e90e51d5f01d2baae5dcce280866bbb96816e978 ]

There is nothing to synchronize if APICv is disabled, since neither
other vCPUs nor assigned devices can set PIR.ON.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index dacdf2395f01a..4e212f04268bb 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -7776,10 +7776,10 @@ static __init int hardware_setup(void)
 		ple_window_shrink = 0;
 	}
 
-	if (!cpu_has_vmx_apicv()) {
+	if (!cpu_has_vmx_apicv())
 		enable_apicv = 0;
+	if (!enable_apicv)
 		vmx_x86_ops.sync_pir_to_irr = NULL;
-	}
 
 	if (cpu_has_vmx_tsc_scaling()) {
 		kvm_has_tsc_control = true;