Skip to contentSkip to conversation

vboxguest: add missing devm_free_irq

PATCH In review Pascal Terjan 3 participants 6 messages Jun 9, 2022 – Jun 12, 2022 Virtual box guest device driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 vboxguest: add missing devm_free_irq

This fixes the following warning when unloading the module:

[249348.837181] remove_proc_entry: removing non-empty directory 'irq/20', leaking at least 'vboxguest'
[249348.837219] WARNING: CPU: 0 PID: 6708 at fs/proc/generic.c:715 remove_proc_entry+0x119/0x140
[249348.837379] Call Trace:
[249348.837385]  unregister_irq_proc+0xbd/0xe0
[249348.837392]  free_desc+0x23/0x60
[249348.837396]  irq_free_descs+0x4a/0x70
[249348.837401]  irq_domain_free_irqs+0x160/0x1a0
[249348.837452]  mp_unmap_irq+0x5c/0x60
[249348.837458]  acpi_unregister_gsi_ioapic+0x29/0x40
[249348.837463]  acpi_unregister_gsi+0x17/0x30
[249348.837467]  acpi_pci_irq_disable+0xbf/0xe0
[249348.837473]  pcibios_disable_device+0x20/0x30
[249348.837478]  pci_disable_device+0xef/0x120
[249348.837482]  vbg_pci_remove+0x6c/0x70 [vboxguest]
---
 drivers/virt/vboxguest/vboxguest_linux.c | 1 +
 1 file changed, 1 insertion(+)
drivers/virt/vboxguest/vboxguest_linux.c +1 -0
index 6e8c0f1c1056..faa4bc9f625c 100644
@@ -423,6 +423,7 @@ static void vbg_pci_remove(struct pci_dev *pci)
 	vbg_gdev = NULL;
 	mutex_unlock(&vbg_gdev_mutex);
 
+	devm_free_irq(gdev->dev, pci->irq, gdev);
 	device_remove_file(gdev->dev, &dev_attr_host_features);
 	device_remove_file(gdev->dev, &dev_attr_host_version);
 	misc_deregister(&gdev->misc_device_user);
Signature · 1 line
2.36.1.476.g0c4daa206d-goog
#1 lore raw
Quoted 28 lines · Pascal Terjan

This fixes the following warning when unloading the module:

[249348.837181] remove_proc_entry: removing non-empty directory 'irq/20', leaking at least 'vboxguest'
[249348.837219] WARNING: CPU: 0 PID: 6708 at fs/proc/generic.c:715 remove_proc_entry+0x119/0x140
[249348.837379] Call Trace:
[249348.837385]  unregister_irq_proc+0xbd/0xe0
[249348.837392]  free_desc+0x23/0x60
[249348.837396]  irq_free_descs+0x4a/0x70
[249348.837401]  irq_domain_free_irqs+0x160/0x1a0
[249348.837452]  mp_unmap_irq+0x5c/0x60
[249348.837458]  acpi_unregister_gsi_ioapic+0x29/0x40
[249348.837463]  acpi_unregister_gsi+0x17/0x30
[249348.837467]  acpi_pci_irq_disable+0xbf/0xe0
[249348.837473]  pcibios_disable_device+0x20/0x30
[249348.837478]  pci_disable_device+0xef/0x120
[249348.837482]  vbg_pci_remove+0x6c/0x70 [vboxguest]
---
 drivers/virt/vboxguest/vboxguest_linux.c | 1 +
 1 file changed, 1 insertion(+)
drivers/virt/vboxguest/vboxguest_linux.c +0 -0
index 6e8c0f1c1056..faa4bc9f625c 100644

drivers/virt/vboxguest/vboxguest_linux.c static void vbg_pci_remove(struct pci_dev *pci) · line 426

Quoted 4 lines
drivers/virt/vboxguest/vboxguest_linux.c +1 -0
@@ -423,6 +423,7 @@ static void vbg_pci_remove(struct pci_dev *pci)
 	vbg_gdev = NULL;
 	mutex_unlock(&vbg_gdev_mutex);
 
