sched/rt: cleanup check preempt equal prio
PATCH v3 1/6 sched/rt: cleanup check preempt equal prio
This patch checks if current can be pushed/pulled somewhere else in advance to make logic clear, the same behavior as dl class.
- If current can't be migrated, useless to reschedule, let's hope task can move out.
- If task is migratable, so let's not schedule it and see if it can be pushed or pulled somewhere else.
---
v2 -> v3:
* cleanup subject/comments
* align multi-line if() correctly
kernel/sched/rt.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
kernel/sched/rt.c +10 -4
@@ -1351,16 +1351,22 @@ out:static void check_preempt_equal_prio (struct rq *rq,struct task_struct *p) { -if (rq->curr->nr_cpus_allowed ==1 ) +/* +* Current can't be migrated, useless to reschedule, +* let's hope p can move out. +*/ +if (rq->curr->nr_cpus_allowed ==1 || + !cpupri_find (&rq->rd->cpupri, rq->curr,NULL ))return ; +/* +* p is migratable, so let's not schedule it and +* see if it is pushed or pulled somewhere else. +*/ if (p->nr_cpus_allowed !=1 &&cpupri_find (&rq->rd->cpupri, p,NULL ))return ; -if (!cpupri_find (&rq->rd->cpupri, rq->curr,NULL )) -return ; -/* * There appears to be other cpus that can accept * current and none to run 'p', so lets reschedule
Signature · 1 line
1.9.1
PATCH v3 2/6 sched/deadline: fix artificial overrun introduced by yield_task_dl
The yield semantic of deadline class is to reduce remaining runtime to zero, and then update_curr_dl() will stop it. However, comsumed bandwidth is reduced from the budget of yield task again even if it has already been set to zero which leads to artificial overrun. This patch fix it by make sure we don't steal some more time from the task that yielded in update_curr_dl().
---
v1 -> v2:
* make sure we don't steal some more time from the task that yielded in update_curr_dl().
kernel/sched/deadline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/deadline.c +1 -1
@@ -633,7 +633,7 @@ static void update_curr_dl(struct rq *rq)sched_rt_avg_update (rq, delta_exec); - dl_se->runtime -= delta_exec; + dl_se->runtime -= dl_se->dl_yielded ?0 : delta_exec;if (dl_runtime_exceeded (rq, dl_se)) {__dequeue_task_dl (rq, curr,0 );if (likely (start_dl_timer (dl_se, curr->dl.dl_boosted)))
Signature · 1 line
1.9.1
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched/deadline: Fix artificial overrun introduced by yield_task_dl()
sched/deadline: Fix artificial overrun introduced by yield_task_dl()
Commit-ID: 804968809c321066cca028d4cbd533a420f964bc Gitweb: http://git.kernel.org/tip/804968809c321066cca028d4cbd533a420f964bc Author: Wanpeng Li <[email protected]> AuthorDate: Fri, 31 Oct 2014 06:39:32 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Nov 2014 07:17:53 +0100
sched/deadline: Fix artificial overrun introduced by yield_task_dl()
The yield semantic of deadline class is to reduce remaining runtime to zero, and then update_curr_dl() will stop it. However, comsumed bandwidth is reduced from the budget of yield task again even if it has already been set to zero which leads to artificial overrun. This patch fix it by make sure we don't steal some more time from the task that yielded in update_curr_dl().
--- kernel/sched/deadline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/deadline.c +1 -1
@@ -628,7 +628,7 @@ static void update_curr_dl(struct rq *rq)sched_rt_avg_update (rq, delta_exec); - dl_se->runtime -= delta_exec; + dl_se->runtime -= dl_se->dl_yielded ?0 : delta_exec;if (dl_runtime_exceeded (rq, dl_se)) {__dequeue_task_dl (rq, curr,0 );if (likely (start_dl_timer (dl_se, curr->dl.dl_boosted)))
PATCH v3 3/6 sched/deadline: add deadline rq status print
In reply to Wanpeng LiThis patch add deadline rq status print.
--- kernel/sched/deadline.c | 9 +++++++++ kernel/sched/debug.c | 7 +++++++ kernel/sched/sched.h | 1 + 3 files changed, 17 insertions(+)
kernel/sched/deadline.c +9 -0
@@ -1727,3 +1727,12 @@ const struct sched_class dl_sched_class = { .switched_from = switched_from_dl, .switched_to = switched_to_dl, }; + +#ifdef CONFIG_SCHED_DEBUG +extern void print_dl_rq (struct seq_file *m,int cpu,struct dl_rq *dl_rq); + +void print_dl_stats (struct seq_file *m,int cpu) +{ +print_dl_rq (m, cpu, &cpu_rq (cpu)->dl); +} +#endif /* CONFIG_SCHED_DEBUG */
kernel/sched/debug.c +7 -0
@@ -261,6 +261,12 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)#undef P } +void print_dl_rq (struct seq_file *m,int cpu,struct dl_rq *dl_rq) +{ +SEQ_printf (m,"\ndl_rq[%d]:\n" , cpu); +SEQ_printf (m," .%-30s: %ld\n" ,"dl_nr_running" , dl_rq->dl_nr_running); +} +extern __read_mostly int sched_clock_running;static void print_cpu (struct seq_file *m,int cpu)
@@ -329,6 +335,7 @@ do { \spin_lock_irqsave (&sched_debug_lock, flags);print_cfs_stats (m, cpu);print_rt_stats (m, cpu); +print_dl_stats (m, cpu);print_rq (m, rq, cpu);spin_unlock_irqrestore (&sched_debug_lock, flags);
kernel/sched/sched.h +1 -0
@@ -1532,6 +1532,7 @@ extern struct sched_entity *__pick_first_entity(struct cfs_rq *cfs_rq);extern struct sched_entity *__pick_last_entity (struct cfs_rq *cfs_rq);extern void print_cfs_stats (struct seq_file *m,int cpu);extern void print_rt_stats (struct seq_file *m,int cpu); +extern void print_dl_stats (struct seq_file *m,int cpu);extern void init_cfs_rq (struct cfs_rq *cfs_rq);extern void init_rt_rq (struct rt_rq *rt_rq,struct rq *rq);
Signature · 1 line
1.9.1
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched/deadline: Add deadline rq status print
sched/deadline: Add deadline rq status print
Commit-ID: acb32132ec0433c03bed750f3e9508dc29db0328 Gitweb: http://git.kernel.org/tip/acb32132ec0433c03bed750f3e9508dc29db0328 Author: Wanpeng Li <[email protected]> AuthorDate: Fri, 31 Oct 2014 06:39:33 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Nov 2014 07:17:54 +0100
sched/deadline: Add deadline rq status print
This patch add deadline rq status print.
--- kernel/sched/deadline.c | 9 +++++++++ kernel/sched/debug.c | 7 +++++++ kernel/sched/sched.h | 1 + 3 files changed, 17 insertions(+)
kernel/sched/deadline.c +9 -0
@@ -1747,3 +1747,12 @@ const struct sched_class dl_sched_class = { .switched_from = switched_from_dl, .switched_to = switched_to_dl, }; + +#ifdef CONFIG_SCHED_DEBUG +extern void print_dl_rq (struct seq_file *m,int cpu,struct dl_rq *dl_rq); + +void print_dl_stats (struct seq_file *m,int cpu) +{ +print_dl_rq (m, cpu, &cpu_rq (cpu)->dl); +} +#endif /* CONFIG_SCHED_DEBUG */
kernel/sched/debug.c +7 -0
@@ -261,6 +261,12 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)#undef P } +void print_dl_rq (struct seq_file *m,int cpu,struct dl_rq *dl_rq) +{ +SEQ_printf (m,"\ndl_rq[%d]:\n" , cpu); +SEQ_printf (m," .%-30s: %ld\n" ,"dl_nr_running" , dl_rq->dl_nr_running); +} +extern __read_mostly int sched_clock_running;static void print_cpu (struct seq_file *m,int cpu)
@@ -329,6 +335,7 @@ do { \spin_lock_irqsave (&sched_debug_lock, flags);print_cfs_stats (m, cpu);print_rt_stats (m, cpu); +print_dl_stats (m, cpu);print_rq (m, rq, cpu);spin_unlock_irqrestore (&sched_debug_lock, flags);
kernel/sched/sched.h +1 -0
@@ -1537,6 +1537,7 @@ extern struct sched_entity *__pick_first_entity(struct cfs_rq *cfs_rq);extern struct sched_entity *__pick_last_entity (struct cfs_rq *cfs_rq);extern void print_cfs_stats (struct seq_file *m,int cpu);extern void print_rt_stats (struct seq_file *m,int cpu); +extern void print_dl_stats (struct seq_file *m,int cpu);extern void init_cfs_rq (struct cfs_rq *cfs_rq);extern void init_rt_rq (struct rt_rq *rt_rq,struct rq *rq);
PATCH v3 4/6 sched/deadline: push task away if the deadline is equal to curr during wakeup
In reply to Wanpeng LiThis patch pushes task away if the dealine of the task is equal to current during wake up. The same behavior as rt class.
--- kernel/sched/deadline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/deadline.c +1 -1
@@ -1511,7 +1511,7 @@ static void task_woken_dl(struct rq *rq, struct task_struct *p) p->nr_cpus_allowed > 1 && dl_task(rq->curr) && (rq->curr->nr_cpus_allowed < 2 || - dl_entity_preempt(&rq->curr->dl, &p->dl))) { + !dl_entity_preempt(&p->dl, &rq->curr->dl))) {push_dl_tasks (rq); } }
Signature · 1 line
1.9.1
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched/deadline: Push task away if the deadline is equal to curr during wakeup
sched/deadline: Push task away if the deadline is equal to curr during wakeup
Commit-ID: 6b0a563f3a534827c1b56e53c3fd0fccec3c7895 Gitweb: http://git.kernel.org/tip/6b0a563f3a534827c1b56e53c3fd0fccec3c7895 Author: Wanpeng Li <[email protected]> AuthorDate: Fri, 31 Oct 2014 06:39:34 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Nov 2014 07:17:55 +0100
sched/deadline: Push task away if the deadline is equal to curr during wakeup
This patch pushes task away if the dealine of the task is equal to current during wake up. The same behavior as rt class.
--- kernel/sched/deadline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/sched/deadline.c +1 -1
@@ -1506,7 +1506,7 @@ static void task_woken_dl(struct rq *rq, struct task_struct *p) p->nr_cpus_allowed > 1 && dl_task(rq->curr) && (rq->curr->nr_cpus_allowed < 2 || - dl_entity_preempt(&rq->curr->dl, &p->dl))) { + !dl_entity_preempt(&p->dl, &rq->curr->dl))) {push_dl_tasks (rq); } }
PATCH v3 5/6 sched/deadline: reschedule from switched_from_dl() after a successful pull
In reply to Wanpeng LiIn switched_from_dl() we have to issue a resched if we successfully pulled some task from other cpus. This patch also aligns the behavior with -rt.
---
v1 -> v2:
* align the behaviour with -rt.
kernel/sched/deadline.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/sched/deadline.c +5 -2
@@ -1623,8 +1623,11 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)* this is the right place to try to pull some other one * from an overloaded cpu, if any. */ -if (!rq->dl.dl_nr_running) -pull_dl_task (rq); +if (!task_on_rq_queued (p) || rq->dl.dl_nr_running) +return ; + +if (pull_dl_task (rq)) +resched_curr (rq);#endif }
Signature · 1 line
1.9.1
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched/deadline: Reschedule from switched_from_dl () after a successful pull
sched/deadline: Reschedule from switched_from_dl() after a successful pull
Commit-ID: cd66091162d34f589631a23bbe0ed214798245b4 Gitweb: http://git.kernel.org/tip/cd66091162d34f589631a23bbe0ed214798245b4 Author: Wanpeng Li <[email protected]> AuthorDate: Fri, 31 Oct 2014 06:39:35 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Nov 2014 07:17:55 +0100
sched/deadline: Reschedule from switched_from_dl() after a successful pull
In switched_from_dl() we have to issue a resched if we successfully pulled some task from other cpus. This patch also aligns the behavior with -rt.
--- kernel/sched/deadline.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
kernel/sched/deadline.c +5 -2
@@ -1643,8 +1643,11 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)* this is the right place to try to pull some other one * from an overloaded cpu, if any. */ -if (!rq->dl.dl_nr_running) -pull_dl_task (rq); +if (!task_on_rq_queued (p) || rq->dl.dl_nr_running) +return ; + +if (pull_dl_task (rq)) +resched_curr (rq);#endif }
PATCH v3 6/6 sched/deadline: don't check CONFIG_SMP in switched_from_dl
In reply to Wanpeng LiThere are both UP and SMP version of pull_dl_task(), so don't need to check CONFIG_SMP in switched_from_dl();
--- kernel/sched/deadline.c | 2 -- 1 file changed, 2 deletions(-)
kernel/sched/deadline.c +0 -2
@@ -1617,7 +1617,6 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)__dl_clear_params (p); -#ifdef CONFIG_SMP /* * Since this might be the only -deadline task on the rq, * this is the right place to try to pull some other one
@@ -1628,7 +1627,6 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)if (pull_dl_task (rq))resched_curr (rq); -#endif }/*
Signature · 1 line
1.9.1
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched/deadline: Don' t check CONFIG_SMP in switched_from_dl()
sched/deadline: Don't check CONFIG_SMP in switched_from_dl()
Commit-ID: cad3bb32e181c286c46ec12b2deb1f26a6f9835d Gitweb: http://git.kernel.org/tip/cad3bb32e181c286c46ec12b2deb1f26a6f9835d Author: Wanpeng Li <[email protected]> AuthorDate: Fri, 31 Oct 2014 06:39:36 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Nov 2014 07:17:56 +0100
sched/deadline: Don't check CONFIG_SMP in switched_from_dl()
There are both UP and SMP version of pull_dl_task(), so don't need to check CONFIG_SMP in switched_from_dl();
--- kernel/sched/deadline.c | 2 -- 1 file changed, 2 deletions(-)
kernel/sched/deadline.c +0 -2
@@ -1637,7 +1637,6 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)__dl_clear_params (p); -#ifdef CONFIG_SMP /* * Since this might be the only -deadline task on the rq, * this is the right place to try to pull some other one
@@ -1648,7 +1647,6 @@ static void switched_from_dl(struct rq *rq, struct task_struct *p)if (pull_dl_task (rq))resched_curr (rq); -#endif }/*
tip-bot for Wanpeng Li
merge bot[tip:sched/core] sched/rt: Clean up check_preempt_equal_prio()
In reply to Wanpeng Lisched/rt: Clean up check_preempt_equal_prio()
Commit-ID: 308a623a40ce168eb234ea82c2bd13ff85a098d9 Gitweb: http://git.kernel.org/tip/308a623a40ce168eb234ea82c2bd13ff85a098d9 Author: Wanpeng Li <[email protected]> AuthorDate: Fri, 31 Oct 2014 06:39:31 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 4 Nov 2014 07:17:52 +0100
sched/rt: Clean up check_preempt_equal_prio()
This patch checks if current can be pushed/pulled somewhere else in advance to make logic clear, the same behavior as dl class.
- If current can't be migrated, useless to reschedule, let's hope task can move out.
- If task is migratable, so let's not schedule it and see if it can be pushed or pulled somewhere else.
--- kernel/sched/rt.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
kernel/sched/rt.c +10 -4
@@ -1351,16 +1351,22 @@ out:static void check_preempt_equal_prio (struct rq *rq,struct task_struct *p) { -if (rq->curr->nr_cpus_allowed ==1 ) +/* +* Current can't be migrated, useless to reschedule, +* let's hope p can move out. +*/ +if (rq->curr->nr_cpus_allowed ==1 || + !cpupri_find (&rq->rd->cpupri, rq->curr,NULL ))return ; +/* +* p is migratable, so let's not schedule it and +* see if it is pushed or pulled somewhere else. +*/ if (p->nr_cpus_allowed !=1 &&cpupri_find (&rq->rd->cpupri, p,NULL ))return ; -if (!cpupri_find (&rq->rd->cpupri, rq->curr,NULL )) -return ; -/* * There appears to be other cpus that can accept * current and none to run 'p', so lets reschedule