gpio: ml-ioh: Add devm_free_irq() call to remove flow
Subsystems (2)
PATCH 1/1 gpio: ml-ioh: Add devm_free_irq() call to remove flow
When removing the module, we will get the following flaw:
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 14.209994] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 14.217820] Call Trace: [ 14.218057] <TASK> [ 14.218264] unregister_irq_proc+0x14c/0x170 [ 14.218674] irq_free_descs+0x94/0xe0 [ 14.219019] mp_unmap_irq+0xb6/0x100 [ 14.219357] acpi_unregister_gsi_ioapic+0x27/0x40 [ 14.219796] acpi_pci_irq_disable+0x1d3/0x320 [ 14.220206] pci_disable_device+0x1ad/0x380 [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh] [ 14.221075] pci_device_remove+0x92/0x240
Fix this bug by adding devm_free_irq() call to remove flow.
--- drivers/gpio/gpio-ml-ioh.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-ml-ioh.c +2 -0
@@ -508,6 +508,8 @@ static void ioh_gpio_remove(struct pci_dev *pdev)struct ioh_gpio *chip =pci_get_drvdata (pdev);void *chip_save; +devm_free_irq (&pdev->dev, pdev->irq, chip); + chip_save = chip;for (i =0 ; i <8 ; i++, chip++)
Signature · 1 line
2.25.1
Quoted 2 lines · Zheyu Ma
When removing the module, we will get the following flaw:
Thanks for the report and patch! My comments below.
Quoted 5 lines
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 14.209994] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 14.217820] Call Trace: [ 14.218057] <TASK>
Quoted 8 lines
[ 14.218264] unregister_irq_proc+0x14c/0x170 [ 14.218674] irq_free_descs+0x94/0xe0 [ 14.219019] mp_unmap_irq+0xb6/0x100 [ 14.219357] acpi_unregister_gsi_ioapic+0x27/0x40 [ 14.219796] acpi_pci_irq_disable+0x1d3/0x320 [ 14.220206] pci_disable_device+0x1ad/0x380 [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh] [ 14.221075] pci_device_remove+0x92/0x240
Can we remove not so important lines from the above? I guess ~3-4 selected ones would be enough.
Quoted 1 line
Fix this bug by adding
devm_free_irq()call to remove flow.
Fixes tag?
Quoted 1 line
Signed-off-by Zheyu Ma <[email protected]>
The code looks okay on the first glance.
P.S. Do you have such hardware?
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v2 1/1 gpio: ml-ioh: Add devm_free_irq() call to remove flow
When removing the module, we will get the following flaw:
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 14.209994] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 14.217820] Call Trace: [ 14.218264] unregister_irq_proc+0x14c/0x170 [ 14.220206] pci_disable_device+0x1ad/0x380 [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh]
Fix this bug by adding devm_free_irq() call to remove flow.
---
Changes in v2:
- Remove unimportant lines from the call trace.
- Add the fixes tag.
--- drivers/gpio/gpio-ml-ioh.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/gpio/gpio-ml-ioh.c +2 -0
@@ -508,6 +508,8 @@ static void ioh_gpio_remove(struct pci_dev *pdev)struct ioh_gpio *chip =pci_get_drvdata (pdev);void *chip_save; +devm_free_irq (&pdev->dev, pdev->irq, chip); + chip_save = chip;for (i =0 ; i <8 ; i++, chip++)
Signature · 1 line
2.25.1
Quoted 28 lines · Zheyu Ma
When removing the module, we will get the following flaw:
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 14.209994] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 14.217820] Call Trace: [ 14.218264] unregister_irq_proc+0x14c/0x170 [ 14.220206] pci_disable_device+0x1ad/0x380 [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh]Fix this bug by adding
devm_free_irq()call to remove flow.Fixes e971ac9a564a ("gpio: ml-ioh: use resource management for irqs")Signed-off-by Zheyu Ma <[email protected]>---
Changes in v2:
- Remove unimportant lines from the call trace.
- Add the fixes tag.--- drivers/gpio/gpio-ml-ioh.c | 2 ++ 1 file changed, 2 insertions(+)drivers/gpio/gpio-ml-ioh.c +0
-0
drivers/gpio/gpio-ml-ioh.c static void ioh_gpio_remove(struct pci_dev *pdev) · line 512
Quoted 5 lines
drivers/gpio/gpio-ml-ioh.c +2
-0@@ -508,6 +508,8 @@ static void ioh_gpio_remove(struct pci_dev *pdev)struct ioh_gpio *chip =pci_get_drvdata (pdev);void *chip_save; +devm_free_irq (&pdev->dev, pdev->irq, chip); +
If you need to use devm_free_anything() in the remove callback then something is simply wrong in the resource handling. Can you instead use devm_gpiochip_add_data() in probe? This most likely would fix this problem because it would correctly order the freeing of resources.
Bart
Quoted 6 lines
drivers/gpio/gpio-ml-ioh.c +0
-1chip_save = chip;for (i =0 ; i <8 ; i++, chip++) --2.25.1
Quoted 9 lines · Zheyu Ma
When removing the module, we will get the following flaw:
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 14.209994] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 14.217820] Call Trace: [ 14.218264] unregister_irq_proc+0x14c/0x170 [ 14.220206] pci_disable_device+0x1ad/0x380 [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh]
I would expect something like:
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 ... [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh] [ 14.221075] pci_device_remove+0x92/0x240
It pretty much explains the case.
Quoted 1 line
Fix this bug by adding
devm_free_irq()call to remove flow.
P.S. When sending a new version do not attach it to previous thread, always
start a new one. It will be simpler to handle by tools.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 26 lines · Andy Shevchenko
Quoted 2 lines · Zheyu Ma
When removing the module, we will get the following flaw:
Thanks for the report and patch! My comments below.
Quoted 5 lines
[ 14.204955] remove_proc_entry: removing non-empty directory 'irq/21', leaking at least 'gpio_ml_ioh' [ 14.205827] WARNING: CPU: 0 PID: 305 at fs/proc/generic.c:717 remove_proc_entry+0x389/0x3f0 [ 14.209994] RIP: 0010:remove_proc_entry+0x389/0x3f0 [ 14.217820] Call Trace: [ 14.218057] <TASK>Quoted 8 lines
[ 14.218264] unregister_irq_proc+0x14c/0x170 [ 14.218674] irq_free_descs+0x94/0xe0 [ 14.219019] mp_unmap_irq+0xb6/0x100 [ 14.219357] acpi_unregister_gsi_ioapic+0x27/0x40 [ 14.219796] acpi_pci_irq_disable+0x1d3/0x320 [ 14.220206] pci_disable_device+0x1ad/0x380 [ 14.220613] ioh_gpio_remove+0xc5/0xe0 [gpio_ml_ioh] [ 14.221075] pci_device_remove+0x92/0x240Can we remove not so important lines from the above? I guess ~3-4 selected ones would be enough.
Quoted 1 line
Fix this bug by adding
devm_free_irq()call to remove flow.
Quoted 7 lines
Fixes tag?
Quoted 1 line
Signed-off-by Zheyu Ma <[email protected]>The code looks okay on the first glance.
P.S. Do you have such hardware?
Thanks for your comments, I've resend the patch.
Actually, I do not have the hardware. I test the driver with a virtual device instead.
Zheyu Ma