sched: remove extra call overhead for schedule()
PATCH 1/1 sched: remove extra call overhead for schedule()
Lai Jiangshan's patch reminded me that I promised Nick to remove that extra call overhead in schedule().
Signed-off-by Peter Zijlstra <[email protected]>
--- kernel/mutex.c | 4 +++- kernel/sched.c | 12 ++++-------- 2 files changed, 7 insertions(+), 9 deletions(-)
kernel/mutex.c +3 -1
@@ -248,7 +248,9 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,/* didnt get the lock, go to sleep: */ spin_unlock_mutex (&lock->wait_lock, flags); -__schedule (); +preempt_enable_no_resched (); +schedule (); +preempt_disable ();spin_lock_mutex (&lock->wait_lock, flags); }
kernel/sched.c +4 -8
@@ -4727,13 +4727,15 @@ pick_next_task(struct rq *rq)/* * schedule() is the main scheduler function. */ -asmlinkage void __sched __schedule(void) +asmlinkage void __sched schedule(void) {struct task_struct *prev, *next;unsigned long *switch_count;struct rq *rq;int cpu; +need_resched: +preempt_disable (); cpu =smp_processor_id (); rq =cpu_rq (cpu);rcu_qsctr_inc (cpu);
@@ -4791,15 +4793,9 @@ need_resched_nonpreemptible:if (unlikely (reacquire_kernel_lock (current) <0 )) goto need_resched_nonpreemptible; -} -asmlinkage void __sched schedule(void) -{ -need_resched: -preempt_disable (); -__schedule ();preempt_enable_no_resched (); -if (unlikely (test_thread_flag (TIF_NEED_RESCHED ))) +if (need_resched ()) goto need_resched; }EXPORT_SYMBOL (schedule);