143 lines
4.4 KiB
Diff
143 lines
4.4 KiB
Diff
From d349b691ea7fdefe94bb546a0533b63786c1857d Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Wed, 21 Aug 2013 17:48:46 +0200
|
|
Subject: [PATCH 097/319] genirq: Do not invoke the affinity callback via a
|
|
workqueue on RT
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.106-rt44.tar.xz
|
|
|
|
Joe Korty reported, that __irq_set_affinity_locked() schedules a
|
|
workqueue while holding a rawlock which results in a might_sleep()
|
|
warning.
|
|
This patch uses swork_queue() instead.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
include/linux/interrupt.h | 6 +++++
|
|
kernel/irq/manage.c | 46 ++++++++++++++++++++++++++++++++++++---
|
|
2 files changed, 49 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
|
|
index 315f852b4981..a943c07b54ba 100644
|
|
--- a/include/linux/interrupt.h
|
|
+++ b/include/linux/interrupt.h
|
|
@@ -13,6 +13,7 @@
|
|
#include <linux/hrtimer.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/workqueue.h>
|
|
+#include <linux/swork.h>
|
|
|
|
#include <linux/atomic.h>
|
|
#include <asm/ptrace.h>
|
|
@@ -225,6 +226,7 @@ extern void resume_device_irqs(void);
|
|
* struct irq_affinity_notify - context for notification of IRQ affinity changes
|
|
* @irq: Interrupt to which notification applies
|
|
* @kref: Reference count, for internal use
|
|
+ * @swork: Swork item, for internal use
|
|
* @work: Work item, for internal use
|
|
* @notify: Function to be called on change. This will be
|
|
* called in process context.
|
|
@@ -236,7 +238,11 @@ extern void resume_device_irqs(void);
|
|
struct irq_affinity_notify {
|
|
unsigned int irq;
|
|
struct kref kref;
|
|
+#ifdef CONFIG_PREEMPT_RT_BASE
|
|
+ struct swork_event swork;
|
|
+#else
|
|
struct work_struct work;
|
|
+#endif
|
|
void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
|
|
void (*release)(struct kref *ref);
|
|
};
|
|
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
|
|
index 3c26d0708709..eadcbfbd434a 100644
|
|
--- a/kernel/irq/manage.c
|
|
+++ b/kernel/irq/manage.c
|
|
@@ -285,7 +285,12 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
|
|
|
|
if (desc->affinity_notify) {
|
|
kref_get(&desc->affinity_notify->kref);
|
|
+
|
|
+#ifdef CONFIG_PREEMPT_RT_BASE
|
|
+ swork_queue(&desc->affinity_notify->swork);
|
|
+#else
|
|
schedule_work(&desc->affinity_notify->work);
|
|
+#endif
|
|
}
|
|
irqd_set(data, IRQD_AFFINITY_SET);
|
|
|
|
@@ -323,10 +328,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
|
|
}
|
|
EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
|
|
|
|
-static void irq_affinity_notify(struct work_struct *work)
|
|
+static void _irq_affinity_notify(struct irq_affinity_notify *notify)
|
|
{
|
|
- struct irq_affinity_notify *notify =
|
|
- container_of(work, struct irq_affinity_notify, work);
|
|
struct irq_desc *desc = irq_to_desc(notify->irq);
|
|
cpumask_var_t cpumask;
|
|
unsigned long flags;
|
|
@@ -348,6 +351,35 @@ static void irq_affinity_notify(struct work_struct *work)
|
|
kref_put(¬ify->kref, notify->release);
|
|
}
|
|
|
|
+#ifdef CONFIG_PREEMPT_RT_BASE
|
|
+static void init_helper_thread(void)
|
|
+{
|
|
+ static int init_sworker_once;
|
|
+
|
|
+ if (init_sworker_once)
|
|
+ return;
|
|
+ if (WARN_ON(swork_get()))
|
|
+ return;
|
|
+ init_sworker_once = 1;
|
|
+}
|
|
+
|
|
+static void irq_affinity_notify(struct swork_event *swork)
|
|
+{
|
|
+ struct irq_affinity_notify *notify =
|
|
+ container_of(swork, struct irq_affinity_notify, swork);
|
|
+ _irq_affinity_notify(notify);
|
|
+}
|
|
+
|
|
+#else
|
|
+
|
|
+static void irq_affinity_notify(struct work_struct *work)
|
|
+{
|
|
+ struct irq_affinity_notify *notify =
|
|
+ container_of(work, struct irq_affinity_notify, work);
|
|
+ _irq_affinity_notify(notify);
|
|
+}
|
|
+#endif
|
|
+
|
|
/**
|
|
* irq_set_affinity_notifier - control notification of IRQ affinity changes
|
|
* @irq: Interrupt for which to enable/disable notification
|
|
@@ -376,7 +408,12 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
|
|
if (notify) {
|
|
notify->irq = irq;
|
|
kref_init(¬ify->kref);
|
|
+#ifdef CONFIG_PREEMPT_RT_BASE
|
|
+ INIT_SWORK(¬ify->swork, irq_affinity_notify);
|
|
+ init_helper_thread();
|
|
+#else
|
|
INIT_WORK(¬ify->work, irq_affinity_notify);
|
|
+#endif
|
|
}
|
|
|
|
raw_spin_lock_irqsave(&desc->lock, flags);
|
|
@@ -385,7 +422,10 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
|
|
raw_spin_unlock_irqrestore(&desc->lock, flags);
|
|
|
|
if (old_notify) {
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
+ /* Need to address this for PREEMPT_RT */
|
|
cancel_work_sync(&old_notify->work);
|
|
+#endif
|
|
kref_put(&old_notify->kref, old_notify->release);
|
|
}
|
|
|
|
--
|
|
2.25.0
|
|
|