Patch "KVM: VMX: clear vmx_x86_ops.sync_pir_to_irr if APICv is disabled" has been added to the 5.15-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

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

to the 5.15-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     kvm-vmx-clear-vmx_x86_ops.sync_pir_to_irr-if-apicv-i.patch
and it can be found in the queue-5.15 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit aff57bd1c1bda4b2f0b4c5d92854f837fec88a0e
Author: Paolo Bonzini <pbonzini@xxxxxxxxxx>
Date:   Tue Nov 30 07:36:41 2021 -0500

    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@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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;