Re: [PATCH v7 7/8] gpiolib: let the character device free its IRQs first on chip removal

From: Kent Gibson

Date: Fri Nov 20 2026 - 23:47:27 EST


On Fri, Nov 20, 2026 at 10:13:59AM +0200, Adrian Ambrozewicz wrote:
> gpiochip_remove() force-frees the remaining IRQs, removes the irqchip,
> and only then calls the device notifier on which the character device
> frees its own IRQs. The character device can then free an IRQ it no
> longer owns: after its mapping was disposed of and the number reused, or
> from a release that races gpiod_free_irqs() and
> gpiochip_irqchip_remove(). free_irq() then warns "Trying to free
> already-free IRQ" or uses a disposed descriptor.
>
> Call the notifier once the chip pointer is cleared and the SRCU grace
> period has elapsed, when no ioctl can request IRQs any more, and free
> the remaining IRQs after it. Have the release paths free their IRQs
> before unregistering from the notifier, under the lock its callback
> takes (config_mutex, or a new mutex for v1 line events). Herve Codina
> first proposed calling the notifier earlier [1].
>
> IRQs that in-kernel users leave requested are now freed after the chip
> pointer is cleared, when gpiod_*() calls on the chip fail.
>
> Reproduced with a test-only chip on the hierarchical irqchip: both races
> warn in all 30 cycles; with this change, none does.
>
> Link: https://lore.kernel.org/all/20240227113426.253232-1-herve.codina@xxxxxxxxxxx/ [1]
> Fixes: ec8b6f55b981 ("gpio: free irqs that are still requested when the chip is being removed")
> Cc: stable@xxxxxxxxxxxxxxx
> Signed-off-by: Adrian Ambrozewicz <aambrozewicz@xxxxxxxxxx>
> ---
> drivers/gpio/gpiolib-cdev.c | 37 ++++++++++++++++++++++++++-----------
> drivers/gpio/gpiolib.c | 28 +++++++++++++++++++++++-----
> 2 files changed, 49 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-cdev.c b/drivers/gpio/gpiolib-cdev.c
> index d829f7d00b5e..ceecce572a52 100644
> --- a/drivers/gpio/gpiolib-cdev.c
> +++ b/drivers/gpio/gpiolib-cdev.c
> @@ -1590,19 +1590,25 @@ static void linereq_free(struct linereq *lr)
> {
> unsigned int i;
>
> + /*
> + * Stop edge detection while still registered for the notification, so
> + * that gpiochip_remove() does not get past it until the IRQs are freed.
> + */
> + scoped_guard(mutex, &lr->config_mutex) {
> + for (i = 0; i < lr->num_lines; i++)
> + edge_detector_stop(&lr->lines[i]);
> + }
> +
> if (lr->device_unregistered_nb.notifier_call)
> blocking_notifier_chain_unregister(&lr->gdev->device_notifier,
> &lr->device_unregistered_nb);
>
> - for (i = 0; i < lr->num_lines; i++) {
> - if (lr->lines[i].desc) {
> - edge_detector_stop(&lr->lines[i]);
> - gpiod_free(lr->lines[i].desc);
> - }
> - }
> + for (i = 0; i < lr->num_lines; i++)
> + gpiod_free(lr->lines[i].desc);
> kfifo_free(&lr->events);
> kfree(lr->label);
> gpio_device_put(lr->gdev);
> + mutex_destroy(&lr->config_mutex);
> kvfree(lr);
> }
>
> @@ -1673,6 +1679,7 @@ static int linereq_create(struct gpio_device *gdev, void __user *ip)
> if (!lr)
> return -ENOMEM;
> lr->num_lines = ulr.num_lines;
> + mutex_init(&lr->config_mutex);
>
> lr->gdev = gpio_device_get(gdev);
>
> @@ -1690,7 +1697,6 @@ static int linereq_create(struct gpio_device *gdev, void __user *ip)
> return -ENOMEM;
> }
>
> - mutex_init(&lr->config_mutex);

What is the rationale for relocating the mutex_init()?
Looks like a gratuitous change, and if this patch is going to be
backported then it should be kept minimal.

