Commit f5f9739d authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Ingo Molnar
Browse files

sched: Put rq's sched_avg under CONFIG_FAIR_GROUP_SCHED 



The struct sched_avg of struct rq is only used in case group
scheduling is enabled inside __update_tg_runnable_avg() to update
per-cpu representation of a task group.  I.e. that there is no need to
maintain the runnable avg of a rq in the !CONFIG_FAIR_GROUP_SCHED case.

This patch guards struct sched_avg of struct rq and
update_rq_runnable_avg() with CONFIG_FAIR_GROUP_SCHED.

There is an extra empty definition for update_rq_runnable_avg()
necessary for the !CONFIG_FAIR_GROUP_SCHED && CONFIG_SMP case.

The function print_cfs_group_stats() which prints out struct sched_avg
of struct rq is already guarded with CONFIG_FAIR_GROUP_SCHED.

Reviewed-by: default avatarBen Segall <bsegall@google.com>
Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/530DCDC5.1060406@arm.com


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

kernel/sched/fair.c

+7 −6
Original line number Original line Diff line number Diff line
@@ -2374,12 +2374,19 @@ static inline void __update_group_entity_contrib(struct sched_entity *se) 
		se->avg.load_avg_contrib >>= NICE_0_SHIFT;

		se->avg.load_avg_contrib >>= NICE_0_SHIFT;

	}

	}

}

}



static inline void update_rq_runnable_avg(struct rq *rq, int runnable)

{

	__update_entity_runnable_avg(rq_clock_task(rq), &rq->avg, runnable);

	__update_tg_runnable_avg(&rq->avg, &rq->cfs);

}

#else /* CONFIG_FAIR_GROUP_SCHED */

#else /* CONFIG_FAIR_GROUP_SCHED */

static inline void __update_cfs_rq_tg_load_contrib(struct cfs_rq *cfs_rq,

static inline void __update_cfs_rq_tg_load_contrib(struct cfs_rq *cfs_rq,

						 int force_update) {}

						 int force_update) {}

static inline void __update_tg_runnable_avg(struct sched_avg *sa,

static inline void __update_tg_runnable_avg(struct sched_avg *sa,

						  struct cfs_rq *cfs_rq) {}

						  struct cfs_rq *cfs_rq) {}

static inline void __update_group_entity_contrib(struct sched_entity *se) {}

static inline void __update_group_entity_contrib(struct sched_entity *se) {}

static inline void update_rq_runnable_avg(struct rq *rq, int runnable) {}

#endif /* CONFIG_FAIR_GROUP_SCHED */

#endif /* CONFIG_FAIR_GROUP_SCHED */





static inline void __update_task_entity_contrib(struct sched_entity *se)

static inline void __update_task_entity_contrib(struct sched_entity *se)
@@ -2478,12 +2485,6 @@ static void update_cfs_rq_blocked_load(struct cfs_rq *cfs_rq, int force_update) 
	__update_cfs_rq_tg_load_contrib(cfs_rq, force_update);

	__update_cfs_rq_tg_load_contrib(cfs_rq, force_update);

}

}





static inline void update_rq_runnable_avg(struct rq *rq, int runnable)

{

	__update_entity_runnable_avg(rq_clock_task(rq), &rq->avg, runnable);

	__update_tg_runnable_avg(&rq->avg, &rq->cfs);

}



/* Add the load generated by se into cfs_rq's child load-average */

/* Add the load generated by se into cfs_rq's child load-average */

static inline void enqueue_entity_load_avg(struct cfs_rq *cfs_rq,

static inline void enqueue_entity_load_avg(struct cfs_rq *cfs_rq,

						  struct sched_entity *se,

						  struct sched_entity *se,

kernel/sched/sched.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -541,6 +541,8 @@ struct rq { 
#ifdef CONFIG_FAIR_GROUP_SCHED

#ifdef CONFIG_FAIR_GROUP_SCHED

	/* list of leaf cfs_rq on this cpu: */

	/* list of leaf cfs_rq on this cpu: */

	struct list_head leaf_cfs_rq_list;

	struct list_head leaf_cfs_rq_list;



	struct sched_avg avg;

#endif /* CONFIG_FAIR_GROUP_SCHED */

#endif /* CONFIG_FAIR_GROUP_SCHED */





	/*

	/*
@@ -630,8 +632,6 @@ struct rq { 
#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	struct llist_head wake_list;

	struct llist_head wake_list;

#endif

#endif



	struct sched_avg avg;

};

};





static inline int cpu_of(struct rq *rq)

static inline int cpu_of(struct rq *rq)

CRA Git | Maintained and supported by SUSTech CRA and CCSE