Message ID | 20231013115902.1059735-17-frederic@kernel.org (mailing list archive) |
---|---|
State | Mainlined |
Commit | a28ab03b499601c14b8f502d875c2bee23209659 |
Headers | show |
Series | RCU fixes for v6.7 | expand |
diff --git a/kernel/cpu.c b/kernel/cpu.c index 2491766e1fd5..3b9d5c7eb4a2 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -1372,7 +1372,14 @@ static int takedown_cpu(unsigned int cpu) cpuhp_bp_sync_dead(cpu); tick_cleanup_dead_cpu(cpu); + + /* + * Callbacks must be re-integrated right away to the RCU state machine. + * Otherwise an RCU callback could block a further teardown function + * waiting for its completion. + */ rcutree_migrate_callbacks(cpu); + return 0; }