FAILED: patch "[PATCH] gpio: sch: use raw_spinlock_t in the irq startup path" failed to apply to 6.12-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 286533cb14a3c8a8bd39ff64ea2fc8e1aa0f638b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071321-providing-hatless-5452@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 286533cb14a3c8a8bd39ff64ea2fc8e1aa0f638b Mon Sep 17 00:00:00 2001
From: Runyu Xiao <[email protected]>
Date: Wed, 17 Jun 2026 23:40:34 +0800
Subject: [PATCH] gpio: sch: use raw_spinlock_t in the irq startup path
sch_irq_unmask() enables the GPIO IRQ and then updates the controller state through sch_irq_mask_unmask(), which takes sch->lock with spin_lock_irqsave(). The callback can be reached from irq_startup() while setting up a requested IRQ. That path is not sleepable, but on PREEMPT_RT a regular spinlock_t becomes a sleeping lock.
This issue was found by our static analysis tool and then manually reviewed against the current tree.
The grounded PoC kept the request_threaded_irq() -> __setup_irq() -> irq_startup() -> sch_irq_unmask() -> sch_irq_mask_unmask() carrier and used the original spin_lock_irqsave(&sch->lock) edge. Lockdep reported:
BUG: sleeping function called from invalid context hardirqs last disabled at ... __setup_irq.constprop.0 ... [vuln_msv] sch_rt_spin_lock_irqsave+0x1c/0x30 [vuln_msv] sch_irq_mask_unmask.constprop.0+0x31/0x70 [vuln_msv] __setup_irq.constprop.0+0xd/0x30 [vuln_msv]
Convert the SCH controller lock to raw_spinlock_t. The same lock is also used by the GPIO direction and value callbacks, but those critical sections only update MMIO-backed GPIO registers and do not contain sleepable operations. Keeping this register lock non-sleeping is therefore appropriate for the irqchip callbacks and does not change the GPIO-side locking contract.
drivers/gpio/gpio-sch.c +16 -16
@@ -39,7 +39,7 @@struct sch_gpio {struct gpio_chip chip;void __iomem *regs; -spinlock_t lock; +raw_spinlock_t lock;unsigned short resume_base;/* GPE handling */
@@ -104,9 +104,9 @@ static int sch_gpio_direction_in(struct gpio_chip *gc, unsigned int gpio_num)struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GIO ,1 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -122,9 +122,9 @@ static int sch_gpio_set(struct gpio_chip *gc, unsigned int gpio_num, int val)struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GLV , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -135,9 +135,9 @@ static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GIO ,0 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);/* * according to the datasheet, writing to the level register has no
@@ -196,14 +196,14 @@ static int sch_irq_type(struct irq_data *d, unsigned int type)return -EINVAL ; } -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GTPE , rising);sch_gpio_reg_set (sch, gpio_num,GTNE , falling);irq_set_handler_locked (d, handle_edge_irq); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -215,9 +215,9 @@ static void sch_irq_ack(struct irq_data *d)irq_hw_number_t gpio_num =irqd_to_hwirq (d);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GTS ,1 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask_unmask (struct gpio_chip *gc,irq_hw_number_t gpio_num,int val)
@@ -225,9 +225,9 @@ static void sch_irq_mask_unmask(struct gpio_chip *gc, irq_hw_number_t gpio_num,struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GGPE , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask (struct irq_data *d)
@@ -268,12 +268,12 @@ static u32 sch_gpio_gpe_handler(acpi_handle gpe_device, u32 gpe, void *context)int offset;u32 ret; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags); core_status =ioread32 (sch->regs +CORE_BANK_OFFSET +GTS ); resume_status =ioread32 (sch->regs +RESUME_BANK_OFFSET +GTS ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); pending = (resume_status << sch->resume_base) | core_status;for_each_set_bit (offset, &pending, sch->chip.ngpio)
@@ -343,7 +343,7 @@ static int sch_gpio_probe(struct platform_device *pdev) sch->regs = regs; -spin_lock_init (&sch->lock); +raw_spin_lock_init (&sch->lock); sch->chip = sch_gpio_chip; sch->chip.label =dev_name (dev); sch->chip.parent = dev;
Sasha Levin
maintainerPATCH 1/1 gpio: sch: use raw_spinlock_t in the irq startup path
From: Runyu Xiao <[email protected]>
[ Upstream commit 286533cb14a3c8a8bd39ff64ea2fc8e1aa0f638b ]
sch_irq_unmask() enables the GPIO IRQ and then updates the controller state through sch_irq_mask_unmask(), which takes sch->lock with spin_lock_irqsave(). The callback can be reached from irq_startup() while setting up a requested IRQ. That path is not sleepable, but on PREEMPT_RT a regular spinlock_t becomes a sleeping lock.
This issue was found by our static analysis tool and then manually reviewed against the current tree.
The grounded PoC kept the request_threaded_irq() -> __setup_irq() -> irq_startup() -> sch_irq_unmask() -> sch_irq_mask_unmask() carrier and used the original spin_lock_irqsave(&sch->lock) edge. Lockdep reported:
BUG: sleeping function called from invalid context hardirqs last disabled at ... __setup_irq.constprop.0 ... [vuln_msv] sch_rt_spin_lock_irqsave+0x1c/0x30 [vuln_msv] sch_irq_mask_unmask.constprop.0+0x31/0x70 [vuln_msv] __setup_irq.constprop.0+0xd/0x30 [vuln_msv]
Convert the SCH controller lock to raw_spinlock_t. The same lock is also used by the GPIO direction and value callbacks, but those critical sections only update MMIO-backed GPIO registers and do not contain sleepable operations. Keeping this register lock non-sleeping is therefore appropriate for the irqchip callbacks and does not change the GPIO-side locking contract.
--- drivers/gpio/gpio-sch.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
drivers/gpio/gpio-sch.c +16 -16
@@ -39,7 +39,7 @@struct sch_gpio {struct gpio_chip chip;void __iomem *regs; -spinlock_t lock; +raw_spinlock_t lock;unsigned short resume_base;/* GPE handling */
@@ -104,9 +104,9 @@ static int sch_gpio_direction_in(struct gpio_chip *gc, unsigned int gpio_num)struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GIO ,1 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -122,9 +122,9 @@ static void sch_gpio_set(struct gpio_chip *gc, unsigned int gpio_num, int val)struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GLV , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); } static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,
@@ -133,9 +133,9 @@ static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GIO ,0 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);/* * according to the datasheet, writing to the level register has no
@@ -195,14 +195,14 @@ static int sch_irq_type(struct irq_data *d, unsigned int type)return -EINVAL ; } -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GTPE , rising);sch_gpio_reg_set (sch, gpio_num,GTNE , falling);irq_set_handler_locked (d, handle_edge_irq); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags);return 0 ; }
@@ -214,9 +214,9 @@ static void sch_irq_ack(struct irq_data *d)irq_hw_number_t gpio_num =irqd_to_hwirq (d);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GTS ,1 ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask_unmask (struct gpio_chip *gc,irq_hw_number_t gpio_num,int val)
@@ -224,9 +224,9 @@ static void sch_irq_mask_unmask(struct gpio_chip *gc, irq_hw_number_t gpio_num,struct sch_gpio *sch =gpiochip_get_data (gc);unsigned long flags; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GGPE , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask (struct irq_data *d)
@@ -267,12 +267,12 @@ static u32 sch_gpio_gpe_handler(acpi_handle gpe_device, u32 gpe, void *context)int offset;u32 ret; -spin_lock_irqsave (&sch->lock, flags); +raw_spin_lock_irqsave (&sch->lock, flags); core_status =ioread32 (sch->regs +CORE_BANK_OFFSET +GTS ); resume_status =ioread32 (sch->regs +RESUME_BANK_OFFSET +GTS ); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); pending = (resume_status << sch->resume_base) | core_status;for_each_set_bit (offset, &pending, sch->chip.ngpio)
@@ -342,7 +342,7 @@ static int sch_gpio_probe(struct platform_device *pdev) sch->regs = regs; -spin_lock_init (&sch->lock); +raw_spin_lock_init (&sch->lock); sch->chip = sch_gpio_chip; sch->chip.label =dev_name (dev); sch->chip.parent = dev;
Signature · 1 line
2.53.0