From: Sean Christopherson <seanjc@google.com>
Date: Tue, 1 Apr 2025 16:34:46 +0000 (-0700)
Subject: KVM: VMX: Use arch_xchg() when processing PIR to avoid instrumentation
X-Git-Tag: v6.16-rc1~78^2~7^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=baf68a0e3bd624bc300381a757f660451483fb7f;p=thirdparty%2Fkernel%2Fstable.git

KVM: VMX: Use arch_xchg() when processing PIR to avoid instrumentation

Use arch_xchg() when moving IRQs from the PIR to the vIRR, purely to avoid
instrumentation so that KVM is compatible with the needs of posted MSI.
This will allow extracting the core PIR logic to common code and sharing
it between KVM and posted MSI handling.

Link: https://lore.kernel.org/r/20250401163447.846608-8-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
---

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index bc56775426c90..70ad5f0942e27 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -678,7 +678,7 @@ bool __kvm_apic_update_irr(unsigned long *pir, void *regs, int *max_irr)
 		if (!pir_vals[i])
 			continue;
 
-		pir_vals[i] = xchg(&pir[i], 0);
+		pir_vals[i] = arch_xchg(&pir[i], 0);
 	}
 
 	for (i = vec = 0; i <= 7; i++, vec += 32) {