From: Frederic Weisbecker <fweisbec@gmail.com>
To: Ingo Molnar <mingo@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Zijlstra <peterz@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
Andrew Morton <akpm@linux-foundation.org>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH 6/9] irq_work: Flush work on CPU_DYING
Date: Sun, 18 Nov 2012 02:04:49 +0100 [thread overview]
Message-ID: <1353200692-6039-7-git-send-email-fweisbec@gmail.com> (raw)
In-Reply-To: <1353200692-6039-1-git-send-email-fweisbec@gmail.com>
From: Steven Rostedt <rostedt@goodmis.org>
In order not to offline a CPU with pending irq works, flush the
queue from CPU_DYING. The notifier is called by stop_machine on
the CPU that is going down. The code will not be called from irq context
(so things like get_irq_regs() wont work) but I'm not sure what the
requirements are for irq_work in that regard (Peter?). But irqs are
disabled and the CPU is about to go offline. Might as well flush the work.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
---
kernel/irq_work.c | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/kernel/irq_work.c b/kernel/irq_work.c
index b3c113a..4ed1749 100644
--- a/kernel/irq_work.c
+++ b/kernel/irq_work.c
@@ -12,6 +12,8 @@
#include <linux/percpu.h>
#include <linux/hardirq.h>
#include <linux/irqflags.h>
+#include <linux/cpu.h>
+#include <linux/notifier.h>
#include <asm/processor.h>
/*
@@ -110,11 +112,7 @@ bool irq_work_needs_cpu(void)
return true;
}
-/*
- * Run the irq_work entries on this cpu. Requires to be ran from hardirq
- * context with local IRQs disabled.
- */
-void irq_work_run(void)
+static void __irq_work_run(void)
{
struct irq_work *work;
struct llist_head *this_list;
@@ -124,7 +122,6 @@ void irq_work_run(void)
if (llist_empty(this_list))
return;
- BUG_ON(!in_irq());
BUG_ON(!irqs_disabled());
llnode = llist_del_all(this_list);
@@ -149,6 +146,16 @@ void irq_work_run(void)
(void)cmpxchg(&work->flags, IRQ_WORK_BUSY, 0);
}
}
+
+/*
+ * Run the irq_work entries on this cpu. Requires to be ran from hardirq
+ * context with local IRQs disabled.
+ */
+void irq_work_run(void)
+{
+ BUG_ON(!in_irq());
+ __irq_work_run();
+}
EXPORT_SYMBOL_GPL(irq_work_run);
/*
@@ -163,3 +170,35 @@ void irq_work_sync(struct irq_work *work)
cpu_relax();
}
EXPORT_SYMBOL_GPL(irq_work_sync);
+
+#ifdef CONFIG_HOTPLUG_CPU
+static int irq_work_cpu_notify(struct notifier_block *self,
+ unsigned long action, void *hcpu)
+{
+ long cpu = (long)hcpu;
+
+ switch (action) {
+ case CPU_DYING:
+ /* Called from stop_machine */
+ if (WARN_ON_ONCE(cpu != smp_processor_id()))
+ break;
+ __irq_work_run();
+ break;
+ default:
+ break;
+ }
+ return NOTIFY_OK;
+}
+
+static struct notifier_block cpu_notify;
+
+static __init int irq_work_init_cpu_notifier(void)
+{
+ cpu_notify.notifier_call = irq_work_cpu_notify;
+ cpu_notify.priority = 0;
+ register_cpu_notifier(&cpu_notify);
+ return 0;
+}
+device_initcall(irq_work_init_cpu_notifier);
+
+#endif /* CONFIG_HOTPLUG_CPU */
--
1.7.5.4
next prev parent reply other threads:[~2012-11-18 1:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-18 1:04 [GIT PULL v2] printk: Make it usable on nohz cpus Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 1/9] irq_work: Fix racy IRQ_WORK_BUSY flag setting Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 2/9] irq_work: Fix racy check on work pending flag Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 3/9] irq_work: Remove CONFIG_HAVE_IRQ_WORK Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 4/9] nohz: Add API to check tick state Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 5/9] irq_work: Don't stop the tick with pending works Frederic Weisbecker
2012-11-18 1:04 ` Frederic Weisbecker [this message]
2012-11-18 1:04 ` [PATCH 7/9] irq_work: Warn if there's still work on cpu_down Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 8/9] irq_work: Make self-IPIs optable Frederic Weisbecker
2012-11-18 1:04 ` [PATCH 9/9] printk: Wake up klogd using irq_work Frederic Weisbecker
2012-12-08 15:02 ` [GIT PULL v2] printk: Make it usable on nohz cpus Ingo Molnar
2012-12-08 22:50 ` Frederic Weisbecker
-- strict thread matches above, loose matches on Subject: below --
2012-11-16 2:21 [PATCH 0/9] printk: Make it usable on nohz cpus v6 Frederic Weisbecker
2012-11-16 2:21 ` [PATCH 6/9] irq_work: Flush work on CPU_DYING Frederic Weisbecker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1353200692-6039-7-git-send-email-fweisbec@gmail.com \
--to=fweisbec@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome