x86/irq: Remove outgoing CPU from vector cleanup mask

We want to synchronize new vector assignments with a pending cleanup. Remove a
dying cpu from a pending cleanup mask.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Borislav Petkov <bp@alien8.de>
Tested-by: Joe Lawrence <joe.lawrence@stratus.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jeremiah Mahler <jmmahler@gmail.com>
Cc: andy.shevchenko@gmail.com
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: stable@vger.kernel.org #4.3+
Link: http://lkml.kernel.org/r/20151231160107.045961667@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 16 insertions, 2 deletions

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 91dc2742cfb1..a7fa11e49582 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -633,9 +633,23 @@ void irq_complete_move(struct irq_cfg *cfg)
 void irq_force_complete_move(int irq)
 {
         struct irq_cfg *cfg = irq_cfg(irq);
+        struct apic_chip_data *data;
+
+        if (!cfg)
+                return;
 
-        if (cfg)
-                __irq_complete_move(cfg, cfg->vector);
+        __irq_complete_move(cfg, cfg->vector);
+
+        /*
+         * Remove this cpu from the cleanup mask. The IPI might have been sent
+         * just before the cpu was removed from the offline mask, but has not
+         * been processed because the CPU has interrupts disabled and is on
+         * the way out.
+         */
+        raw_spin_lock(&vector_lock);
+        data = container_of(cfg, struct apic_chip_data, cfg);
+        cpumask_clear_cpu(smp_processor_id(), data->old_domain);
+        raw_spin_unlock(&vector_lock);
 }
 #endif