| Message ID | 20250208104002.60332-2-cuiyunhui@bytedance.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fix dwc_pcie pmu driver issues | expand |
在 2025/2/8 18:40, Yunhui Cui 写道: > Release leaked resources, such as plat_dev and dev_info. > > Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com> > --- > drivers/perf/dwc_pcie_pmu.c | 33 ++++++++++++++++++++++----------- > 1 file changed, 22 insertions(+), 11 deletions(-) > > diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c > index cccecae9823f..19fa2ba8dd67 100644 > --- a/drivers/perf/dwc_pcie_pmu.c > +++ b/drivers/perf/dwc_pcie_pmu.c > @@ -572,8 +572,10 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev) > return PTR_ERR(plat_dev); > > dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL); > - if (!dev_info) > + if (!dev_info) { > + platform_device_unregister(plat_dev); > return -ENOMEM; > + } > > /* Cache platform device to handle pci device hotplug */ > dev_info->plat_dev = plat_dev; > @@ -730,6 +732,15 @@ static struct platform_driver dwc_pcie_pmu_driver = { > .driver = {.name = "dwc_pcie_pmu",}, > }; > > +static void dwc_pcie_cleanup_devices(void) > +{ > + struct dwc_pcie_dev_info *dev_info, *tmp; > + > + list_for_each_entry_safe(dev_info, tmp, &dwc_pcie_dev_info_head, dev_node) { > + dwc_pcie_unregister_dev(dev_info); > + } > +} > + > static int __init dwc_pcie_pmu_init(void) > { > struct pci_dev *pdev = NULL; > @@ -742,7 +753,7 @@ static int __init dwc_pcie_pmu_init(void) > ret = dwc_pcie_register_dev(pdev); > if (ret) { > pci_dev_put(pdev); Should we get a reference count of pdev in dwc_pcie_register_dev and put it in dwc_pcie_unregister_dev? Thanks. Shuai
Hi Shuai, On Tue, Feb 11, 2025 at 4:05 PM Shuai Xue <xueshuai@linux.alibaba.com> wrote: > > > > 在 2025/2/8 18:40, Yunhui Cui 写道: > > Release leaked resources, such as plat_dev and dev_info. > > > > Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com> > > --- > > drivers/perf/dwc_pcie_pmu.c | 33 ++++++++++++++++++++++----------- > > 1 file changed, 22 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c > > index cccecae9823f..19fa2ba8dd67 100644 > > --- a/drivers/perf/dwc_pcie_pmu.c > > +++ b/drivers/perf/dwc_pcie_pmu.c > > @@ -572,8 +572,10 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev) > > return PTR_ERR(plat_dev); > > > > dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL); > > - if (!dev_info) > > + if (!dev_info) { > > + platform_device_unregister(plat_dev); > > return -ENOMEM; > > + } > > > > /* Cache platform device to handle pci device hotplug */ > > dev_info->plat_dev = plat_dev; > > @@ -730,6 +732,15 @@ static struct platform_driver dwc_pcie_pmu_driver = { > > .driver = {.name = "dwc_pcie_pmu",}, > > }; > > > > +static void dwc_pcie_cleanup_devices(void) > > +{ > > + struct dwc_pcie_dev_info *dev_info, *tmp; > > + > > + list_for_each_entry_safe(dev_info, tmp, &dwc_pcie_dev_info_head, dev_node) { > > + dwc_pcie_unregister_dev(dev_info); > > + } > > +} > > + > > static int __init dwc_pcie_pmu_init(void) > > { > > struct pci_dev *pdev = NULL; > > @@ -742,7 +753,7 @@ static int __init dwc_pcie_pmu_init(void) > > ret = dwc_pcie_register_dev(pdev); > > if (ret) { > > pci_dev_put(pdev); > > Should we get a reference count of pdev in dwc_pcie_register_dev and put it in > dwc_pcie_unregister_dev? Personally, it's not an issue because RP devices are generally not unloaded. > > Thanks. > Shuai > Thanks, Yunhui
diff --git a/drivers/perf/dwc_pcie_pmu.c b/drivers/perf/dwc_pcie_pmu.c index cccecae9823f..19fa2ba8dd67 100644 --- a/drivers/perf/dwc_pcie_pmu.c +++ b/drivers/perf/dwc_pcie_pmu.c @@ -572,8 +572,10 @@ static int dwc_pcie_register_dev(struct pci_dev *pdev) return PTR_ERR(plat_dev); dev_info = kzalloc(sizeof(*dev_info), GFP_KERNEL); - if (!dev_info) + if (!dev_info) { + platform_device_unregister(plat_dev); return -ENOMEM; + } /* Cache platform device to handle pci device hotplug */ dev_info->plat_dev = plat_dev; @@ -730,6 +732,15 @@ static struct platform_driver dwc_pcie_pmu_driver = { .driver = {.name = "dwc_pcie_pmu",}, }; +static void dwc_pcie_cleanup_devices(void) +{ + struct dwc_pcie_dev_info *dev_info, *tmp; + + list_for_each_entry_safe(dev_info, tmp, &dwc_pcie_dev_info_head, dev_node) { + dwc_pcie_unregister_dev(dev_info); + } +} + static int __init dwc_pcie_pmu_init(void) { struct pci_dev *pdev = NULL; @@ -742,7 +753,7 @@ static int __init dwc_pcie_pmu_init(void) ret = dwc_pcie_register_dev(pdev); if (ret) { pci_dev_put(pdev); - return ret; + goto err_cleanup; } } @@ -751,35 +762,35 @@ static int __init dwc_pcie_pmu_init(void) dwc_pcie_pmu_online_cpu, dwc_pcie_pmu_offline_cpu); if (ret < 0) - return ret; + goto err_cleanup; dwc_pcie_pmu_hp_state = ret; ret = platform_driver_register(&dwc_pcie_pmu_driver); if (ret) - goto platform_driver_register_err; + goto err_remove_cpuhp; ret = bus_register_notifier(&pci_bus_type, &dwc_pcie_pmu_nb); if (ret) - goto platform_driver_register_err; + goto err_unregister_driver; notify = true; return 0; -platform_driver_register_err: +err_unregister_driver: + platform_driver_unregister(&dwc_pcie_pmu_driver); +err_remove_cpuhp: cpuhp_remove_multi_state(dwc_pcie_pmu_hp_state); - +err_cleanup: + dwc_pcie_cleanup_devices(); return ret; } static void __exit dwc_pcie_pmu_exit(void) { - struct dwc_pcie_dev_info *dev_info, *tmp; - if (notify) bus_unregister_notifier(&pci_bus_type, &dwc_pcie_pmu_nb); - list_for_each_entry_safe(dev_info, tmp, &dwc_pcie_dev_info_head, dev_node) - dwc_pcie_unregister_dev(dev_info); + dwc_pcie_cleanup_devices(); platform_driver_unregister(&dwc_pcie_pmu_driver); cpuhp_remove_multi_state(dwc_pcie_pmu_hp_state); }
Release leaked resources, such as plat_dev and dev_info. Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com> --- drivers/perf/dwc_pcie_pmu.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-)