kthreads: simplify migration_thread() exit path
PATCH 4/4 kthreads: simplify migration_thread() exit path
Now that kthread_stop() can be used even if the task has already exited, we can kill the "wait_to_die:" loop in migration_thread(). But we must pin rq->migration_thread after creation.
Actually, I don't think CPU_UP_CANCELED or CPU_DEAD should wait for ->migration_thread exit. Perhaps we can simplify this code a bit more. migration_call() can set ->should_stop and forget about this thread. But we need a new helper in kthred.c for that.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/sched.c renamed from kernel/sched.c~4_MIGRATION +4 -10
@@ -6208,7 +6208,7 @@ static int migration_thread(void *data)if (cpu_is_offline (cpu)) {spin_unlock_irq (&rq->lock); - goto wait_to_die; +break ; }if (rq->active_balance) {
@@ -6234,16 +6234,7 @@ static int migration_thread(void *data)complete (&req->done); }__set_current_state (TASK_RUNNING ); -return 0 ; -wait_to_die: -/* Wait for kthread_stop */ -set_current_state (TASK_INTERRUPTIBLE ); -while (!kthread_should_stop ()) { -schedule (); -set_current_state (TASK_INTERRUPTIBLE ); - } -__set_current_state (TASK_RUNNING );return 0 ; }
@@ -6649,6 +6640,7 @@ migration_call(struct notifier_block *nf rq =task_rq_lock (p, &flags);__setscheduler (rq, p,SCHED_FIFO ,MAX_RT_PRIO -1 );task_rq_unlock (rq, &flags); +get_task_struct (p);cpu_rq (cpu)->migration_thread = p;break ;
@@ -6677,6 +6669,7 @@ migration_call(struct notifier_block *nfkthread_bind (cpu_rq (cpu)->migration_thread,cpumask_any (cpu_online_mask));kthread_stop (cpu_rq (cpu)->migration_thread); +put_task_struct (cpu_rq (cpu)->migration_thread);cpu_rq (cpu)->migration_thread =NULL ;break ;
@@ -6686,6 +6679,7 @@ migration_call(struct notifier_block *nfmigrate_live_tasks (cpu); rq =cpu_rq (cpu);kthread_stop (rq->migration_thread); +put_task_struct (rq->migration_thread); rq->migration_thread =NULL ;/* Idle task back to normal (off runqueue, low prio) */ spin_lock_irq (&rq->lock);