x86/aperfmperf: Fix deadlock on cpu_hotplug_lock
Subsystems (2)
PATCH 1/1 x86/aperfmperf: Fix deadlock on cpu_hotplug_lock
The broken patch results in a call to init_freq_invariance_cppc() in a CPU hotplug handler in both the path for initially present CPUs and those hotplugged later. That function includes a one time call to amd_set_max_freq_ratio() which in turn calls freq_invariance_enable() that has a static_branch_enable() which takes the cpu_hotlug_lock which is already held.
Avoid the deadlock by using static_branch_enable_cpuslocked() as the lock will always be already held. The equivalent path on Intel does not already hold this lock, so take it around the call to freq_invariance_enable(), which results in it being held over the call to register_syscall_ops, which looks to be safe to do.
--- arch/x86/kernel/cpu/aperfmperf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/aperfmperf.c +4 -2
@@ -306,7 +306,7 @@ static void freq_invariance_enable(void)WARN_ON_ONCE (1 );return ; } -static_branch_enable (&arch_scale_freq_key); +static_branch_enable_cpuslocked (&arch_scale_freq_key);register_freq_invariance_syscore_ops ();pr_info ("Estimated ratio of average max frequency by base frequency (times 1024): %llu\n" , arch_max_freq_ratio); }
@@ -323,8 +323,10 @@ static void __init bp_init_freq_invariance(void)if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return ; -if (intel_set_max_freq_ratio ()) +if (intel_set_max_freq_ratio ()) { +guard (cpus_read_lock)();freq_invariance_enable (); + } }static void disable_freq_invariance_workfn (struct work_struct *work)
Signature · 1 line
2.43.0
Quoted 19 lines · Jonathan Cameron
The broken patch results in a call to
init_freq_invariance_cppc()in a CPU hotplug handler in both the path for initially present CPUs and those hotplugged later. That function includes a one time call toamd_set_max_freq_ratio()which in turn callsfreq_invariance_enable()that has astatic_branch_enable()which takes thecpu_hotlug_lockwhich is already held.Avoid the deadlock by using
static_branch_enable_cpuslocked()as the lock will always be already held. The equivalent path on Intel does not already hold this lock, so take it around the call tofreq_invariance_enable(), which results in it being held over the call toregister_syscall_ops, which looks to be safe to do.Fixes c1385c1f0ba3 ("ACPI: processor: Simplify initial onlining to use same path for cold and hotplug")Reported-by Mikhail Gavrilov <[email protected]>Closes https://lore.kernel.org/all/CABXGCsPvqBfL5hQDOARwfqasLRJ_eNPBbCngZ257HOe=xbWDkA@mail.gmail.com/ open hereSuggested-by Thomas Gleixner <[email protected]>Tested-by Mikhail Gavrilov <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Quoted 3 lines
--- arch/x86/kernel/cpu/aperfmperf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
I'll take it through tip if no one objects...
Thx.
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 13 lines · Jonathan Cameron
The broken patch results in a call to
init_freq_invariance_cppc()in a CPU hotplug handler in both the path for initially present CPUs and those hotplugged later. That function includes a one time call toamd_set_max_freq_ratio()which in turn callsfreq_invariance_enable()that has astatic_branch_enable()which takes thecpu_hotlug_lockwhich is already held.Avoid the deadlock by using
static_branch_enable_cpuslocked()as the lock will always be already held. The equivalent path on Intel does not already hold this lock, so take it around the call tofreq_invariance_enable(), which results in it being held over the call toregister_syscall_ops, which looks to be safe to do.
Quoted 6 lines
Fixes c1385c1f0ba3 ("ACPI: processor: Simplify initial onlining to use same path for cold and hotplug")Reported-by Mikhail Gavrilov <[email protected]>Closes https://lore.kernel.org/all/CABXGCsPvqBfL5hQDOARwfqasLRJ_eNPBbCngZ257HOe=xbWDkA@mail.gmail.com/ open hereSuggested-by Thomas Gleixner <[email protected]>Tested-by Mikhail Gavrilov <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
The following commit has been merged into the x86/urgent branch of tip:
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 0f7ced7d620ecc7a986843d6aeec41cce3116f41 Gitweb: https://git.kernel.org/tip/0f7ced7d620ecc7a986843d6aeec41cce3116f41 Author: Jonathan Cameron <[email protected]> AuthorDate: Mon, 29 Jul 2024 11:55:04 +01:00 Committer: Borislav Petkov (AMD) <[email protected]> CommitterDate: Mon, 29 Jul 2024 15:32:37 +02:00
x86/aperfmperf: Fix deadlock on cpu_hotplug_lock
The broken patch results in a call to init_freq_invariance_cppc() in a CPU hotplug handler in both the path for initially present CPUs and those hotplugged later. That function includes a one time call to amd_set_max_freq_ratio() which in turn calls freq_invariance_enable() that has a static_branch_enable() which takes the cpu_hotlug_lock which is already held.
Avoid the deadlock by using static_branch_enable_cpuslocked() as the lock will always be already held. The equivalent path on Intel does not already hold this lock, so take it around the call to freq_invariance_enable(), which results in it being held over the call to register_syscall_ops, which looks to be safe to do.
--- arch/x86/kernel/cpu/aperfmperf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/x86/kernel/cpu/aperfmperf.c +4 -2
@@ -306,7 +306,7 @@ static void freq_invariance_enable(void)WARN_ON_ONCE (1 );return ; } -static_branch_enable (&arch_scale_freq_key); +static_branch_enable_cpuslocked (&arch_scale_freq_key);register_freq_invariance_syscore_ops ();pr_info ("Estimated ratio of average max frequency by base frequency (times 1024): %llu\n" , arch_max_freq_ratio); }
@@ -323,8 +323,10 @@ static void __init bp_init_freq_invariance(void)if (boot_cpu_data.x86_vendor !=X86_VENDOR_INTEL )return ; -if (intel_set_max_freq_ratio ()) +if (intel_set_max_freq_ratio ()) { +guard (cpus_read_lock)();freq_invariance_enable (); + } }static void disable_freq_invariance_workfn (struct work_struct *work)
Quoted 19 lines · Jonathan Cameron
The broken patch results in a call to
init_freq_invariance_cppc()in a CPU hotplug handler in both the path for initially present CPUs and those hotplugged later. That function includes a one time call toamd_set_max_freq_ratio()which in turn callsfreq_invariance_enable()that has astatic_branch_enable()which takes thecpu_hotlug_lockwhich is already held.Avoid the deadlock by using
static_branch_enable_cpuslocked()as the lock will always be already held. The equivalent path on Intel does not already hold this lock, so take it around the call tofreq_invariance_enable(), which results in it being held over the call toregister_syscall_ops, which looks to be safe to do.Fixes c1385c1f0ba3 ("ACPI: processor: Simplify initial onlining to use same path for cold and hotplug")Reported-by Mikhail Gavrilov <[email protected]>Closes https://lore.kernel.org/all/CABXGCsPvqBfL5hQDOARwfqasLRJ_eNPBbCngZ257HOe=xbWDkA@mail.gmail.com/ open hereSuggested-by Thomas Gleixner <[email protected]>Tested-by Mikhail Gavrilov <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>
Quoted 4 lines
--- arch/x86/kernel/cpu/aperfmperf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)