Commit b4eccf5f authored by Thara Gopinath's avatar Thara Gopinath Committed by Ingo Molnar
Browse files

sched/fair: Enable periodic update of average thermal pressure 



Introduce support in scheduler periodic tick and other CFS bookkeeping
APIs to trigger the process of computing average thermal pressure for a
CPU. Also consider avg_thermal.load_avg in others_have_blocked which
allows for decay of pelt signals.

Signed-off-by: default avatarThara Gopinath <thara.gopinath@linaro.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lkml.kernel.org/r/20200222005213.3873-7-thara.gopinath@linaro.org
parent 8eab879c

kernel/sched/core.c

+3 −0
Original line number Diff line number Diff line
@@ -3586,6 +3586,7 @@ void scheduler_tick(void) 
	struct rq *rq = cpu_rq(cpu);

	struct task_struct *curr = rq->curr;

	struct rq_flags rf;

	unsigned long thermal_pressure;



	arch_scale_freq_tick();

	sched_clock_tick();
@@ -3593,6 +3594,8 @@ void scheduler_tick(void) 
	rq_lock(rq, &rf);



	update_rq_clock(rq);

	thermal_pressure = arch_scale_thermal_pressure(cpu_of(rq));

	update_thermal_load_avg(rq_clock_task(rq), rq, thermal_pressure);

	curr->sched_class->task_tick(rq, curr, 0);

	calc_global_load_tick(rq);

	psi_task_tick(rq);

kernel/sched/fair.c

+7 −0
Original line number Diff line number Diff line
@@ -7719,6 +7719,9 @@ static inline bool others_have_blocked(struct rq *rq) 
	if (READ_ONCE(rq->avg_dl.util_avg))

		return true;



	if (thermal_load_avg(rq))

		return true;



#ifdef CONFIG_HAVE_SCHED_AVG_IRQ

	if (READ_ONCE(rq->avg_irq.util_avg))

		return true;
@@ -7744,6 +7747,7 @@ static bool __update_blocked_others(struct rq *rq, bool *done) 
{

	const struct sched_class *curr_class;

	u64 now = rq_clock_pelt(rq);

	unsigned long thermal_pressure;

	bool decayed;



	/*
@@ -7752,8 +7756,11 @@ static bool __update_blocked_others(struct rq *rq, bool *done) 
	 */

	curr_class = rq->curr->sched_class;



	thermal_pressure = arch_scale_thermal_pressure(cpu_of(rq));



	decayed = update_rt_rq_load_avg(now, rq, curr_class == &rt_sched_class) |

		  update_dl_rq_load_avg(now, rq, curr_class == &dl_sched_class) |

		  update_thermal_load_avg(rq_clock_task(rq), rq, thermal_pressure) |

		  update_irq_load_avg(rq, 0);



	if (others_have_blocked(rq))

CRA Git | Maintained and supported by SUSTech CRA and CCSE