Commit c22645f4 authored by Mathieu Poirier's avatar Mathieu Poirier Committed by Ingo Molnar
Browse files

sched/topology: Add partition_sched_domains_locked() 



Introduce the partition_sched_domains_locked() function by taking
the mutex locking code out of the original function.  That way
the work done by partition_sched_domains_locked() can be reused
without dropping the mutex lock.

No change of functionality is introduced by this patch.

Tested-by: default avatarDietmar Eggemann <dietmar.eggemann@arm.com>
Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bristot@redhat.com
Cc: claudio@evidence.eu.com
Cc: lizefan@huawei.com
Cc: longman@redhat.com
Cc: luca.abeni@santannapisa.it
Cc: rostedt@goodmis.org
Cc: tommaso.cucinotta@santannapisa.it
Link: https://lkml.kernel.org/r/20190719140000.31694-2-juri.lelli@redhat.com


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

include/linux/sched/topology.h

+10 −0
Original line number Diff line number Diff line
@@ -150,6 +150,10 @@ static inline struct cpumask *sched_domain_span(struct sched_domain *sd) 
	return to_cpumask(sd->span);

}



extern void partition_sched_domains_locked(int ndoms_new,

					   cpumask_var_t doms_new[],

					   struct sched_domain_attr *dattr_new);



extern void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],

				    struct sched_domain_attr *dattr_new);
@@ -194,6 +198,12 @@ extern void set_sched_topology(struct sched_domain_topology_level *tl); 


struct sched_domain_attr;



static inline void

partition_sched_domains_locked(int ndoms_new, cpumask_var_t doms_new[],

			       struct sched_domain_attr *dattr_new)

{

}



static inline void

partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],

			struct sched_domain_attr *dattr_new)

kernel/sched/topology.c

+13 −4
Original line number Diff line number Diff line
@@ -2169,16 +2169,16 @@ static int dattrs_equal(struct sched_domain_attr *cur, int idx_cur, 
 * ndoms_new == 0 is a special case for destroying existing domains,

 * and it will not create the default domain.

 *

 * Call with hotplug lock held

 * Call with hotplug lock and sched_domains_mutex held

 */

void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],

void partition_sched_domains_locked(int ndoms_new, cpumask_var_t doms_new[],

				    struct sched_domain_attr *dattr_new)

{

	bool __maybe_unused has_eas = false;

	int i, j, n;

	int new_topology;



	mutex_lock(&sched_domains_mutex);

	lockdep_assert_held(&sched_domains_mutex);



	/* Always unregister in case we don't destroy any domains: */

	unregister_sched_domain_sysctl();
@@ -2261,6 +2261,15 @@ match3: 
	ndoms_cur = ndoms_new;



	register_sched_domain_sysctl();

}



/*

 * Call with hotplug lock held

 */

void partition_sched_domains(int ndoms_new, cpumask_var_t doms_new[],

			     struct sched_domain_attr *dattr_new)

{

	mutex_lock(&sched_domains_mutex);

	partition_sched_domains_locked(ndoms_new, doms_new, dattr_new);

	mutex_unlock(&sched_domains_mutex);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE