From: Tejun Heo <tj@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>,
Ben Hutchings <bhutchings@solarflare.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] genirq: don't use flush_scheduled_work() in IRQ affinity notifiers
Date: Wed, 15 Jun 2011 16:29:17 +0200 [thread overview]
Message-ID: <20110615142917.GY8141@htj.dyndns.org> (raw)
cd7eab44e9 (genirq: Add IRQ affinity notifiers) added use of
flush_scheduled_work() which is being deprecated. Add a dedicated
workqueue and flush it instead of flushing system-wide workqueue.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ben Hutchings <bhutchings@solarflare.com>
---
I'm planning on marking flush_scheduled_work() deprecated in
linux-next soonish. It would be great if this patch (or something
else which removes flush_scheduled_work() call somehow) can be
included in linux-next.
Thanks.
include/linux/interrupt.h | 6 +-----
kernel/irq/manage.c | 17 ++++++++++++++++-
2 files changed, 17 insertions(+), 6 deletions(-)
Index: work/include/linux/interrupt.h
===================================================================
--- work.orig/include/linux/interrupt.h
+++ work/include/linux/interrupt.h
@@ -256,11 +256,7 @@ struct irq_affinity_notify {
extern int
irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify);
-
-static inline void irq_run_affinity_notifiers(void)
-{
- flush_scheduled_work();
-}
+extern void irq_run_affinity_notifiers(void);
#else /* CONFIG_SMP */
Index: work/kernel/irq/manage.c
===================================================================
--- work.orig/kernel/irq/manage.c
+++ work/kernel/irq/manage.c
@@ -74,6 +74,16 @@ EXPORT_SYMBOL(synchronize_irq);
#ifdef CONFIG_SMP
cpumask_var_t irq_default_affinity;
+static struct workqueue_struct *irq_affinity_notify_wq;
+
+static int __init irq_affinity_init(void)
+{
+ irq_affinity_notify_wq = alloc_workqueue("irq_affinity_notify", 0, 0);
+ if (!irq_affinity_notify_wq)
+ return -ENOMEM;
+ return 0;
+}
+subsys_initcall(irq_affinity_init);
/**
* irq_can_set_affinity - Check if the affinity of a given irq can be set
@@ -164,7 +174,7 @@ int __irq_set_affinity_locked(struct irq
if (desc->affinity_notify) {
kref_get(&desc->affinity_notify->kref);
- schedule_work(&desc->affinity_notify->work);
+ queue_work(irq_affinity_notify_wq, &desc->affinity_notify->work);
}
irqd_set(data, IRQD_AFFINITY_SET);
@@ -273,6 +283,11 @@ irq_set_affinity_notifier(unsigned int i
}
EXPORT_SYMBOL_GPL(irq_set_affinity_notifier);
+void irq_run_affinity_notifiers(void)
+{
+ flush_workqueue(irq_affinity_notify_wq);
+}
+
#ifndef CONFIG_AUTO_IRQ_AFFINITY
/*
* Generic version of the affinity autoselector.
next reply other threads:[~2011-06-15 14:29 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-15 14:29 Tejun Heo [this message]
2011-06-15 14:30 ` Tejun Heo
2011-06-15 15:25 ` Thomas Gleixner
2011-06-16 23:28 ` Ben Hutchings
2011-06-17 9:45 ` Tejun Heo
2011-07-14 16:49 ` Ben Hutchings
2011-07-21 5:57 ` Tejun Heo
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=20110615142917.GY8141@htj.dyndns.org \
--to=tj@kernel.org \
--cc=bhutchings@solarflare.com \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®