2 files changed, 11 insertions, 6 deletions

diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index 6d405db6fb12..242bf530edfc 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -20,9 +20,9 @@ enum cpuhp_state {
         CPUHP_PROFILE_PREPARE,
         CPUHP_X2APIC_PREPARE,
         CPUHP_SMPCFD_PREPARE,
-        CPUHP_TIMERS_DEAD,
         CPUHP_RCUTREE_PREP,
         CPUHP_NOTIFY_PREPARE,
+        CPUHP_TIMERS_DEAD,
         CPUHP_BRINGUP_CPU,
         CPUHP_AP_IDLE_DEAD,
         CPUHP_AP_OFFLINE,
diff --git a/kernel/cpu.c b/kernel/cpu.c
index f24f45915b54..341bf80f80bd 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1200,11 +1200,6 @@ static struct cpuhp_step cpuhp_bp_states[] = {
                 .startup = smpcfd_prepare_cpu,
                 .teardown = smpcfd_dead_cpu,
         },
-        [CPUHP_TIMERS_DEAD] = {
-                .name = "timers dead",
-                .startup = NULL,
-                .teardown = timers_dead_cpu,
-        },
         [CPUHP_RCUTREE_PREP] = {
                 .name = "RCU-tree prepare",
                 .startup = rcutree_prepare_cpu,
@@ -1221,6 +1216,16 @@ static struct cpuhp_step cpuhp_bp_states[] = {
                 .skip_onerr             = true,
                 .cant_stop              = true,
         },
+        /*
+         * On the tear-down path, timers_dead_cpu() must be invoked
+         * before blk_mq_queue_reinit_notify() from notify_dead(),
+         * otherwise a RCU stall occurs.
+         */
+        [CPUHP_TIMERS_DEAD] = {
+                .name = "timers dead",
+                .startup = NULL,
+                .teardown = timers_dead_cpu,
+        },
         /* Kicks the plugged cpu into life */
         [CPUHP_BRINGUP_CPU] = {
                 .name                   = "cpu:bringup",