Skip to content

Commit abb7205

Browse files
avpatelKAGA-KOKO
authored andcommitted
irqchip/sifive-plic: Improve locking safety by using irqsave/irqrestore
Now that PLIC driver is probed as a regular platform driver, the lock dependency validator complains about the safety of handler->enable_lock usage: [ 0.956775] Possible interrupt unsafe locking scenario: [ 0.956998] CPU0 CPU1 [ 0.957247] ---- ---- [ 0.957439] lock(&handler->enable_lock); [ 0.957607] local_irq_disable(); [ 0.957793] lock(&irq_desc_lock_class); [ 0.958021] lock(&handler->enable_lock); [ 0.958246] <Interrupt> [ 0.958342] lock(&irq_desc_lock_class); [ 0.958501] *** DEADLOCK *** To address above, use raw_spin_lock_irqsave/unlock_irqrestore() instead of raw_spin_lock/unlock(). Signed-off-by: Anup Patel <apatel@ventanamicro.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20240222094006.1030709-8-apatel@ventanamicro.com
1 parent 9565210 commit abb7205

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

drivers/irqchip/irq-sifive-plic.c

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,11 @@ static void __plic_toggle(void __iomem *enable_base, int hwirq, int enable)
103103

104104
static void plic_toggle(struct plic_handler *handler, int hwirq, int enable)
105105
{
106-
raw_spin_lock(&handler->enable_lock);
106+
unsigned long flags;
107+
108+
raw_spin_lock_irqsave(&handler->enable_lock, flags);
107109
__plic_toggle(handler->enable_base, hwirq, enable);
108-
raw_spin_unlock(&handler->enable_lock);
110+
raw_spin_unlock_irqrestore(&handler->enable_lock, flags);
109111
}
110112

111113
static inline void plic_irq_toggle(const struct cpumask *mask,
@@ -236,6 +238,7 @@ static int plic_irq_set_type(struct irq_data *d, unsigned int type)
236238
static int plic_irq_suspend(void)
237239
{
238240
unsigned int i, cpu;
241+
unsigned long flags;
239242
u32 __iomem *reg;
240243
struct plic_priv *priv;
241244

@@ -253,12 +256,12 @@ static int plic_irq_suspend(void)
253256
if (!handler->present)
254257
continue;
255258

256-
raw_spin_lock(&handler->enable_lock);
259+
raw_spin_lock_irqsave(&handler->enable_lock, flags);
257260
for (i = 0; i < DIV_ROUND_UP(priv->nr_irqs, 32); i++) {
258261
reg = handler->enable_base + i * sizeof(u32);
259262
handler->enable_save[i] = readl(reg);
260263
}
261-
raw_spin_unlock(&handler->enable_lock);
264+
raw_spin_unlock_irqrestore(&handler->enable_lock, flags);
262265
}
263266

264267
return 0;
@@ -267,6 +270,7 @@ static int plic_irq_suspend(void)
267270
static void plic_irq_resume(void)
268271
{
269272
unsigned int i, index, cpu;
273+
unsigned long flags;
270274
u32 __iomem *reg;
271275
struct plic_priv *priv;
272276

@@ -284,12 +288,12 @@ static void plic_irq_resume(void)
284288
if (!handler->present)
285289
continue;
286290

287-
raw_spin_lock(&handler->enable_lock);
291+
raw_spin_lock_irqsave(&handler->enable_lock, flags);
288292
for (i = 0; i < DIV_ROUND_UP(priv->nr_irqs, 32); i++) {
289293
reg = handler->enable_base + i * sizeof(u32);
290294
writel(handler->enable_save[i], reg);
291295
}
292-
raw_spin_unlock(&handler->enable_lock);
296+
raw_spin_unlock_irqrestore(&handler->enable_lock, flags);
293297
}
294298
}
295299

0 commit comments

Comments
 (0)