CFS-devel, group scheduler, fixes
(3)
rework enqueue/dequeue_entity() to get rid of sched_class::set_curr_task(). This simplifies sched_setscheduler(), rt_mutex_setprio() and sched_move_tasks().
Signed-off-by Dmitry Adamushko <[email protected]>
Signed-off-by Srivatsa Vaddagiri <[email protected]>
---
include/linux/sched.h +0 -1
@@ -870,7 +870,6 @@ struct sched_class { struct sched_domain *sd, enum cpu_idle_type idle, int *all_pinned, int *this_best_prio); -void (*set_curr_task) (struct rq *rq);void (*task_tick) (struct rq *rq,struct task_struct *p);void (*task_new) (struct rq *rq,struct task_struct *p); };
kernel/sched.c +10 -26
@@ -3910,8 +3910,8 @@ EXPORT_SYMBOL(sleep_on_timeout);*/ void rt_mutex_setprio (struct task_struct *p,int prio) { -int oldprio, on_rq, running;unsigned long flags; +int oldprio, on_rq;struct rq *rq;BUG_ON (prio <0 || prio >MAX_PRIO );
@@ -3921,12 +3921,8 @@ void rt_mutex_setprio(struct task_struct *p, int prio) oldprio = p->prio; on_rq = p->se.on_rq; - running =task_running (rq, p); -if (on_rq) { +if (on_rq)dequeue_task (rq, p,0 ); -if (running) - p->sched_class->put_prev_task (rq, p); - }if (rt_prio (prio)) p->sched_class = &rt_sched_class;
@@ -3936,15 +3932,13 @@ void rt_mutex_setprio(struct task_struct *p, int prio) p->prio = prio;if (on_rq) { -if (running) - p->sched_class->set_curr_task (rq);enqueue_task (rq, p,0 );/* * Reschedule if we are currently running on this runqueue and * our priority decreased, or if we are not currently running on * this runqueue and our priority is higher than the current's */ -if (running) { +if (task_running (rq, p)) {if (p->prio > oldprio)resched_task (rq->curr); }else {
@@ -4150,7 +4144,7 @@ __setscheduler(struct rq *rq, struct task_struct *p, int policy, int prio)int sched_setscheduler (struct task_struct *p,int policy,struct sched_param *param) { -int retval, oldprio, oldpolicy =-1 , on_rq, running; +int retval, oldprio, oldpolicy =-1 , on_rq;unsigned long flags;struct rq *rq;
@@ -4232,24 +4226,20 @@ recheck: }update_rq_clock (rq); on_rq = p->se.on_rq; - running =task_running (rq, p); -if (on_rq) { +if (on_rq)deactivate_task (rq, p,0 ); -if (running) - p->sched_class->put_prev_task (rq, p); - } + oldprio = p->prio;__setscheduler (rq, p, policy, param->sched_priority); +if (on_rq) { -if (running) - p->sched_class->set_curr_task (rq);activate_task (rq, p,0 );/* * Reschedule if we are currently running on this runqueue and * our priority decreased, or if we are not currently running on * this runqueue and our priority is higher than the current's */ -if (running) { +if (task_running (rq, p)) {if (p->prio > oldprio)resched_task (rq->curr); }else {
@@ -6853,19 +6843,13 @@ static void sched_move_task(struct container_subsys *ss, struct container *cont, running =task_running (rq, tsk); on_rq = tsk->se.on_rq; -if (on_rq) { +if (on_rq)dequeue_task (rq, tsk,0 ); -if (unlikely (running)) - tsk->sched_class->put_prev_task (rq, tsk); - }set_task_cfs_rq (tsk); -if (on_rq) { -if (unlikely (running)) - tsk->sched_class->set_curr_task (rq); +if (on_rq)enqueue_task (rq, tsk,0 ); - } done:task_rq_unlock (rq, &flags);
kernel/sched_fair.c +24 -29
97 lines not on this page · raw message
kernel/sched_idletask.c +0 -5
@@ -50,10 +50,6 @@ static void task_tick_idle(struct rq *rq, struct task_struct *curr) { } -static void set_curr_task_idle (struct rq *rq) -{ -} -/* * Simple, special scheduling class for the per-CPU idle tasks: */
@@ -70,7 +66,6 @@ static struct sched_class idle_sched_class __read_mostly = { .load_balance = load_balance_idle, - .set_curr_task = set_curr_task_idle, .task_tick = task_tick_idle,/* no .task_new for idle tasks */ };
kernel/sched_rt.c +0 -5
@@ -218,10 +218,6 @@ static void task_tick_rt(struct rq *rq, struct task_struct *p) } } -static void set_curr_task_rt (struct rq *rq) -{ -} -static struct sched_class rt_sched_class__read_mostly = { .enqueue_task = enqueue_task_rt, .dequeue_task = dequeue_task_rt,
@@ -234,6 +230,5 @@ static struct sched_class rt_sched_class __read_mostly = { .load_balance = load_balance_rt, - .set_curr_task = set_curr_task_rt, .task_tick = task_tick_rt, };
---
Dmitry
Quoted 5 lines · Dmitry Adamushko
(3)
rework enqueue/dequeue_entity() to get rid of
sched_class::set_curr_task(). This simplifiessched_setscheduler(),rt_mutex_setprio()andsched_move_tasks().
ah. This makes your ready-queue patch a code size win. Applied.
Ingo