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 af0a3a3c6a96 ("bus:
arm-ccn: Prevent hotplug callback leak")

Fixes: 48636708280a ("perf/smmuv3: Add arm64 smmuv3 pmu driver")
Signed-off-by: Shang XiaoJing <shangxiaojing@huawei.com>
Reviewed-by: Punit Agrawal <punit.agrawal@bytedance.com>
Link: https://lore.kernel.org/r/20221115115540.6245-3-shangxiaojing@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c
index 6a3fa1f69e68adaeeeca5c84d3ca6fe13588768d..0b6af77196418ddc6ca6ab5a111b4a7bf9b2d988 100644 (file)
--- a/drivers/perf/arm_smmuv3_pmu.c
+++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -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);