From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C7AA221F24; Mon, 31 Mar 2025 14:35:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743431713; cv=none; b=Wjbxlyr4ty3bZ8w7zohClRYNPLE6OJWafYhxzSavTbJuDcryNVsn2InYMN87tcemAZyaf73fTct0Dx9RbKhAHFNWUhuVxP8ePOeWRU8cZveN6yYl/3djSLuesiw2dNasD5EtQK0K9wU5eYyMid0sOu6kToiVQ9DdB4v6acxf0ws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743431713; c=relaxed/simple; bh=JqI6exjjN8uxNSKa+vUX2BGVkSh6tDPWGkpGiWMorQo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=XoeUJH3LfiEIPZ3/7+/7fArzpvOxM7YTVP/xKpQ3VZ8e4bHHjADVpOLSXLDIQlV9O9XbHjevtxm/2MsIwaWwDJd5IGuYL/lElFOxNYsqWmhgLybrKodc4+p+nLULCTFsfDQHXstEWTVNwwrMat8rwhoNhJvD5fcytn7/bfYDZeg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B6hu8dG6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="B6hu8dG6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C423CC4CEE3; Mon, 31 Mar 2025 14:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1743431712; bh=JqI6exjjN8uxNSKa+vUX2BGVkSh6tDPWGkpGiWMorQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B6hu8dG6fOQesGYuvhwLnJt5UPt5VVkFKreGvalRoV9v4wXmAzQUGxa9fkuPXGa2A 8pSwEIqaSo5glkLJlXyURK82Ehz3rrU+hfBgIa4EHXdDap22khk5Gl+LsLqM1sxtpH d4zsRWhFtQJEpom03CTn2HipAxHalhR6XCjOJsckOnl4mW7fPTALXfcmJpLzRDcgcm v0ny3fogj35eEOSyk+lMumRl++a0gVmxfZukC7LPxNKdG/96eK9SsZKyQjpfK6UOQc SAojrHSxAlWx+dKwRrgImy+R+u3pOaUBHFBSxq/X0RJgdYODNoJMhrFZgKwTtTlSOl L5g4PdTEAVjaA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yunhui Cui , Shuai Xue , Will Deacon , Sasha Levin , renyu.zj@linux.alibaba.com, mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org Subject: [PATCH AUTOSEL 6.13 09/16] perf/dwc_pcie: fix some unreleased resources Date: Mon, 31 Mar 2025 10:34:43 -0400 Message-Id: <20250331143450.1685242-9-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250331143450.1685242-1-sashal@kernel.org> References: <20250331143450.1685242-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.13.9 Content-Transfer-Encoding: 8bit From: Yunhui Cui [ Upstream commit 6eb1e8ef586ac4a3dcdc20248f9cb45e4ceb141f ] Release leaked resources, such as plat_dev and dev_info. Signed-off-by: Yunhui Cui Reviewed-by: Shuai Xue Link: https://lore.kernel.org/r/20250220121716.50324-2-cuiyunhui@bytedance.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- 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 9cbea9675e21a..a7e7864e73a8e 100644 --- a/drivers/perf/dwc_pcie_pmu.c +++ b/drivers/perf/dwc_pcie_pmu.c @@ -567,8 +567,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; @@ -724,6 +726,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; @@ -736,7 +747,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; } } @@ -745,35 +756,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); } -- 2.39.5