Commit 6f2d566b authored by Shang XiaoJing's avatar Shang XiaoJing Committed by Will Deacon

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

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.comSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent d9f564c9
...@@ -959,6 +959,8 @@ static struct platform_driver smmu_pmu_driver = { ...@@ -959,6 +959,8 @@ static struct platform_driver smmu_pmu_driver = {
static int __init arm_smmu_pmu_init(void) static int __init arm_smmu_pmu_init(void)
{ {
int ret;
cpuhp_state_num = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, cpuhp_state_num = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN,
"perf/arm/pmcg:online", "perf/arm/pmcg:online",
NULL, NULL,
...@@ -966,7 +968,11 @@ static int __init arm_smmu_pmu_init(void) ...@@ -966,7 +968,11 @@ static int __init arm_smmu_pmu_init(void)
if (cpuhp_state_num < 0) if (cpuhp_state_num < 0)
return cpuhp_state_num; 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); module_init(arm_smmu_pmu_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment