Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d69bdb61 authored by Shang XiaoJing's avatar Shang XiaoJing Committed by Greg Kroah-Hartman
Browse files

perf/smmuv3: Fix hotplug callback leak in arm_smmu_pmu_init() 



[ Upstream commit 6f2d566b46436a50a80d6445e82879686b89588c ]

arm_smmu_pmu_init() won't remove the callback added by
cpuhp_setup_state_multi() when platform_driver_register() failed. Remove
the callback by cpuhp_remove_multi_state() in fail path.

Similar to the handling of arm_ccn_init() in commit 26242b33 ("bus:
arm-ccn: Prevent hotplug callback leak")

Fixes: 7d839b4b ("perf/smmuv3: Add arm64 smmuv3 pmu driver")
Signed-off-by: default avatarShang XiaoJing <shangxiaojing@huawei.com>
Reviewed-by: default avatarPunit Agrawal <punit.agrawal@bytedance.com>
Link: https://lore.kernel.org/r/20221115115540.6245-3-shangxiaojing@huawei.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent af2256d7

drivers/perf/arm_smmuv3_pmu.c

+7 −1
Original line number Diff line number Diff line
@@ -872,6 +872,8 @@ static struct platform_driver smmu_pmu_driver = { 


static int __init arm_smmu_pmu_init(void)

{

	int ret;



	cpuhp_state_num = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN,

						  "perf/arm/pmcg:online",

						  NULL,
@@ -879,7 +881,11 @@ static int __init arm_smmu_pmu_init(void) 
	if (cpuhp_state_num < 0)

		return cpuhp_state_num;



	return platform_driver_register(&smmu_pmu_driver);

	ret = platform_driver_register(&smmu_pmu_driver);

	if (ret)

		cpuhp_remove_multi_state(cpuhp_state_num);



	return ret;

}

module_init(arm_smmu_pmu_init);