Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbc7f069 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Thomas Gleixner
Browse files

sched: Use replace normalize_task() with __sched_setscheduler() 



Reduce duplicate logic; normalize_task() is a simplified version of
__sched_setscheduler(). Parametrize the difference and collapse.

This reduces the amount of check_class_changed() sites.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: ktkhai@parallels.com
Cc: rostedt@goodmis.org
Cc: juri.lelli@gmail.com
Cc: pang.xunlei@linaro.org
Cc: oleg@redhat.com
Cc: wanpeng.li@linux.intel.com
Cc: umgwanakikbuti@gmail.com
Link: http://lkml.kernel.org/r/20150611124742.532642391@infradead.org


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e3fca9e7

kernel/sched/core.c

+23 −42
Original line number Diff line number Diff line
@@ -3438,7 +3438,7 @@ static bool dl_param_changed(struct task_struct *p, 


static int __sched_setscheduler(struct task_struct *p,

				const struct sched_attr *attr,

				bool user)

				bool user, bool pi)

{

	int newprio = dl_policy(attr->sched_policy) ? MAX_DL_PRIO - 1 :

		      MAX_RT_PRIO - 1 - attr->sched_priority;
@@ -3624,6 +3624,7 @@ static int __sched_setscheduler(struct task_struct *p, 
	p->sched_reset_on_fork = reset_on_fork;

	oldprio = p->prio;



	if (pi) {

		/*

		 * Take priority boosted tasks into account. If the new

		 * effective priority is unchanged, we just store the new
@@ -3637,6 +3638,7 @@ static int __sched_setscheduler(struct task_struct *p, 
			task_rq_unlock(rq, p, &flags);

			return 0;

		}

	}



	queued = task_on_rq_queued(p);

	running = task_current(rq, p);
@@ -3646,7 +3648,7 @@ static int __sched_setscheduler(struct task_struct *p, 
		put_prev_task(rq, p);



	prev_class = p->sched_class;

	__setscheduler(rq, p, attr, true);

	__setscheduler(rq, p, attr, pi);



	if (running)

		p->sched_class->set_curr_task(rq);
@@ -3661,6 +3663,7 @@ static int __sched_setscheduler(struct task_struct *p, 
	check_class_changed(rq, p, prev_class, oldprio);

	task_rq_unlock(rq, p, &flags);



	if (pi)

		rt_mutex_adjust_pi(p);



	return 0;
@@ -3682,7 +3685,7 @@ static int _sched_setscheduler(struct task_struct *p, int policy, 
		attr.sched_policy = policy;

	}



	return __sched_setscheduler(p, &attr, check);

	return __sched_setscheduler(p, &attr, check, true);

}

/**

 * sched_setscheduler - change the scheduling policy and/or RT priority of a thread.
@@ -3703,7 +3706,7 @@ EXPORT_SYMBOL_GPL(sched_setscheduler); 


int sched_setattr(struct task_struct *p, const struct sched_attr *attr)

{

	return __sched_setscheduler(p, attr, true);

	return __sched_setscheduler(p, attr, true, true);

}

EXPORT_SYMBOL_GPL(sched_setattr);
@@ -7361,32 +7364,12 @@ EXPORT_SYMBOL(___might_sleep); 
#endif



#ifdef CONFIG_MAGIC_SYSRQ

static void normalize_task(struct rq *rq, struct task_struct *p)

void normalize_rt_tasks(void)

{

	const struct sched_class *prev_class = p->sched_class;

	struct task_struct *g, *p;

	struct sched_attr attr = {

		.sched_policy = SCHED_NORMAL,

	};

	int old_prio = p->prio;

	int queued;



	queued = task_on_rq_queued(p);

	if (queued)

		dequeue_task(rq, p, 0);

	__setscheduler(rq, p, &attr, false);

	if (queued) {

		enqueue_task(rq, p, 0);

		resched_curr(rq);

	}



	check_class_changed(rq, p, prev_class, old_prio);

}



void normalize_rt_tasks(void)

{

	struct task_struct *g, *p;

	unsigned long flags;

	struct rq *rq;



	read_lock(&tasklist_lock);

	for_each_process_thread(g, p) {
@@ -7413,9 +7396,7 @@ void normalize_rt_tasks(void) 
			continue;

		}



		rq = task_rq_lock(p, &flags);

		normalize_task(rq, p);

		task_rq_unlock(rq, p, &flags);

		__sched_setscheduler(p, &attr, false, false);

	}

	read_unlock(&tasklist_lock);

}