> init_waitqueue_head(&lr->wait);
> INIT_KFIFO(lr->events);
> lr->event_buffer_size = ulr.event_buffer_size;
> @@ -1790,6 +1796,7 @@ static int linereq_create(struct gpio_device *gdev, void __user *ip)
> * @eflags: the event flags this line was requested with
> * @irq: the interrupt that trigger in response to events on this GPIO
> * @irq_label: the name @irq was requested with
> + * @irq_lock: serializes freeing @irq on release and on chip removal
> * @wait: wait queue that handles blocking reads of events
> * @device_unregistered_nb: notifier block for receiving gdev unregister events
> * @events: KFIFO for the GPIO events
> @@ -1804,6 +1811,8 @@ struct lineevent_state {
> u32 eflags;
> int irq;
> char *irq_label;
> + /* release vs. chip removal notifier */
> + struct mutex irq_lock;
> wait_queue_head_t wait;
> struct notifier_block device_unregistered_nb;
> DECLARE_KFIFO(events, struct gpioevent_data, 16);
> @@ -1839,8 +1848,10 @@ static int lineevent_unregistered_notify(struct notifier_block *nb,
> struct lineevent_state *le = container_of(nb, struct lineevent_state,
> device_unregistered_nb);
>
> - free_line_irq(le->irq, le, &le->irq_label);
> - le->irq = 0;
> + scoped_guard(mutex, &le->irq_lock) {
> + free_line_irq(le->irq, le, &le->irq_label);
> + le->irq = 0;
> + }

The lines removed/guarded were added in patch 3, so note that this patch is
dependent on patch 3 in the description[1].

>
> wake_up_poll(&le->wait, EPOLLIN | EPOLLERR);
>
> @@ -1920,14 +1931,18 @@ static ssize_t lineevent_read(struct file *file, char __user *buf,
>
> static void lineevent_free(struct lineevent_state *le)
> {
> + scoped_guard(mutex, &le->irq_lock) {
> + free_line_irq(le->irq, le, &le->irq_label);
> + le->irq = 0;
> + }
> if (le->device_unregistered_nb.notifier_call)
> blocking_notifier_chain_unregister(&le->gdev->device_notifier,
> &le->device_unregistered_nb);
> - free_line_irq(le->irq, le, &le->irq_label);

The line removed/guarded was added in patch 5, so note that this patch is
dependent on patch 5 in the description[1].

> if (le->desc)
> gpiod_free(le->desc);
> kfree(le->label);
> gpio_device_put(le->gdev);
> + mutex_destroy(&le->irq_lock);
> kfree(le);
> }
>
> @@ -2101,6 +2116,7 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)
> le = kzalloc_obj(*le);
> if (!le)
> return -ENOMEM;
> + mutex_init(&le->irq_lock);
> le->gdev = gpio_device_get(gdev);
>
> if (eventreq.consumer_label[0] != '\0') {
> @@ -2836,5 +2852,4 @@ int gpiolib_cdev_register(struct gpio_chip *gc, dev_t devt)
> void gpiolib_cdev_unregister(struct gpio_device *gdev)
> {
> cdev_device_del(&gdev->chrdev, &gdev->dev);
> - blocking_notifier_call_chain(&gdev->device_notifier, 0, NULL);
> }
> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> index 9832f755312f..e0ba17a73c4b 100644
> --- a/drivers/gpio/gpiolib.c
> +++ b/drivers/gpio/gpiolib.c
> @@ -854,11 +854,22 @@ bool gpiochip_line_is_valid(const struct gpio_chip *gc,
> }
> EXPORT_SYMBOL_GPL(gpiochip_line_is_valid);
>
> -static void gpiod_free_irqs(struct gpio_desc *desc)
> +static void gpiod_free_irqs(struct gpio_chip *gc, struct gpio_desc *desc)
> {
> - int irq = gpiod_to_irq(desc);
> - struct irq_desc *irqd = irq_to_desc(irq);
> + struct irq_desc *irqd;
> void *cookie;
> + int irq;
> +
> + /* Called with gdev->chip already NULL, so gpiod_to_irq() can't be used. */
> + if (!gc->to_irq)
> + return;
> + irq = gc->to_irq(gc, gpiod_hwgpio(desc));
> + if (irq <= 0)
> + return;
> +
> + irqd = irq_to_desc(irq);
> + if (!irqd)
> + return;
>
> for (;;) {
> /*
> @@ -890,7 +901,7 @@ static void gpiochip_free_remaining_irqs(struct gpio_chip *gc)
> struct gpio_desc *desc;
>
> for_each_gpio_desc_with_flag(gc, desc, GPIOD_FLAG_USED_AS_IRQ)
> - gpiod_free_irqs(desc);
> + gpiod_free_irqs(gc, desc);
> }
>
> static void gpiodev_release(struct device *dev)
> @@ -1439,7 +1450,6 @@ void gpiochip_remove(struct gpio_chip *gc)
> /* FIXME: should the legacy sysfs handling be moved to gpio_device? */
> gpiochip_sysfs_unregister(gc);
> gpiochip_free_hogs(gc);
> - gpiochip_free_remaining_irqs(gc);
>
> scoped_guard(mutex, &gpio_devices_lock)
> list_del_rcu(&gdev->list);
> @@ -1448,6 +1458,14 @@ void gpiochip_remove(struct gpio_chip *gc)
> /* Numb the device, cancelling all outstanding operations */
> rcu_assign_pointer(gdev->chip, NULL);
> synchronize_srcu(&gdev->srcu);
> +
> + /*
> + * No new interrupts can be requested through the character device now.
> + * Have it free the ones it holds before forcibly freeing the rest, and
> + * both before the irqchip and its mappings go away.
> + */
> + blocking_notifier_call_chain(&gdev->device_notifier, 0, NULL);
> + gpiochip_free_remaining_irqs(gc);
> gpio_device_teardown_shared(gdev);
> gpiochip_irqchip_remove(gc);
> acpi_gpiochip_remove(gc);
> --
> 2.43.0

Cheers,
Kent.

[1] https://www.kernel.org/doc/html/latest/process/submitting-patches.html#separate-your-changes