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

Commit 4693ecc8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: move up-down migration handler out of CGROUP_SCHED"

parents a01ffd51 64067611

kernel/sched/core.c

+135 −135
Original line number Diff line number Diff line
@@ -6809,141 +6809,6 @@ void ia64_set_curr_task(int cpu, struct task_struct *p) 


#endif



#ifdef CONFIG_CGROUP_SCHED

/* task_group_lock serializes the addition/removal of task groups */

static DEFINE_SPINLOCK(task_group_lock);



static void sched_free_group(struct task_group *tg)

{

	free_fair_sched_group(tg);

	free_rt_sched_group(tg);

	autogroup_free(tg);

	kmem_cache_free(task_group_cache, tg);

}



/* allocate runqueue etc for a new task group */

struct task_group *sched_create_group(struct task_group *parent)

{

	struct task_group *tg;



	tg = kmem_cache_alloc(task_group_cache, GFP_KERNEL | __GFP_ZERO);

	if (!tg)

		return ERR_PTR(-ENOMEM);



	if (!alloc_fair_sched_group(tg, parent))

		goto err;



	if (!alloc_rt_sched_group(tg, parent))

		goto err;



	return tg;



err:

	sched_free_group(tg);

	return ERR_PTR(-ENOMEM);

}



void sched_online_group(struct task_group *tg, struct task_group *parent)

{

	unsigned long flags;



	spin_lock_irqsave(&task_group_lock, flags);

	list_add_rcu(&tg->list, &task_groups);



	/* Root should already exist: */

	WARN_ON(!parent);



	tg->parent = parent;

	INIT_LIST_HEAD(&tg->children);

	list_add_rcu(&tg->siblings, &parent->children);

	spin_unlock_irqrestore(&task_group_lock, flags);



	online_fair_sched_group(tg);

}



/* rcu callback to free various structures associated with a task group */

static void sched_free_group_rcu(struct rcu_head *rhp)

{

	/* Now it should be safe to free those cfs_rqs: */

	sched_free_group(container_of(rhp, struct task_group, rcu));

}



void sched_destroy_group(struct task_group *tg)

{

	/* Wait for possible concurrent references to cfs_rqs complete: */

	call_rcu(&tg->rcu, sched_free_group_rcu);

}



void sched_offline_group(struct task_group *tg)

{

	unsigned long flags;



	/* End participation in shares distribution: */

	unregister_fair_sched_group(tg);



	spin_lock_irqsave(&task_group_lock, flags);

	list_del_rcu(&tg->list);

	list_del_rcu(&tg->siblings);

	spin_unlock_irqrestore(&task_group_lock, flags);

}



static void sched_change_group(struct task_struct *tsk, int type)

{

	struct task_group *tg;



	/*

	 * All callers are synchronized by task_rq_lock(); we do not use RCU

	 * which is pointless here. Thus, we pass "true" to task_css_check()

	 * to prevent lockdep warnings.

	 */

	tg = container_of(task_css_check(tsk, cpu_cgrp_id, true),

			  struct task_group, css);

	tg = autogroup_task_group(tsk, tg);

	tsk->sched_task_group = tg;



#ifdef CONFIG_FAIR_GROUP_SCHED

	if (tsk->sched_class->task_change_group)

		tsk->sched_class->task_change_group(tsk, type);

	else

#endif

		set_task_rq(tsk, task_cpu(tsk));

}



/*

 * Change task's runqueue when it moves between groups.

 *

 * The caller of this function should have put the task in its new group by

 * now. This function just updates tsk->se.cfs_rq and tsk->se.parent to reflect

 * its new group.

 */

void sched_move_task(struct task_struct *tsk)

{

	int queued, running, queue_flags =

		DEQUEUE_SAVE | DEQUEUE_MOVE | DEQUEUE_NOCLOCK;

	struct rq_flags rf;

	struct rq *rq;



	rq = task_rq_lock(tsk, &rf);

	update_rq_clock(rq);



	running = task_current(rq, tsk);

	queued = task_on_rq_queued(tsk);



	if (queued)

		dequeue_task(rq, tsk, queue_flags);

	if (running)

		put_prev_task(rq, tsk);



	sched_change_group(tsk, TASK_MOVE_GROUP);



	if (queued)

		enqueue_task(rq, tsk, queue_flags);

	if (running)

		set_curr_task(rq, tsk);



	task_rq_unlock(rq, tsk, &rf);

}



