Commit fa427e8e authored by Qais Yousef's avatar Qais Yousef Committed by Ingo Molnar
Browse files

sched/topology: Remove root_domain::max_cpu_capacity 



The value is no longer used as we now keep track of max_allowed_capacity
for each task instead.

Signed-off-by: default avatarQais Yousef <qyousef@layalina.io>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Link: https://lore.kernel.org/r/20240324004552.999936-4-qyousef@layalina.io
parent 22d56074

kernel/sched/sched.h

+0 −2
Original line number Diff line number Diff line
@@ -917,8 +917,6 @@ struct root_domain { 
	cpumask_var_t		rto_mask;

	struct cpupri		cpupri;



	unsigned long		max_cpu_capacity;



	/*

	 * NULL-terminated list of performance domains intersecting with the

	 * CPUs of the rd. Protected by RCU.

kernel/sched/topology.c

+2 −11
Original line number Diff line number Diff line
@@ -2514,16 +2514,9 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att 
	/* Attach the domains */

	rcu_read_lock();

	for_each_cpu(i, cpu_map) {

		unsigned long capacity;



		rq = cpu_rq(i);

		sd = *per_cpu_ptr(d.sd, i);



		capacity = arch_scale_cpu_capacity(i);

		/* Use READ_ONCE()/WRITE_ONCE() to avoid load/store tearing: */

		if (capacity > READ_ONCE(d.rd->max_cpu_capacity))

			WRITE_ONCE(d.rd->max_cpu_capacity, capacity);



		cpu_attach_domain(sd, d.rd, i);



		if (lowest_flag_domain(i, SD_CLUSTER))
@@ -2537,10 +2530,8 @@ build_sched_domains(const struct cpumask *cpu_map, struct sched_domain_attr *att 
	if (has_cluster)

		static_branch_inc_cpuslocked(&sched_cluster_active);



	if (rq && sched_debug_verbose) {

		pr_info("root domain span: %*pbl (max cpu_capacity = %lu)\n",

			cpumask_pr_args(cpu_map), rq->rd->max_cpu_capacity);

	}

	if (rq && sched_debug_verbose)

		pr_info("root domain span: %*pbl\n", cpumask_pr_args(cpu_map));



	ret = 0;

error: