FAILED: patch "[PATCH] gpio: sch: use raw_spinlock_t in the irq startup path" failed to apply to 5.15-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.15-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-5.15.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 '2026071322-groom-bullring-9669@gregkh' --subject-prefix 'PATCH 5.15.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/2 gpio: sch: use new GPIO line value setter callbacks
From: Bartosz Golaszewski <[email protected]>
[ Upstream commit 883c7eb2c4a9e143b2662ba754f9c16fb31adced ]
struct gpio_chip now has callbacks for setting line values that return an integer, allowing to indicate failures. Convert the driver to using them.
Stable-dep-of: 286533cb14a3 ("gpio: sch: use raw_spinlock_t in the irq startup path")
--- drivers/gpio/gpio-sch.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/gpio/gpio-sch.c +5 -4
@@ -116,7 +116,7 @@ static int sch_gpio_get(struct gpio_chip *gc, unsigned int gpio_num)return sch_gpio_reg_get (sch, gpio_num,GLV ); } -static void sch_gpio_set (struct gpio_chip *gc,unsigned int gpio_num,int val) +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;
@@ -124,6 +124,8 @@ static void sch_gpio_set(struct gpio_chip *gc, unsigned int gpio_num, int val)spin_lock_irqsave (&sch->lock, flags);sch_gpio_reg_set (sch, gpio_num,GLV , val);spin_unlock_irqrestore (&sch->lock, flags); + +return 0 ; } static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,
@@ -145,8 +147,7 @@ static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,* But we cannot prevent a short low pulse if direction is set to high * and an external pull-up is connected. */ -sch_gpio_set (gc, gpio_num, val); -return 0 ; +return sch_gpio_set (gc, gpio_num, val); }static int sch_gpio_get_direction (struct gpio_chip *gc,unsigned int gpio_num)
@@ -165,7 +166,7 @@ static const struct gpio_chip sch_gpio_chip = { .direction_input = sch_gpio_direction_in, .get = sch_gpio_get, .direction_output = sch_gpio_direction_out, - .set = sch_gpio_set, + .set_rv = sch_gpio_set, .get_direction = sch_gpio_get_direction, };
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 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 | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)
drivers/gpio/gpio-sch.c +20 -21
@@ -39,7 +39,7 @@struct sch_gpio {struct gpio_chip chip;struct irq_chip irqchip; -spinlock_t lock; +raw_spinlock_t lock;unsigned short iobase;unsigned short resume_base;
@@ -103,9 +103,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 ; }
@@ -116,16 +116,14 @@ static int sch_gpio_get(struct gpio_chip *gc, unsigned int gpio_num)return sch_gpio_reg_get (sch, gpio_num,GLV ); } -static int sch_gpio_set (struct gpio_chip *gc,unsigned int gpio_num,int val) +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); - -return 0 ; +raw_spin_unlock_irqrestore (&sch->lock, flags); } static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,
@@ -134,9 +132,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
@@ -147,7 +145,8 @@ static int sch_gpio_direction_out(struct gpio_chip *gc, unsigned int gpio_num,* But we cannot prevent a short low pulse if direction is set to high * and an external pull-up is connected. */ -return sch_gpio_set (gc, gpio_num, val); +sch_gpio_set (gc, gpio_num, val); +return 0 ; }static int sch_gpio_get_direction (struct gpio_chip *gc,unsigned int gpio_num)
@@ -166,7 +165,7 @@ static const struct gpio_chip sch_gpio_chip = { .direction_input = sch_gpio_direction_in, .get = sch_gpio_get, .direction_output = sch_gpio_direction_out, - .set_rv = sch_gpio_set, + .set = sch_gpio_set, .get_direction = sch_gpio_get_direction, };
@@ -195,14 +194,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 +213,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 irq_data *d,int val)
@@ -226,9 +225,9 @@ static void sch_irq_mask_unmask(struct irq_data *d, int val)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,GGPE , val); -spin_unlock_irqrestore (&sch->lock, flags); +raw_spin_unlock_irqrestore (&sch->lock, flags); }static void sch_irq_mask (struct irq_data *d)
@@ -251,12 +250,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 =inl (sch->iobase +CORE_BANK_OFFSET +GTS ); resume_status =inl (sch->iobase +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)
@@ -322,7 +321,7 @@ static int sch_gpio_probe(struct platform_device *pdev) pdev->name))return -EBUSY ; -spin_lock_init (&sch->lock); +raw_spin_lock_init (&sch->lock); sch->iobase = res->start; sch->chip = sch_gpio_chip; sch->chip.label =dev_name (&pdev->dev);
Signature · 1 line
2.53.0