[PATCH v2 2/2] sched/rt: Remove redundant conditions from task_woken_rt()

Xunlei Pang
2015-05-05T11:57:44Z

From: Xunlei Pang <pang.xunlei@linaro.org>

- Remove "has_pushable_tasks(rq)".
Because for queued p, "!task_running(rq, p)" and "p->nr_cpus_allowed > 1"
already imply that "has_pushable_tasks(rq)" is true.

- Remove "!test_tsk_need_resched(rq->curr)".
The condtion mainly intends to ensure higher priority rt tasks won't be pushed
away. I can think of two reasons below for getting rid of it.
1) With following "rq->curr->prio <= p->prio", we still can guarantee that
purpose. "rq->curr->prio <= p->prio" implies the "need resched flag" wasn't
set by check_preempt_curr() except the one set by check_preempt_equal_prio()
for equal prio cases(In this case, if the condition is removed, it may result
in an extra push_rt_tasks(), but this doesn't cause the wrong logic, in fact
this extra push_rt_tasks() will probably return quickly for the case).

Addtionally, there're also cases the "need resched flag" got set before the
waking, with current implementation it needn't to push lower priority tasks
as the cpu will schedule, while it will do an extra pushing if the condition
is removed. But on the other hand, we can get a timely pushing for the woken
tasks after the condition is removed(better for the non-preemptible kernel).

2) With following condtion "rq->curr->nr_cpus_allowed < 2" which was added by
commit b3bc211cfe7d ("sched: Give CPU bound RT tasks preference"). But in the
scenario descibed in the commit, "need resched flag" was already set before in
check_preempt_curr(), thus "!test_tsk_need_resched(rq->curr)" is always false
which means with current implementation the commit is futile for task_woken_rt().
So, by removing this condition, we get the right logic.

Signed-off-by: Xunlei Pang <pang.xunlei@linaro.org>
---
v1->v2:
Improved the changelog.

kernel/sched/rt.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
index 4176f33..95b596b 100644
--- a/kernel/sched/rt.c
+++ b/kernel/sched/rt.c
@@ -2232,8 +2232,6 @@ out:
static void task_woken_rt(struct rq *rq, struct task_struct *p)
{
if (!task_running(rq, p) &&
- !test_tsk_need_resched(rq->curr) &&
- has_pushable_tasks(rq) &&
p->nr_cpus_allowed > 1 &&
(dl_task(rq->curr) || rt_task(rq->curr)) &&
(rq->curr->nr_cpus_allowed < 2 ||
--
1.9.1