Commit 31f6a8c0 authored by Ionela Voinescu's avatar Ionela Voinescu Committed by Peter Zijlstra
Browse files

sched/topology,schedutil: Wrap sched domains rebuild 



Add the rebuild_sched_domains_energy() function to wrap the functionality
that rebuilds the scheduling domains if any of the Energy Aware Scheduling
(EAS) initialisation conditions change. This functionality is used when
schedutil is added or removed or when EAS is enabled or disabled
through the sched_energy_aware sysctl.

Therefore, create a single function that is used in both these cases and
that can be later reused.

Signed-off-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarQuentin Perret <qperret@google.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lkml.kernel.org/r/20201027180713.7642-2-ionela.voinescu@arm.com
parent 480a6ca2

include/linux/sched/topology.h

+8 −0
Original line number Diff line number Diff line
@@ -225,6 +225,14 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) 


#endif	/* !CONFIG_SMP */



#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)

extern void rebuild_sched_domains_energy(void);

#else

static inline void rebuild_sched_domains_energy(void)

{

}

#endif



#ifndef arch_scale_cpu_capacity

/**

 * arch_scale_cpu_capacity - get the capacity scale factor of a given CPU.

kernel/sched/cpufreq_schedutil.c

+1 −8
Original line number Diff line number Diff line
@@ -899,16 +899,9 @@ struct cpufreq_governor *cpufreq_default_governor(void) 
cpufreq_governor_init(schedutil_gov);



#ifdef CONFIG_ENERGY_MODEL

extern bool sched_energy_update;

extern struct mutex sched_energy_mutex;



static void rebuild_sd_workfn(struct work_struct *work)

{

	mutex_lock(&sched_energy_mutex);

	sched_energy_update = true;

	rebuild_sched_domains();

	sched_energy_update = false;

	mutex_unlock(&sched_energy_mutex);

	rebuild_sched_domains_energy();

}

static DECLARE_WORK(rebuild_sd_work, rebuild_sd_workfn);

kernel/sched/topology.c

+11 −7
Original line number Diff line number Diff line
@@ -211,6 +211,15 @@ unsigned int sysctl_sched_energy_aware = 1; 
DEFINE_MUTEX(sched_energy_mutex);

bool sched_energy_update;



void rebuild_sched_domains_energy(void)

{

	mutex_lock(&sched_energy_mutex);

	sched_energy_update = true;

	rebuild_sched_domains();

	sched_energy_update = false;

	mutex_unlock(&sched_energy_mutex);

}



#ifdef CONFIG_PROC_SYSCTL

int sched_energy_aware_handler(struct ctl_table *table, int write,

		void *buffer, size_t *lenp, loff_t *ppos)
@@ -223,13 +232,8 @@ int sched_energy_aware_handler(struct ctl_table *table, int write, 
	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (!ret && write) {

		state = static_branch_unlikely(&sched_energy_present);

		if (state != sysctl_sched_energy_aware) {

			mutex_lock(&sched_energy_mutex);

			sched_energy_update = 1;

			rebuild_sched_domains();

			sched_energy_update = 0;

			mutex_unlock(&sched_energy_mutex);

		}

		if (state != sysctl_sched_energy_aware)

			rebuild_sched_domains_energy();

	}



	return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE