Patch "cpuhotplug: Link lock stacks for hotplug callbacks" has been added to the 4.9-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
cpuhotplug: Link lock stacks for hotplug callbacks
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
cpuhotplug-link-lock-stacks-for-hotplug-callbacks.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Mon Apr 9 17:09:24 CEST 2018
From: Thomas Gleixner <[email protected]>
Date: Wed, 24 May 2017 10:15:43 +0200
Subject: cpuhotplug: Link lock stacks for hotplug callbacks
From: Thomas Gleixner <[email protected]>
[ Upstream commit 49dfe2a6779717d9c18395684ee31bdc98b22e53 ]
The CPU hotplug callbacks are not covered by lockdep versus the cpu hotplug rwsem.
CPU0 CPU1cpuhp_setup_state(STATE, startup, teardown);
cpus_read_lock();
invoke_callback_on_ap();
kick_hotplug_thread(ap);
wait_for_completion(); hotplug_thread_fn()
lock(m);
do_stuff();
unlock(m);Lockdep does not know about this dependency and will not trigger on the following code sequence:
lock(m); cpus_read_lock();
Add a lockdep map and connect the initiators lock chain with the hotplug thread lock chain, so potential deadlocks can be detected.
--- kernel/cpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)
kernel/cpu.c +13 -0
@@ -63,6 +63,12 @@ struct cpuhp_cpu_state { static DEFINE_PER_CPU(struct cpuhp_cpu_state, cpuhp_state); +#if defined(CONFIG_LOCKDEP ) && defined(CONFIG_SMP ) +static struct lock_class_key cpuhp_state_key; +static struct lockdep_map cpuhp_state_lock_map = +STATIC_LOCKDEP_MAP_INIT ("cpuhp_state" , &cpuhp_state_key); +#endif +/** * cpuhp_step - Hotplug state machine step * @name: Name of the step
@@ -563,6 +569,7 @@ static void cpuhp_thread_fun(unsigned in st->should_run = false; +lock_map_acquire (&cpuhp_state_lock_map);/* Single callback invocation for [un]install ? */ if (st->single) {if (st->cb_state <CPUHP_AP_ONLINE ) {
@@ -594,6 +601,7 @@ static void cpuhp_thread_fun(unsigned inelse if (st->state > st->target) ret =cpuhp_ap_offline (cpu, st); } +lock_map_release (&cpuhp_state_lock_map); st->result = ret;complete (&st->done); }
@@ -608,6 +616,9 @@ cpuhp_invoke_ap_callback(int cpu, enum cif (!cpu_online (cpu))return 0 ; +lock_map_acquire (&cpuhp_state_lock_map); +lock_map_release (&cpuhp_state_lock_map); +/* * If we are up and running, use the hotplug thread. For early calls * we invoke the thread function directly.
@@ -651,6 +662,8 @@ static int cpuhp_kick_ap_work(unsigned ienum cpuhp_state state = st->state;trace_cpuhp_enter (cpu, st->target, state, cpuhp_kick_ap_work); +lock_map_acquire (&cpuhp_state_lock_map); +lock_map_release (&cpuhp_state_lock_map);__cpuhp_kick_ap_work (st);wait_for_completion (&st->done);trace_cpuhp_exit (cpu, st->state, state, st->result);
Patches currently in stable-queue which might be from [email protected] are
queue-4.9/perf-callchain-force-user_ds-when-invoking-perf_callchain_user.patch queue-4.9/perf-report-fix-off-by-one-for-non-activation-frames.patch queue-4.9/x86-efi-disable-runtime-services-on-kexec-kernel-if-booted-with-efi-old_map.patch queue-4.9/sched-numa-use-down_read_trylock-for-the-mmap_sem.patch queue-4.9/x86-asm-don-t-use-rbp-as-a-temporary-register-in-csum_partial_copy_generic.patch queue-4.9/perf-core-correct-event-creation-with-perf_format_group.patch queue-4.9/x86-mm-kaslr-use-the-_asm_mul-macro-for-multiplication-to-work-around-clang-incompatibility.patch queue-4.9/x86-tsc-provide-tsc-unstable-boot-parameter.patch queue-4.9/x86-boot-declare-error-as-noreturn.patch queue-4.9/cpuhotplug-link-lock-stacks-for-hotplug-callbacks.patch queue-4.9/perf-core-fix-error-handling-in-perf_event_alloc.patch queue-4.9/sched-deadline-use-the-revised-wakeup-rule-for-suspending-constrained-dl-tasks.patch queue-4.9/irqchip-mbigen-fix-the-clear-register-offset-calculation.patch