Commit d7b1b5b5 authored by Sandipan Das's avatar Sandipan Das Committed by Wenkuan Wang
Browse files

perf/x86/amd/uncore: Pass through error code for initialization failures, instead of -ENODEV 

mainline inclusion
from mainline-v6.7-rc1
commit 744940f1921c8feb90e3c4bcc1e153fdd6e10fe2
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9016O


CVE: NA

--------------------------------

Pass through the appropriate error code when the registration of hotplug
callbacks fail during initialization, instead of returning a blanket -ENODEV.

[ mingo: Updated the changelog. ]

Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarSandipan Das <sandipan.das@amd.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20231016060743.332051-1-sandipan.das@amd.com


Signed-off-by: default avatarWenkuan Wang <Wenkuan.Wang@amd.com>
parent 523ec840

arch/x86/events/amd/uncore.c

+15 −10
Original line number Diff line number Diff line
@@ -1040,20 +1040,25 @@ static int __init amd_uncore_init(void) 
	/*

	 * Install callbacks. Core will call them for each online cpu.

	 */

	if (cpuhp_setup_state(CPUHP_PERF_X86_AMD_UNCORE_PREP,

	ret = cpuhp_setup_state(CPUHP_PERF_X86_AMD_UNCORE_PREP,

				"perf/x86/amd/uncore:prepare",

			      NULL, amd_uncore_cpu_dead))

				NULL, amd_uncore_cpu_dead);

	if (ret)

		goto fail;



	if (cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,

	ret = cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING,

				"perf/x86/amd/uncore:starting",

			      amd_uncore_cpu_starting, NULL))

				amd_uncore_cpu_starting, NULL);

	if (ret)

		goto fail_prep;

	if (cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE,



	ret = cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE,

				"perf/x86/amd/uncore:online",

				amd_uncore_cpu_online,

			      amd_uncore_cpu_down_prepare))

				amd_uncore_cpu_down_prepare);

	if (ret)

		goto fail_start;



	return 0;



fail_start: