x86/msi: Make irq_retrigger() functional for posted MSI

Luigi reported that retriggering a posted MSI interrupt does not work
correctly.

The reason is that the retrigger happens at the vector domain by sending an
IPI to the actual vector on the target CPU. That works correctly exactly
once because the posted MSI interrupt chip does not issue an EOI as that's
only required for the posted MSI notification vector itself.

As a consequence the vector becomes stale in the ISR, which not only
affects this vector but also any lower priority vector in the affected
APIC because the ISR bit is not cleared.

Luigi proposed to set the vector in the remap PIR bitmap and raise the
posted MSI notification vector. That works, but that still does not cure a
related problem:

  If there is ever a stray interrupt on such a vector, then the related
  APIC ISR bit becomes stale due to the lack of EOI as described above.
  Unlikely to happen, but if it happens it's not debuggable at all.

So instead of playing games with the PIR, this can be actually solved
for both cases by:

 1) Keeping track of the posted interrupt vector handler state

 2) Implementing a posted MSI specific irq_ack() callback which checks that
    state. If the posted vector handler is inactive it issues an EOI,
    otherwise it delegates that to the posted handler.

This is correct versus affinity changes and concurrent events on the posted
vector as the actual handler invocation is serialized through the interrupt
descriptor lock.

Fixes: ed1e48ea4370 ("iommu/vt-d: Enable posted mode for device MSIs")
Reported-by: Luigi Rizzo <lrizzo@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Luigi Rizzo <lrizzo@google.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251125214631.044440658@linutronix.de
Closes: https://lore.kernel.org/lkml/20251124104836.3685533-1-lrizzo@google.com

diff --git a/arch/x86/include/asm/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
index 5a0d42464d44247fa77e4561b19755f5d07bcfa7..4e55d17558465da86cb803e2421299a4e878fb5c 100644 (file)
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -87,4 +87,11 @@ static inline void panic_if_irq_remap(const char *msg)
 }
 
 #endif /* CONFIG_IRQ_REMAP */
+
+#ifdef CONFIG_X86_POSTED_MSI
+void intel_ack_posted_msi_irq(struct irq_data *irqd);
+#else
+#define intel_ack_posted_msi_irq       NULL
+#endif
+
 #endif /* __X86_IRQ_REMAPPING_H */

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 86f4e574de026722d687469a2ef16eb7bfc7472f..b2fe6181960c3f560a9b736f53506f6c09b5d02b 100644 (file)
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -397,6 +397,7 @@ DEFINE_IDTENTRY_SYSVEC_SIMPLE(sysvec_kvm_posted_intr_nested_ipi)
 
 /* Posted Interrupt Descriptors for coalesced MSIs to be posted */
 DEFINE_PER_CPU_ALIGNED(struct pi_desc, posted_msi_pi_desc);
+static DEFINE_PER_CPU_CACHE_HOT(bool, posted_msi_handler_active);
 
 void intel_posted_msi_init(void)
 {
@@ -414,6 +415,25 @@ void intel_posted_msi_init(void)
        this_cpu_write(posted_msi_pi_desc.ndst, destination);
 }
 
+void intel_ack_posted_msi_irq(struct irq_data *irqd)
+{
+       irq_move_irq(irqd);
+
+       /*
+        * Handle the rare case that irq_retrigger() raised the actual
+        * assigned vector on the target CPU, which means that it was not
+        * invoked via the posted MSI handler below. In that case APIC EOI
+        * is required as otherwise the ISR entry becomes stale and lower
+        * priority interrupts are never going to be delivered after that.
+        *
+        * If the posted handler invoked the device interrupt handler then
+        * the EOI would be premature because it would acknowledge the
+        * posted vector.
+        */
+       if (unlikely(!__this_cpu_read(posted_msi_handler_active)))
+               apic_eoi();
+}
+
 static __always_inline bool handle_pending_pir(unsigned long *pir, struct pt_regs *regs)
 {
        unsigned long pir_copy[NR_PIR_WORDS];
@@ -446,6 +466,8 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_posted_msi_notification)
 
        pid = this_cpu_ptr(&posted_msi_pi_desc);
 
+       /* Mark the handler active for intel_ack_posted_msi_irq() */
+       __this_cpu_write(posted_msi_handler_active, true);
        inc_irq_stat(posted_msi_notification_count);
        irq_enter();
 
@@ -474,6 +496,7 @@ DEFINE_IDTENTRY_SYSVEC(sysvec_posted_msi_notification)
 
        apic_eoi();
        irq_exit();
+       __this_cpu_write(posted_msi_handler_active, false);
        set_irq_regs(old_regs);
 }
 #endif /* X86_POSTED_MSI */

diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_remapping.c
index 4f9b01dc91e86fd7206499988b5ed5f0d87aa835..8bcbfe3d9c72216188165037fef3fe79fcd0965e 100644 (file)
--- a/drivers/iommu/intel/irq_remapping.c
+++ b/drivers/iommu/intel/irq_remapping.c
@@ -1303,17 +1303,17 @@ static struct irq_chip intel_ir_chip = {
  *     irq_enter();
  *             handle_edge_irq()
  *                     irq_chip_ack_parent()
- *                             irq_move_irq(); // No EOI
+ *                             intel_ack_posted_msi_irq(); // No EOI
  *                     handle_irq_event()
  *                             driver_handler()
  *             handle_edge_irq()
  *                     irq_chip_ack_parent()
- *                             irq_move_irq(); // No EOI
+ *                             intel_ack_posted_msi_irq(); // No EOI
  *                     handle_irq_event()
  *                             driver_handler()
  *             handle_edge_irq()
  *                     irq_chip_ack_parent()
- *                             irq_move_irq(); // No EOI
+ *                             intel_ack_posted_msi_irq(); // No EOI
  *                     handle_irq_event()
  *                             driver_handler()
  *     apic_eoi()
@@ -1322,7 +1322,7 @@ static struct irq_chip intel_ir_chip = {
  */
 static struct irq_chip intel_ir_chip_post_msi = {
        .name                   = "INTEL-IR-POST",
-       .irq_ack                = irq_move_irq,
+       .irq_ack                = intel_ack_posted_msi_irq,
        .irq_set_affinity       = intel_ir_set_affinity,
        .irq_compose_msi_msg    = intel_ir_compose_msi_msg,
        .irq_set_vcpu_affinity  = intel_ir_set_vcpu_affinity,