sched: use need_resched
PATCH 1/1 sched: use need_resched
Impact: cleanup
use need_resched() instead of unlikely(test_thread_flag(TIF_NEED_RESCHED))
---
kernel/sched.c +7 -8
@@ -4610,12 +4610,11 @@ 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 ))) - goto need_resched; +do { +preempt_disable (); +__schedule (); +preempt_enable_no_resched (); + }while (need_resched ()); }EXPORT_SYMBOL (schedule);
@@ -4707,7 +4706,7 @@ asmlinkage void __sched preempt_schedule(void)* between schedule and now. */ barrier (); - }while (unlikely (test_thread_flag (TIF_NEED_RESCHED ))); + }while (need_resched ()); }EXPORT_SYMBOL (preempt_schedule);
@@ -4736,7 +4735,7 @@ asmlinkage void __sched preempt_schedule_irq(void)* between schedule and now. */ barrier(); - }while (unlikely (test_thread_flag (TIF_NEED_RESCHED ))); + }while (need_resched ()); }#endif /* CONFIG_PREEMPT */
lib/kernel_lock.c +1 -1
@@ -39,7 +39,7 @@ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag); int __lockfunc __reacquire_kernel_lock(void) {while (!_raw_spin_trylock (&kernel_flag)) { -if (test_thread_flag (TIF_NEED_RESCHED )) +if (need_resched ())return -EAGAIN ;cpu_relax (); }
Quoted 6 lines · Lai Jiangshan
Impact: cleanup
use
need_resched()instead of unlikely(test_thread_flag(TIF_NEED_RESCHED))Signed-off-by Lai Jiangshan <[email protected]>
looks good - but it does not apply cleanly to the latest scheduler tree:
http://people.redhat.com/mingo/tip.git/README
Could you please send a merged up patch and also make sure there's no other TIF_NEED_RESCHED usage in kernel/sched.c that could be converted to need_resched()?
Thanks,
Ingo
PATCH 1/1 sched: cleanup for TIF_NEED_RESCHED
Quoted 13 lines · Ingo Molnar
Quoted 5 lines · Lai Jiangshan
Impact: cleanup
use
need_resched()instead of unlikely(test_thread_flag(TIF_NEED_RESCHED))Signed-off-by Lai Jiangshan <[email protected]>looks good - but it does not apply cleanly to the latest scheduler tree:
Quoted 9 lines
Could you please send a merged up patch and also make sure there's no other
TIF_NEED_RESCHEDusage inkernel/sched.cthat could be converted toneed_resched()?Thanks,
Ingo
From: Lai Jiangshan <[email protected]>
Impact: cleanup
Use test_tsk_need_resched(), set_tsk_need_resched(), need_resched() instead of using TIF_NEED_RESCHED.
---
kernel/sched.c +10 -11
@@ -1210,10 +1210,10 @@ static void resched_task(struct task_struct *p)assert_spin_locked (&task_rq (p)->lock); -if (unlikely (test_tsk_thread_flag (p,TIF_NEED_RESCHED ))) +if (test_tsk_need_resched (p))return ; -set_tsk_thread_flag (p,TIF_NEED_RESCHED ); +set_tsk_need_resched (p); cpu =task_cpu (p);if (cpu ==smp_processor_id ())
@@ -1269,7 +1269,7 @@ void wake_up_idle_cpu(int cpu)* lockless. The worst case is that the other CPU runs the * idle task through an additional NOOP schedule() */ -set_tsk_thread_flag (rq->idle,TIF_NEED_RESCHED ); +set_tsk_need_resched (rq->idle);/* NEED_RESCHED must be visible before we test polling */ smp_mb ();
@@ -4795,12 +4795,11 @@ 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 ))) - goto need_resched; +do { +preempt_disable (); +__schedule (); +preempt_enable_no_resched (); + }while (need_resched ()); }EXPORT_SYMBOL (schedule);
@@ -4892,7 +4891,7 @@ asmlinkage void __sched preempt_schedule(void)* between schedule and now. */ barrier (); - }while (unlikely (test_thread_flag (TIF_NEED_RESCHED ))); + }while (need_resched ()); }EXPORT_SYMBOL (preempt_schedule);
@@ -4921,7 +4920,7 @@ asmlinkage void __sched preempt_schedule_irq(void)* between schedule and now. */ barrier(); - }while (unlikely (test_thread_flag (TIF_NEED_RESCHED ))); + }while (need_resched ()); }#endif /* CONFIG_PREEMPT */
lib/kernel_lock.c +1 -1
@@ -39,7 +39,7 @@ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag); int __lockfunc __reacquire_kernel_lock(void) {while (!_raw_spin_trylock (&kernel_flag)) { -if (test_thread_flag (TIF_NEED_RESCHED )) +if (need_resched ())return -EAGAIN ;cpu_relax (); }
[tip:sched/cleanups] sched: TIF_NEED_RESCHED -> need_reshed() cleanup
Commit-ID: 5ed0cec0ac5f1b3759bdbe4d9df32ee4ff8afb5a Gitweb: http://git.kernel.org/tip/5ed0cec0ac5f1b3759bdbe4d9df32ee4ff8afb5a Author: "Lai Jiangshan" <[email protected]> AuthorDate: Fri, 6 Mar 2009 19:40:20 +0800 Commit: Ingo Molnar <[email protected]> CommitDate: Fri, 6 Mar 2009 12:48:55 +0100
sched: TIF_NEED_RESCHED -> need_reshed() cleanup
Impact: cleanup
Use test_tsk_need_resched(), set_tsk_need_resched(), need_resched() instead of using TIF_NEED_RESCHED.
LKML-Reference: <[email protected]>
--- kernel/sched.c | 10 +++++----- lib/kernel_lock.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
kernel/sched.c +5 -5
@@ -1189,10 +1189,10 @@ static void resched_task(struct task_struct *p)assert_spin_locked (&task_rq (p)->lock); -if (unlikely (test_tsk_thread_flag (p,TIF_NEED_RESCHED ))) +if (test_tsk_need_resched (p))return ; -set_tsk_thread_flag (p,TIF_NEED_RESCHED ); +set_tsk_need_resched (p); cpu =task_cpu (p);if (cpu ==smp_processor_id ())
@@ -1248,7 +1248,7 @@ void wake_up_idle_cpu(int cpu)* lockless. The worst case is that the other CPU runs the * idle task through an additional NOOP schedule() */ -set_tsk_thread_flag (rq->idle,TIF_NEED_RESCHED ); +set_tsk_need_resched (rq->idle);/* NEED_RESCHED must be visible before we test polling */ smp_mb ();
@@ -4740,7 +4740,7 @@ asmlinkage void __sched preempt_schedule(void)* between schedule and now. */ barrier (); - }while (unlikely (test_thread_flag (TIF_NEED_RESCHED ))); + }while (need_resched ()); }EXPORT_SYMBOL (preempt_schedule);
@@ -4769,7 +4769,7 @@ asmlinkage void __sched preempt_schedule_irq(void)* between schedule and now. */ barrier(); - }while (unlikely (test_thread_flag (TIF_NEED_RESCHED ))); + }while (need_resched ()); }#endif /* CONFIG_PREEMPT */
lib/kernel_lock.c +1 -1
@@ -39,7 +39,7 @@ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(kernel_flag); int __lockfunc __reacquire_kernel_lock(void) {while (!_raw_spin_trylock (&kernel_flag)) { -if (test_thread_flag (TIF_NEED_RESCHED )) +if (need_resched ())return -EAGAIN ;cpu_relax (); }