KVM: x86: Check target, not vCPU's x2APIC ID, when applying hotplug hack

When applying the hotplug hack to match x2APIC IDs for vCPUs in xAPIC
mode, check the target APID ID for being unaddressable in xAPIC mode
instead of checking the vCPU's x2APIC ID, and in that case proceed as
if apic_x2apic_mode(vcpu) were true.

Functionally, it does not matter whether you compare kvm_x2apic_id(apic)
or mda with 0xff, since the two values are then checked for equality.
But in isolation, checking the x2APIC ID takes an unnecessary dependency
on the x2APIC ID being read-only (which isn't strictly true on AMD CPUs,
and is difficult to document as well); it also requires KVM to fallthrough
and check the xAPIC ID as well to deal with a writable xAPIC ID, whereas
the xAPIC ID _can't_ match a target ID greater than 0xff.

Opportunistically reword the comment to call out the various subtleties,
and to fix a typo reported by Zhang Jiaming.

No functional change intended.

Cc: Zhang Jiaming <jiaming@nfschina.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 50354c7a2dc13bf73266079a4bf14bb508fe1861..9d4f73c4dc02aa0644ce64559a518ae650f12377 100644 (file)
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -826,17 +826,17 @@ static bool kvm_apic_match_physical_addr(struct kvm_lapic *apic, u32 mda)
        if (kvm_apic_broadcast(apic, mda))
                return true;
 
-       if (apic_x2apic_mode(apic))
-               return mda == kvm_x2apic_id(apic);
-
        /*
-        * Hotplug hack: Make LAPIC in xAPIC mode also accept interrupts as if
-        * it were in x2APIC mode.  Hotplugged VCPUs start in xAPIC mode and
-        * this allows unique addressing of VCPUs with APIC ID over 0xff.
-        * The 0xff condition is needed because writeable xAPIC ID.
+        * Hotplug hack: Accept interrupts for vCPUs in xAPIC mode as if they
+        * were in x2APIC mode if the target APIC ID can't be encoded as an
+        * xAPIC ID.  This allows unique addressing of hotplugged vCPUs (which
+        * start in xAPIC mode) with an APIC ID that is unaddressable in xAPIC
+        * mode.  Match the x2APIC ID if and only if the target APIC ID can't
+        * be encoded in xAPIC to avoid spurious matches against a vCPU that
+        * changed its (addressable) xAPIC ID (which is writable).
         */
-       if (kvm_x2apic_id(apic) > 0xff && mda == kvm_x2apic_id(apic))
-               return true;
+       if (apic_x2apic_mode(apic) || mda > 0xff)
+               return mda == kvm_x2apic_id(apic);
 
        return mda == kvm_xapic_id(apic);
 }