+	devm_free_irq(gdev->dev, pci->irq, gdev);

The whope point of using devm_* calls is so you don't have to do stuff like this. Perhaps this should not be using devm_() for the irq at all?

thanks,

greg k-h

#2 lore raw
Quoted 33 lines · Greg Kroah-Hartman
Quoted 31 lines · Pascal Terjan

This fixes the following warning when unloading the module:

[249348.837181] remove_proc_entry: removing non-empty directory 'irq/20', leaking at least 'vboxguest'
[249348.837219] WARNING: CPU: 0 PID: 6708 at fs/proc/generic.c:715 remove_proc_entry+0x119/0x140
[249348.837379] Call Trace:
[249348.837385]  unregister_irq_proc+0xbd/0xe0
[249348.837392]  free_desc+0x23/0x60
[249348.837396]  irq_free_descs+0x4a/0x70
[249348.837401]  irq_domain_free_irqs+0x160/0x1a0
[249348.837452]  mp_unmap_irq+0x5c/0x60
[249348.837458]  acpi_unregister_gsi_ioapic+0x29/0x40
[249348.837463]  acpi_unregister_gsi+0x17/0x30
[249348.837467]  acpi_pci_irq_disable+0xbf/0xe0
[249348.837473]  pcibios_disable_device+0x20/0x30
[249348.837478]  pci_disable_device+0xef/0x120
[249348.837482]  vbg_pci_remove+0x6c/0x70 [vboxguest]
---
 drivers/virt/vboxguest/vboxguest_linux.c | 1 +
 1 file changed, 1 insertion(+)
drivers/virt/vboxguest/vboxguest_linux.c +0 -0
index 6e8c0f1c1056..faa4bc9f625c 100644
@@ -423,6 +423,7 @@ static void vbg_pci_remove(struct pci_dev *pci)
      vbg_gdev = NULL;
      mutex_unlock(&vbg_gdev_mutex);
 
Quoted 4 lines

drivers/virt/vboxguest/vboxguest_linux.c static void vbg_pci_remove(struct pci_dev *pci) · line 426

Quoted 1 line
drivers/virt/vboxguest/vboxguest_linux.c +1 -0
+     devm_free_irq(gdev->dev, pci->irq, gdev);

The whope point of using devm_* calls is so you don't have to do stuff like this. Perhaps this should not be using devm_() for the irq at all?

My initial assumption was that some sort of dependency was missing somewhere to ensure this gets freed first, but I failed to find any documentation on how this is supposed to work, so I went with a fix that would work.

But you are obviously right, if we manually free it in the normal path then using devm_{request,free}_irq sounds like just overhead without benefits.

#3 lore raw

Hi,

Quoted 40 lines · Pascal Terjan
Quoted 33 lines · Greg Kroah-Hartman
Quoted 31 lines · Pascal Terjan

This fixes the following warning when unloading the module:

[249348.837181] remove_proc_entry: removing non-empty directory 'irq/20', leaking at least 'vboxguest'
[249348.837219] WARNING: CPU: 0 PID: 6708 at fs/proc/generic.c:715 remove_proc_entry+0x119/0x140
[249348.837379] Call Trace:
[249348.837385]  unregister_irq_proc+0xbd/0xe0
[249348.837392]  free_desc+0x23/0x60
[249348.837396]  irq_free_descs+0x4a/0x70
[249348.837401]  irq_domain_free_irqs+0x160/0x1a0
[249348.837452]  mp_unmap_irq+0x5c/0x60
[249348.837458]  acpi_unregister_gsi_ioapic+0x29/0x40
[249348.837463]  acpi_unregister_gsi+0x17/0x30
[249348.837467]  acpi_pci_irq_disable+0xbf/0xe0
[249348.837473]  pcibios_disable_device+0x20/0x30
[249348.837478]  pci_disable_device+0xef/0x120
[249348.837482]  vbg_pci_remove+0x6c/0x70 [vboxguest]
---
 drivers/virt/vboxguest/vboxguest_linux.c | 1 +
 1 file changed, 1 insertion(+)
