[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-56d7d2f4bbd00fb198b7907cb3ab657d06115a42@git.kernel.org>
Date: Sat, 16 Jan 2016 13:19:58 -0800
From: tip-bot for Thomas Gleixner <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: jiang.liu@...ux.intel.com, linux-kernel@...r.kernel.org,
hpa@...or.com, tglx@...utronix.de, linux@...ck-us.net,
bp@...en8.de, jmmahler@...il.com, joe.lawrence@...atus.com,
mingo@...nel.org
Subject: [tip:x86/urgent] x86/irq:
Remove outgoing CPU from vector cleanup mask
Commit-ID: 56d7d2f4bbd00fb198b7907cb3ab657d06115a42
Gitweb: http://git.kernel.org/tip/56d7d2f4bbd00fb198b7907cb3ab657d06115a42
Author: Thomas Gleixner <tglx@...utronix.de>
AuthorDate: Thu, 31 Dec 2015 16:30:52 +0000
Committer: Thomas Gleixner <tglx@...utronix.de>
CommitDate: Fri, 15 Jan 2016 13:44:01 +0100
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@...utronix.de>
Tested-by: Borislav Petkov <bp@...en8.de>
Tested-by: Joe Lawrence <joe.lawrence@...atus.com>
Cc: Jiang Liu <jiang.liu@...ux.intel.com>
Cc: Jeremiah Mahler <jmmahler@...il.com>
Cc: andy.shevchenko@...il.com
Cc: Guenter Roeck <linux@...ck-us.net>
Cc: stable@...r.kernel.org #4.3+
Link: http://lkml.kernel.org/r/20151231160107.045961667@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
---
arch/x86/kernel/apic/vector.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 91dc274..a7fa11e 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
Powered by blists - more mailing lists