Răsfoiți Sursa

sched: fix new task startup crash

Child task may be added on a different cpu that the one on which parent
is running. In which case, task_new_fair() should check whether the new
born task's parent entity should be added as well on the cfs_rq.

Patch below fixes the problem in task_new_fair.

This could fix the put_prev_task_fair() crashes reported.

Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Reported-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Srivatsa Vaddagiri 17 ani în urmă
părinte
comite
b9dca1e0fc
2 a modificat fișierele cu 2 adăugiri și 6 ștergeri
  1. 1 1
      kernel/sched.c
  2. 1 5
      kernel/sched_fair.c

+ 1 - 1
kernel/sched.c

@@ -1712,7 +1712,7 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 
 
 	p->prio = effective_prio(p);
 	p->prio = effective_prio(p);
 
 
-	if (!p->sched_class->task_new || !current->se.on_rq || !rq->cfs.curr) {
+	if (!p->sched_class->task_new || !current->se.on_rq) {
 		activate_task(rq, p, 0);
 		activate_task(rq, p, 0);
 	} else {
 	} else {
 		/*
 		/*

+ 1 - 5
kernel/sched_fair.c

@@ -1031,12 +1031,8 @@ static void task_new_fair(struct rq *rq, struct task_struct *p)
 		swap(curr->vruntime, se->vruntime);
 		swap(curr->vruntime, se->vruntime);
 	}
 	}
 
 
-	update_stats_enqueue(cfs_rq, se);
-	check_spread(cfs_rq, se);
-	check_spread(cfs_rq, curr);
-	__enqueue_entity(cfs_rq, se);
-	account_entity_enqueue(cfs_rq, se);
 	se->peer_preempt = 0;
 	se->peer_preempt = 0;
+	enqueue_task_fair(rq, p, 0);
 	resched_task(rq->curr);
 	resched_task(rq->curr);
 }
 }