pcie: add missing put_device call
Subsystems (7)
PATCH 32/38 pcie: add missing put_device call
This is required so that we give up the last reference to the device. Removed the kfree() as put_device will result in release_pcie_device being called and hence the container of the device will be kfree'd.
--- drivers/pci/pcie/portdrv_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pcie/portdrv_core.c +1 -1
@@ -345,7 +345,7 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq) retval =device_register (device);if (retval) -kfree (pcie); +put_device (device);else get_device (device);return retval;
Signature · 1 line
1.8.3.1
PATCH 33/38 scsi: transport: add missing put_device call
This is required so that we give up the last reference to the device. Remove the kfree() as well, because the put_device() will result in iscsi_endpoint_release being called and hence it will be kfree'd.
--- drivers/scsi/scsi_transport_iscsi.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/scsi/scsi_transport_iscsi.c +4 -6
@@ -219,8 +219,10 @@ iscsi_create_endpoint(int dd_size) ep->dev.class = &iscsi_endpoint_class;dev_set_name (&ep->dev,"ep-%llu" , (unsigned long long ) id); err =device_register (&ep->dev); -if (err) - goto free_ep; +if (err) { +put_device (&ep->dev); +return NULL ; + } err =sysfs_create_group (&ep->dev.kobj, &iscsi_endpoint_group);if (err)
@@ -233,10 +235,6 @@ iscsi_create_endpoint(int dd_size) unregister_dev:device_unregister (&ep->dev);return NULL ; - -free_ep: -kfree (ep); -return NULL ; }EXPORT_SYMBOL_GPL (iscsi_create_endpoint);
Signature · 1 line
1.8.3.1
James Bottomley
maintainerRe: [PATCH 33/38] scsi: transport: add missing put_device call
Quoted 1 line · Levente Kurusa
This is required so that we give up the last reference to the device.
This isn't true.
Quoted 2 lines
Remove the
kfree()as well, because theput_device()will result iniscsi_endpoint_releasebeing called and hence it will be kfree'd.
There's no real point to this patch. The use case where we own the device absolutely up until the point we hand out references is well established and there are a number of destroy paths running through SCSI code which don't go via refcounting and this is one of them. They're almost universally on error legs on device bring up as this one is.
James
PATCH 34/38 infiniband: core: add missing put_device call
In reply to Levente KurusaThis is required so that we give up the last reference to the device.
--- drivers/infiniband/core/sysfs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/core/sysfs.c +3 -1
@@ -824,8 +824,10 @@ int ib_device_register_sysfs(struct ib_device *device,INIT_LIST_HEAD (&device->port_list); ret =device_register (class_dev); -if (ret) +if (ret) { +put_device (class_dev); goto err; + }for (i =0 ; i <ARRAY_SIZE (ib_class_attributes); ++i) { ret =device_create_file (class_dev, ib_class_attributes[i]);
Signature · 1 line
1.8.3.1
PATCH 35/38 media: bt8xx: add missing put_device call
In reply to Levente KurusaThis is required so that we give up the last reference to the device. Remove the kfree() because the put_device() call will actually call release_sub_device which in turn kfrees the device.
--- drivers/media/pci/bt8xx/bttv-gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/pci/bt8xx/bttv-gpio.c +1 -1
@@ -98,7 +98,7 @@ int bttv_sub_add_device(struct bttv_core *core, char *name) err =device_register (&sub->dev);if (0 != err) { -kfree (sub); +put_device (&sub->dev);return err; }pr_info ("%d: add subdevice \"%s\"\n" , core->nr,dev_name (&sub->dev));
Signature · 1 line
1.8.3.1
PATCH 36/38 dio: add missing put_device call
In reply to Levente KurusaThis is required so that we give up the last reference to the device.
--- drivers/dio/dio.c | 1 + 1 file changed, 1 insertion(+)
drivers/dio/dio.c +1 -0
@@ -186,6 +186,7 @@ static int __init dio_init(void) error =device_register (&dio_bus.dev);if (error) {pr_err ("DIO: Error registering dio_bus\n" ); +put_device (&dio_bus.dev);return error; }
Signature · 1 line
1.8.3.1
PATCH 37/38 uwb: umc-dev: add missing put_device call
In reply to Levente KurusaThis is required so that we give up the last reference to the device.
--- drivers/uwb/umc-dev.c | 1 + 1 file changed, 1 insertion(+)
drivers/uwb/umc-dev.c +1 -0
@@ -66,6 +66,7 @@ int umc_device_register(struct umc_dev *umc)return 0 ; error_device_register: +put_device (&umc->dev);release_resource (&umc->resource); error_request_resource:return err;
Signature · 1 line
1.8.3.1
PATCH 38/38 bcma: add missing put_device call
In reply to Levente KurusaThis is required so that we give up the last reference to the device.
--- drivers/bcma/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/bcma/main.c +1 -0
@@ -176,6 +176,7 @@ static int bcma_register_cores(struct bcma_bus *bus)bcma_err (bus,"Could not register dev for core 0x%03X\n" , core->id.id); +put_device (&core->dev);continue ; } core->dev_registered = true;
Signature · 1 line
1.8.3.1
Bjorn Helgaas
maintainer[+cc Greg, Yinghai]
Quoted 5 lines · Levente Kurusa
This is required so that we give up the last reference to the device. Removed the
kfree()asput_devicewill result inrelease_pcie_devicebeing called and hence the container of the device will be kfree'd.Signed-off-by Levente Kurusa <[email protected]>
Thanks, I applied a slightly modified version of this to my pci/deletion branch for v3.14.
I think the get_device() after device_register() succeeds and the put_device() before device_unregister() are superfluous, so I propose the series included below. Any comments?
Quoted 9 lines
--- drivers/pci/pcie/portdrv_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/pci/pcie/portdrv_core.c +0
-0
drivers/pci/pcie/portdrv_core.c static int pcie_device_init(struct pci_dev *pdev, int service, int irq) · line 351
Quoted 8 lines
drivers/pci/pcie/portdrv_core.c +1
-1@@ -345,7 +345,7 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq) retval =device_register (device);if (retval) -kfree (pcie); +put_device (device);else get_device (device);return retval;
commit 8f3acca9acec1503f6b374faef2d1013cbf502af
Author: Bjorn Helgaas <[email protected]> Date: Thu Dec 19 14:20:09 2013 -0700
PCI/portdrv: Cleanup error paths
Make the straightline path the normal no-error path. Check for errors and return them directly, instead of checking for success and putting the normal path in an "if" body.
No functional change.
drivers/pci/pcie/portdrv_core.c +12 -10
@@ -344,11 +344,13 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)device_enable_async_suspend (device); retval =device_register (device); -if (retval) +if (retval) {kfree (pcie); -else -get_device (device); -return retval; +return retval; + } + +get_device (device); +return 0 ; }/**
@@ -498,12 +500,12 @@ static int pcie_port_probe_service(struct device *dev) pciedev =to_pcie_device (dev); status = driver->probe (pciedev); -if (!status) { -dev_printk (KERN_DEBUG , dev,"service driver %s loaded\n" , - driver->name); -get_device (dev); - } -return status; +if (status) +return status; + +dev_printk (KERN_DEBUG , dev,"service driver %s loaded\n" , driver->name); +get_device (dev); +return 0 ; }/**
commit f39862058e1f278e0495cd9ea57de571e74aa1fe
Author: Levente Kurusa <[email protected]> Date: Thu Dec 19 14:22:35 2013 -0700
PCI/portdrv: Add put_device() after device_register() failure
This is required so that we give up the last reference to the device. Removed the kfree() as put_device will result in release_pcie_device() being called and hence the container of the device will be kfree'd.
drivers/pci/pcie/portdrv_core.c +1 -1
@@ -345,7 +345,7 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq) retval =device_register (device);if (retval) { -kfree (pcie); +put_device (device);return retval; }
commit e75f34ce6633549486a044d64b2a79240d4113a8
Author: Bjorn Helgaas <[email protected]> Date: Thu Dec 19 14:24:13 2013 -0700
PCI/portdrv: Remove extra get_device()/put_device() for pcie_device
Previously pcie_device_init() called get_device() if device_register() for the new pcie_device succeeded, and remove_iter() called put_device() when removing before unregistering the device.
But device_register() already increments the reference count in device_add(), so we don't need to do it again here.
drivers/pci/pcie/portdrv_core.c +1 -4
@@ -349,7 +349,6 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)return retval; } -get_device (device);return 0 ; }
@@ -456,10 +455,8 @@ int pcie_port_device_resume(struct device *dev)static int remove_iter (struct device *dev,void *data) { -if (dev->bus == &pcie_port_bus_type) { -put_device (dev); +if (dev->bus == &pcie_port_bus_type)device_unregister (dev); - }return 0 ; }
Quoted 7 lines · Bjorn Helgaas
[+cc Greg, Yinghai]
Quoted 4 lines · Levente Kurusa
This is required so that we give up the last reference to the device. Removed the
kfree()asput_devicewill result inrelease_pcie_devicebeing called and hence the container of the device will be kfree'd.
Quoted 8 lines
Quoted 1 line
Signed-off-by Levente Kurusa <[email protected]>Thanks, I applied a slightly modified version of this to my pci/deletion branch for v3.14.
I think the
get_device()afterdevice_register()succeeds and theput_device()beforedevice_unregister()are superfluous, so I propose the series included below. Any comments?
Looks good to me.
greg k-h
Quoted 7 lines · Bjorn Helgaas
[+cc Greg, Yinghai]
Quoted 4 lines · Levente Kurusa
This is required so that we give up the last reference to the device. Removed the
kfree()asput_devicewill result inrelease_pcie_devicebeing called and hence the container of the device will be kfree'd.
Quoted 8 lines
Quoted 1 line
Signed-off-by Levente Kurusa <[email protected]>Thanks, I applied a slightly modified version of this to my pci/deletion branch for v3.14.
I think the
get_device()afterdevice_register()succeeds and theput_device()beforedevice_unregister()are superfluous, so I propose the series included below. Any comments?
Nice cleanup.
Thanks
Yinghai