drivers/virt/vboxguest/vboxguest_linux.c +0 -0
index 6e8c0f1c1056..faa4bc9f625c 100644
@@ -423,6 +423,7 @@ static void vbg_pci_remove(struct pci_dev *pci)
      vbg_gdev = NULL;
      mutex_unlock(&vbg_gdev_mutex);
 
Quoted 4 lines

drivers/virt/vboxguest/vboxguest_linux.c static void vbg_pci_remove(struct pci_dev *pci) · line 426

Quoted 1 line
drivers/virt/vboxguest/vboxguest_linux.c +1 -0
+     devm_free_irq(gdev->dev, pci->irq, gdev);

The whope point of using devm_* calls is so you don't have to do stuff like this. Perhaps this should not be using devm_() for the irq at all?

Quoted 8 lines

My initial assumption was that some sort of dependency was missing somewhere to ensure this gets freed first, but I failed to find any documentation on how this is supposed to work, so I went with a fix that would work.

But you are obviously right, if we manually free it in the normal path then using devm_{request,free}_irq sounds like just overhead without benefits.

Right, please also move the irq-request over to be non devm and also don't forgot that the error-exit path from the probe() function also needs to free the irq before disabling the pci-dev.

Regards,

Hans

#4 lore raw

PATCH v2 1/1 vboxguest: Do not use devm for irq

When relying on devm it doesn't get freed early enough which causes the following warning when unloading the module:

[249348.837181] remove_proc_entry: removing non-empty directory 'irq/20', leaking at least 'vboxguest'
[249348.837219] WARNING: CPU: 0 PID: 6708 at fs/proc/generic.c:715 remove_proc_entry+0x119/0x140
[249348.837379] Call Trace:
[249348.837385]  unregister_irq_proc+0xbd/0xe0
[249348.837392]  free_desc+0x23/0x60
[249348.837396]  irq_free_descs+0x4a/0x70
[249348.837401]  irq_domain_free_irqs+0x160/0x1a0
[249348.837452]  mp_unmap_irq+0x5c/0x60
[249348.837458]  acpi_unregister_gsi_ioapic+0x29/0x40
[249348.837463]  acpi_unregister_gsi+0x17/0x30
[249348.837467]  acpi_pci_irq_disable+0xbf/0xe0
[249348.837473]  pcibios_disable_device+0x20/0x30
[249348.837478]  pci_disable_device+0xef/0x120
[249348.837482]  vbg_pci_remove+0x6c/0x70 [vboxguest]

---
v2: stop using devm rather than adding a manual devm_free_irq

 drivers/virt/vboxguest/vboxguest_linux.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/virt/vboxguest/vboxguest_linux.c +6 -3
index 6e8c0f1c1056..dec36934d679 100644
@@ -360,8 +360,8 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 		goto err_vbg_core_exit;
 	}
 