#ifdef CONFIG_PROC_SYSCTL

static int find_capacity_margin_levels(void)

{
@@ -7091,6 +6956,141 @@ int sched_updown_migrate_handler(struct ctl_table *table, int write, 
}

#endif



#ifdef CONFIG_CGROUP_SCHED

/* task_group_lock serializes the addition/removal of task groups */

static DEFINE_SPINLOCK(task_group_lock);



static void sched_free_group(struct task_group *tg)

{

	free_fair_sched_group(tg);

	free_rt_sched_group(tg);

	autogroup_free(tg);

	kmem_cache_free(task_group_cache, tg);

}



/* allocate runqueue etc for a new task group */

struct task_group *sched_create_group(struct task_group *parent)

{

	struct task_group *tg;



	tg = kmem_cache_alloc(task_group_cache, GFP_KERNEL | __GFP_ZERO);

	if (!tg)

		return ERR_PTR(-ENOMEM);



	if (!alloc_fair_sched_group(tg, parent))

		goto err;



	if (!alloc_rt_sched_group(tg, parent))

		goto err;



	return tg;



err:

	sched_free_group(tg);

	return ERR_PTR(-ENOMEM);

}



void sched_online_group(struct task_group *tg, struct task_group *parent)

{

	unsigned long flags;



	spin_lock_irqsave(&task_group_lock, flags);

	list_add_rcu(&tg->list, &task_groups);



	/* Root should already exist: */

	WARN_ON(!parent);



	tg->parent = parent;

	INIT_LIST_HEAD(&tg->children);

	list_add_rcu(&tg->siblings, &parent->children);

	spin_unlock_irqrestore(&task_group_lock, flags);



	online_fair_sched_group(tg);

}



/* rcu callback to free various structures associated with a task group */

static void sched_free_group_rcu(struct rcu_head *rhp)

{

	/* Now it should be safe to free those cfs_rqs: */

	sched_free_group(container_of(rhp, struct task_group, rcu));

}



void sched_destroy_group(struct task_group *tg)

{

	/* Wait for possible concurrent references to cfs_rqs complete: */

	call_rcu(&tg->rcu, sched_free_group_rcu);

}



void sched_offline_group(struct task_group *tg)

{

	unsigned long flags;



	/* End participation in shares distribution: */

	unregister_fair_sched_group(tg);



	spin_lock_irqsave(&task_group_lock, flags);

	list_del_rcu(&tg->list);

	list_del_rcu(&tg->siblings);

	spin_unlock_irqrestore(&task_group_lock, flags);

}



static void sched_change_group(struct task_struct *tsk, int type)

{

	struct task_group *tg;



	/*

	 * All callers are synchronized by task_rq_lock(); we do not use RCU

	 * which is pointless here. Thus, we pass "true" to task_css_check()

	 * to prevent lockdep warnings.

	 */

	tg = container_of(task_css_check(tsk, cpu_cgrp_id, true),

			  struct task_group, css);

	tg = autogroup_task_group(tsk, tg);

	tsk->sched_task_group = tg;



#ifdef CONFIG_FAIR_GROUP_SCHED

	if (tsk->sched_class->task_change_group)

		tsk->sched_class->task_change_group(tsk, type);

	else

#endif

		set_task_rq(tsk, task_cpu(tsk));

}



/*

 * Change task's runqueue when it moves between groups.

 *

 * The caller of this function should have put the task in its new group by

 * now. This function just updates tsk->se.cfs_rq and tsk->se.parent to reflect

 * its new group.

 */

void sched_move_task(struct task_struct *tsk)

{

	int queued, running, queue_flags =

		DEQUEUE_SAVE | DEQUEUE_MOVE | DEQUEUE_NOCLOCK;

	struct rq_flags rf;

	struct rq *rq;



	rq = task_rq_lock(tsk, &rf);

	update_rq_clock(rq);



	running = task_current(rq, tsk);

	queued = task_on_rq_queued(tsk);



	if (queued)

		dequeue_task(rq, tsk, queue_flags);

	if (running)

		put_prev_task(rq, tsk);



	sched_change_group(tsk, TASK_MOVE_GROUP);



	if (queued)

		enqueue_task(rq, tsk, queue_flags);

	if (running)

		set_curr_task(rq, tsk);



	task_rq_unlock(rq, tsk, &rf);

}



static inline struct task_group *css_tg(struct cgroup_subsys_state *css)

{

	return css ? container_of(css, struct task_group, css) : NULL;