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

Commit 25cc7da7 authored by Li Zefan's avatar Li Zefan Committed by Ingo Molnar
Browse files

sched: Move group scheduling functions out of include/linux/sched.h 



- Make sched_group_{set_,}runtime(), sched_group_{set_,}period()
and sched_rt_can_attach() static.

- Move sched_{create,destroy,online,offline}_group() to
kernel/sched/sched.h.

- Remove declaration of sched_group_shares().

Signed-off-by: default avatarLi Zefan <lizefan@huawei.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/5135A7C5.3000708@huawei.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 15f803c9

include/linux/sched.h

+0 −21
Original line number Diff line number Diff line
@@ -2512,28 +2512,7 @@ extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask); 
extern long sched_getaffinity(pid_t pid, struct cpumask *mask);



#ifdef CONFIG_CGROUP_SCHED



extern struct task_group root_task_group;



extern struct task_group *sched_create_group(struct task_group *parent);

extern void sched_online_group(struct task_group *tg,

			       struct task_group *parent);

extern void sched_destroy_group(struct task_group *tg);

extern void sched_offline_group(struct task_group *tg);

extern void sched_move_task(struct task_struct *tsk);

#ifdef CONFIG_FAIR_GROUP_SCHED

extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);

extern unsigned long sched_group_shares(struct task_group *tg);

#endif

#ifdef CONFIG_RT_GROUP_SCHED

extern int sched_group_set_rt_runtime(struct task_group *tg,

				      long rt_runtime_us);

extern long sched_group_rt_runtime(struct task_group *tg);

extern int sched_group_set_rt_period(struct task_group *tg,

				      long rt_period_us);

extern long sched_group_rt_period(struct task_group *tg);

extern int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk);

#endif

#endif /* CONFIG_CGROUP_SCHED */



extern int task_can_switch_user(struct user_struct *up,

kernel/sched/core.c

+5 −5
Original line number Diff line number Diff line
@@ -7455,7 +7455,7 @@ unlock: 
	return err;

}



int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)

static int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us)

{

	u64 rt_runtime, rt_period;
@@ -7467,7 +7467,7 @@ int sched_group_set_rt_runtime(struct task_group *tg, long rt_runtime_us) 
	return tg_set_rt_bandwidth(tg, rt_period, rt_runtime);

}



long sched_group_rt_runtime(struct task_group *tg)

static long sched_group_rt_runtime(struct task_group *tg)

{

	u64 rt_runtime_us;
@@ -7479,7 +7479,7 @@ long sched_group_rt_runtime(struct task_group *tg) 
	return rt_runtime_us;

}



int sched_group_set_rt_period(struct task_group *tg, long rt_period_us)

static int sched_group_set_rt_period(struct task_group *tg, long rt_period_us)

{

	u64 rt_runtime, rt_period;
@@ -7492,7 +7492,7 @@ int sched_group_set_rt_period(struct task_group *tg, long rt_period_us) 
	return tg_set_rt_bandwidth(tg, rt_period, rt_runtime);

}



long sched_group_rt_period(struct task_group *tg)

static long sched_group_rt_period(struct task_group *tg)

{

	u64 rt_period_us;
@@ -7527,7 +7527,7 @@ static int sched_rt_global_constraints(void) 
	return ret;

}



int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)

static int sched_rt_can_attach(struct task_group *tg, struct task_struct *tsk)

{

	/* Don't accept realtime tasks when there is no way for them to run */

	if (rt_task(tsk) && tg->rt_bandwidth.rt_runtime == 0)

kernel/sched/sched.h

+12 −0
Original line number Diff line number Diff line
@@ -221,6 +221,18 @@ extern void init_tg_rt_entry(struct task_group *tg, struct rt_rq *rt_rq, 
		struct sched_rt_entity *rt_se, int cpu,

		struct sched_rt_entity *parent);



extern struct task_group *sched_create_group(struct task_group *parent);

extern void sched_online_group(struct task_group *tg,

			       struct task_group *parent);

extern void sched_destroy_group(struct task_group *tg);

extern void sched_offline_group(struct task_group *tg);



extern void sched_move_task(struct task_struct *tsk);



#ifdef CONFIG_FAIR_GROUP_SCHED

extern int sched_group_set_shares(struct task_group *tg, unsigned long shares);

#endif



#else /* CONFIG_CGROUP_SCHED */



struct cfs_bandwidth { };