-	ret = devm_request_irq(dev, pci->irq, vbg_core_isr, IRQF_SHARED,
-			       DEVICE_NAME, gdev);
+	ret = request_irq(pci->irq, vbg_core_isr, IRQF_SHARED, DEVICE_NAME,
+			  gdev);
 	if (ret) {
 		vbg_err("vboxguest: Error requesting irq: %d\n", ret);
 		goto err_vbg_core_exit;
@@ -371,7 +371,7 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	if (ret) {
 		vbg_err("vboxguest: Error misc_register %s failed: %d\n",
 			DEVICE_NAME, ret);
-		goto err_vbg_core_exit;
+		goto err_free_irq;
 	}
 
 	ret = misc_register(&gdev->misc_device_user);
@@ -407,6 +407,8 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	misc_deregister(&gdev->misc_device_user);
 err_unregister_misc_device:
 	misc_deregister(&gdev->misc_device);
+err_free_irq:
+	free_irq(pci->irq, gdev);
 err_vbg_core_exit:
 	vbg_core_exit(gdev);
 err_disable_pcidev:
@@ -423,6 +425,7 @@ static void vbg_pci_remove(struct pci_dev *pci)
 	vbg_gdev = NULL;
 	mutex_unlock(&vbg_gdev_mutex);
 
+	free_irq(pci->irq, gdev);
 	device_remove_file(gdev->dev, &dev_attr_host_features);
 	device_remove_file(gdev->dev, &dev_attr_host_version);
 	misc_deregister(&gdev->misc_device_user);
Signature · 1 line
2.36.1.476.g0c4daa206d-goog
Reviewed-by on v2 1/1
#5 lore raw

Re: [PATCH v2] vboxguest: Do not use devm for irq

Hi,

Quoted 19 lines · Pascal Terjan

When relying on devm it doesn't get freed early enough which causes the following warning when unloading the module:

[249348.837181] remove_proc_entry: removing non-empty directory 'irq/20', leaking at least 'vboxguest'
[249348.837219] WARNING: CPU: 0 PID: 6708 at fs/proc/generic.c:715 remove_proc_entry+0x119/0x140
[249348.837379] Call Trace:
[249348.837385]  unregister_irq_proc+0xbd/0xe0
[249348.837392]  free_desc+0x23/0x60
[249348.837396]  irq_free_descs+0x4a/0x70
[249348.837401]  irq_domain_free_irqs+0x160/0x1a0
[249348.837452]  mp_unmap_irq+0x5c/0x60
[249348.837458]  acpi_unregister_gsi_ioapic+0x29/0x40
[249348.837463]  acpi_unregister_gsi+0x17/0x30
[249348.837467]  acpi_pci_irq_disable+0xbf/0xe0
[249348.837473]  pcibios_disable_device+0x20/0x30
[249348.837478]  pci_disable_device+0xef/0x120
[249348.837482]  vbg_pci_remove+0x6c/0x70 [vboxguest]
Quoted 3 lines

---
v2: stop using devm rather than adding a manual devm_free_irq

Thanks, v2 looks good to me:

Regards,

Hans

Quoted 45 lines
 drivers/virt/vboxguest/vboxguest_linux.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/virt/vboxguest/vboxguest_linux.c +6 -3
index 6e8c0f1c1056..dec36934d679 100644
@@ -360,8 +360,8 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 		goto err_vbg_core_exit;
 	}
 
-	ret = devm_request_irq(dev, pci->irq, vbg_core_isr, IRQF_SHARED,
-			       DEVICE_NAME, gdev);
+	ret = request_irq(pci->irq, vbg_core_isr, IRQF_SHARED, DEVICE_NAME,
+			  gdev);
 	if (ret) {
 		vbg_err("vboxguest: Error requesting irq: %d\n", ret);
 		goto err_vbg_core_exit;
@@ -371,7 +371,7 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	if (ret) {
 		vbg_err("vboxguest: Error misc_register %s failed: %d\n",
 			DEVICE_NAME, ret);
-		goto err_vbg_core_exit;
+		goto err_free_irq;
 	}
 
 	ret = misc_register(&gdev->misc_device_user);
@@ -407,6 +407,8 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
 	misc_deregister(&gdev->misc_device_user);
 err_unregister_misc_device:
 	misc_deregister(&gdev->misc_device);
+err_free_irq:
+	free_irq(pci->irq, gdev);
 err_vbg_core_exit:
 	vbg_core_exit(gdev);
 err_disable_pcidev:
@@ -423,6 +425,7 @@ static void vbg_pci_remove(struct pci_dev *pci)
 	vbg_gdev = NULL;
 	mutex_unlock(&vbg_gdev_mutex);
 
+	free_irq(pci->irq, gdev);
 	device_remove_file(gdev->dev, &dev_attr_host_features);
 	device_remove_file(gdev->dev, &dev_attr_host_version);
 	misc_deregister(&gdev->misc_device_user);