Skip to content

Commit

Permalink
drivers: perf: marvell_cn10k: Fix hotplug callback leak in tad_pmu_in…
Browse files Browse the repository at this point in the history
…it()

[ Upstream commit 973ae93 ]

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

Fixes: 036a758 ("drivers: perf: Add LLC-TAD perf counter support")
Signed-off-by: Yuan Can <yuancan@huawei.com>
Link: https://lore.kernel.org/r/20221115070207.32634-3-yuancan@huawei.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Yuan Can authored and gregkh committed Dec 31, 2022
1 parent 0823732 commit 7772f4d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion drivers/perf/marvell_cn10k_tad_pmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,11 @@ static int __init tad_pmu_init(void)
if (ret < 0)
return ret;
tad_pmu_cpuhp_state = ret;
return platform_driver_register(&tad_pmu_driver);
ret = platform_driver_register(&tad_pmu_driver);
if (ret)
cpuhp_remove_multi_state(tad_pmu_cpuhp_state);

return ret;
}

static void __exit tad_pmu_exit(void)
Expand Down

0 comments on commit 7772f4d

Please sign in to comment.