Commit f1304ecb authored by Dietmar Eggemann's avatar Dietmar Eggemann Committed by Peter Zijlstra
Browse files

sched/deadline: Move bandwidth mgmt and reclaim functions into sched class source file 



Move the deadline bandwidth management (admission control) functions
__dl_add(), __dl_sub() and __dl_overflow() as well as the bandwidth
reclaim function __dl_update() from private task scheduler header file
to the deadline sched class source file.
The functions are only used internally so they don't have to be
exported.

Signed-off-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarJuri Lelli <juri.lelli@redhat.com>
Link: https://lore.kernel.org/r/20220302183433.333029-3-dietmar.eggemann@arm.com
parent eb77cf1c

kernel/sched/deadline.c

+44 −0
Original line number Diff line number Diff line
@@ -128,6 +128,21 @@ static inline bool dl_bw_visited(int cpu, u64 gen) 
	rd->visit_gen = gen;

	return false;

}



static inline

void __dl_update(struct dl_bw *dl_b, s64 bw)

{

	struct root_domain *rd = container_of(dl_b, struct root_domain, dl_bw);

	int i;



	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held(),

			 "sched RCU must be held");

	for_each_cpu_and(i, rd->span, cpu_active_mask) {

		struct rq *rq = cpu_rq(i);



		rq->dl.extra_bw += bw;

	}

}

#else

static inline struct dl_bw *dl_bw_of(int i)

{
@@ -148,8 +163,37 @@ static inline bool dl_bw_visited(int cpu, u64 gen) 
{

	return false;

}



static inline

void __dl_update(struct dl_bw *dl_b, s64 bw)

{

	struct dl_rq *dl = container_of(dl_b, struct dl_rq, dl_bw);



	dl->extra_bw += bw;

}

#endif



static inline

void __dl_sub(struct dl_bw *dl_b, u64 tsk_bw, int cpus)

{

	dl_b->total_bw -= tsk_bw;

	__dl_update(dl_b, (s32)tsk_bw / cpus);

}



static inline

void __dl_add(struct dl_bw *dl_b, u64 tsk_bw, int cpus)

{

	dl_b->total_bw += tsk_bw;

	__dl_update(dl_b, -((s32)tsk_bw / cpus));

}



static inline bool

__dl_overflow(struct dl_bw *dl_b, unsigned long cap, u64 old_bw, u64 new_bw)

{

	return dl_b->bw != -1 &&

	       cap_scale(dl_b->bw, cap) < dl_b->total_bw - old_bw + new_bw;

}



static inline

void __add_running_bw(u64 dl_bw, struct dl_rq *dl_rq)

{

kernel/sched/sched.h

+0 −49
Original line number Diff line number Diff line
@@ -301,29 +301,6 @@ struct dl_bw { 
	u64			total_bw;

};



static inline void __dl_update(struct dl_bw *dl_b, s64 bw);



static inline

void __dl_sub(struct dl_bw *dl_b, u64 tsk_bw, int cpus)

{

	dl_b->total_bw -= tsk_bw;

	__dl_update(dl_b, (s32)tsk_bw / cpus);

}



static inline

void __dl_add(struct dl_bw *dl_b, u64 tsk_bw, int cpus)

{

	dl_b->total_bw += tsk_bw;

	__dl_update(dl_b, -((s32)tsk_bw / cpus));

}



static inline bool __dl_overflow(struct dl_bw *dl_b, unsigned long cap,

				 u64 old_bw, u64 new_bw)

{

	return dl_b->bw != -1 &&

	       cap_scale(dl_b->bw, cap) < dl_b->total_bw - old_bw + new_bw;

}



/*

 * Verify the fitness of task @p to run on @cpu taking into account the

 * CPU original capacity and the runtime/deadline ratio of the task.
@@ -2748,32 +2725,6 @@ extern void nohz_run_idle_balance(int cpu); 
static inline void nohz_run_idle_balance(int cpu) { }

#endif



#ifdef CONFIG_SMP

static inline

void __dl_update(struct dl_bw *dl_b, s64 bw)

{

	struct root_domain *rd = container_of(dl_b, struct root_domain, dl_bw);

	int i;



	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held(),

			 "sched RCU must be held");

	for_each_cpu_and(i, rd->span, cpu_active_mask) {

		struct rq *rq = cpu_rq(i);



		rq->dl.extra_bw += bw;

	}

}

#else

static inline

void __dl_update(struct dl_bw *dl_b, s64 bw)

{

	struct dl_rq *dl = container_of(dl_b, struct dl_rq, dl_bw);



	dl->extra_bw += bw;

}

#endif





#ifdef CONFIG_IRQ_TIME_ACCOUNTING

struct irqtime {

	u64			total;