gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
PATCH 1/1 gpiolib: cdev: Set lineevent_state::irq after IRQ register successfully
When running gpio test on nxp-ls1028 platform with below command gpiomon --num-events=3 --rising-edge gpiochip1 25 There will be a warning trace as below:
Call trace: free_irq+0x204/0x360 lineevent_free+0x64/0x70 gpio_ioctl+0x598/0x6a0 __arm64_sys_ioctl+0xb4/0x100 invoke_syscall+0x5c/0x130
......el0t_64_sync+0x1a0/0x1a4
The reason of this issue is that calling request_threaded_irq() function failed, and then lineevent_free() is invoked to release the resource. Since the lineevent_state::irq was already set, so the subsequent invocation of free_irq() would trigger the above warning call trace. To fix this issue, set the lineevent_state::irq after the IRQ register successfully.
--- drivers/gpio/gpiolib-cdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpio/gpiolib-cdev.c +3 -2
@@ -1784,7 +1784,6 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) ret = -ENODEV ; goto out_free_le; } - le->irq = irq;if (eflags &GPIOEVENT_REQUEST_RISING_EDGE ) irqflags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?
@@ -1798,7 +1797,7 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)init_waitqueue_head (&le->wait);/* Request a thread to read the events */ - ret = request_threaded_irq(le->irq, + ret = request_threaded_irq(irq, lineevent_irq_handler, lineevent_irq_thread, irqflags,
@@ -1807,6 +1806,8 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)if (ret) goto out_free_le; + le->irq = irq; + fd =get_unused_fd_flags (O_RDONLY |O_CLOEXEC );if (fd <0 ) { ret = fd;
Signature · 1 line
2.36.1
Kent Gibson
reviewerQuoted 18 lines · Meng Li
When running gpio test on nxp-ls1028 platform with below command gpiomon --num-events=3 --rising-edge gpiochip1 25 There will be a warning trace as below:
Call trace: free_irq+0x204/0x360 lineevent_free+0x64/0x70 gpio_ioctl+0x598/0x6a0 __arm64_sys_ioctl+0xb4/0x100 invoke_syscall+0x5c/0x130......
el0t_64_sync+0x1a0/0x1a4
The reason of this issue is that callingrequest_threaded_irq()function failed, and thenlineevent_free()is invoked to release the resource. Since thelineevent_state::irqwas already set, so the subsequent invocation offree_irq()would trigger the above warning call trace. To fix this issue, set thelineevent_state::irqafter the IRQ register successfully.
Quoted 3 lines
Fixes 468242724143 ("gpiolib: cdev: refactor lineevent cleanup into lineevent_free")Signed-off-by Meng Li <[email protected]>
Good pick up - the IRQ shouldn't be freed if it hasn't been successfully requested.
Quoted 37 lines
--- drivers/gpio/gpiolib-cdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpio/gpiolib-cdev.c +3
-2@@ -1784,7 +1784,6 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) ret = -ENODEV ; goto out_free_le; } - le->irq = irq;if (eflags &GPIOEVENT_REQUEST_RISING_EDGE ) irqflags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?@@ -1798,7 +1797,7 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)init_waitqueue_head (&le->wait);/* Request a thread to read the events */ - ret = request_threaded_irq(le->irq, + ret = request_threaded_irq(irq, lineevent_irq_handler, lineevent_irq_thread, irqflags,@@ -1807,6 +1806,8 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)if (ret) goto out_free_le; + le->irq = irq; + fd =get_unused_fd_flags (O_RDONLY |O_CLOEXEC );if (fd <0 ) { ret = fd;Signature · 1 line
2.36.1
Quoted 19 lines · Kent Gibson
Quoted 18 lines · Meng Li
When running gpio test on nxp-ls1028 platform with below command gpiomon --num-events=3 --rising-edge gpiochip1 25 There will be a warning trace as below:
Call trace: free_irq+0x204/0x360 lineevent_free+0x64/0x70 gpio_ioctl+0x598/0x6a0 __arm64_sys_ioctl+0xb4/0x100 invoke_syscall+0x5c/0x130......
el0t_64_sync+0x1a0/0x1a4
The reason of this issue is that callingrequest_threaded_irq()function failed, and thenlineevent_free()is invoked to release the resource. Since thelineevent_state::irqwas already set, so the subsequent invocation offree_irq()would trigger the above warning call trace. To fix this issue, set thelineevent_state::irqafter the IRQ register successfully.
Quoted 8 lines
Quoted 3 lines
Fixes 468242724143 ("gpiolib: cdev: refactor lineevent cleanup into lineevent_free")Signed-off-by Meng Li <[email protected]>Good pick up - the IRQ shouldn't be freed if it hasn't been successfully requested.
Signed-off-by Kent Gibson <[email protected]>
Oops, that should be
Bartosz Golaszewski
AppliedQuoted 57 lines · Meng Li
When running gpio test on nxp-ls1028 platform with below command gpiomon --num-events=3 --rising-edge gpiochip1 25 There will be a warning trace as below:
Call trace: free_irq+0x204/0x360 lineevent_free+0x64/0x70 gpio_ioctl+0x598/0x6a0 __arm64_sys_ioctl+0xb4/0x100 invoke_syscall+0x5c/0x130......
el0t_64_sync+0x1a0/0x1a4
The reason of this issue is that callingrequest_threaded_irq()function failed, and thenlineevent_free()is invoked to release the resource. Since thelineevent_state::irqwas already set, so the subsequent invocation offree_irq()would trigger the above warning call trace. To fix this issue, set thelineevent_state::irqafter the IRQ register successfully.Fixes 468242724143 ("gpiolib: cdev: refactor lineevent cleanup into lineevent_free")Signed-off-by Meng Li <[email protected]>--- drivers/gpio/gpiolib-cdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpio/gpiolib-cdev.c +3
-3@@ -1784,7 +1784,6 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) ret = -ENODEV ; goto out_free_le; } - le->irq = irq;if (eflags &GPIOEVENT_REQUEST_RISING_EDGE ) irqflags |= test_bit(FLAG_ACTIVE_LOW, &desc->flags) ?@@ -1798,7 +1797,7 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)init_waitqueue_head (&le->wait);/* Request a thread to read the events */ - ret = request_threaded_irq(le->irq, + ret = request_threaded_irq(irq, lineevent_irq_handler, lineevent_irq_thread, irqflags,@@ -1807,6 +1806,8 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip)if (ret) goto out_free_le; + le->irq = irq; + fd =get_unused_fd_flags (O_RDONLY |O_CLOEXEC );if (fd <0 ) { ret = fd; --
Quoted 2 lines
2.36.1
Applied, thanks!
Bart