sched/topology: Rename sched_group_mask()
Since sched_group_mask() is now an independent cpumask (it no longer masks sched_group_cpus()), rename the thing. Suggested-by: Lauro Ramos Venancio <lvenanci@redhat.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
af218122b1
commit
e5c14b1fb8
|
@ -7996,7 +7996,6 @@ static int active_load_balance_cpu_stop(void *data);
|
||||||
static int should_we_balance(struct lb_env *env)
|
static int should_we_balance(struct lb_env *env)
|
||||||
{
|
{
|
||||||
struct sched_group *sg = env->sd->groups;
|
struct sched_group *sg = env->sd->groups;
|
||||||
struct cpumask *sg_mask;
|
|
||||||
int cpu, balance_cpu = -1;
|
int cpu, balance_cpu = -1;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -8006,9 +8005,8 @@ static int should_we_balance(struct lb_env *env)
|
||||||
if (env->idle == CPU_NEWLY_IDLE)
|
if (env->idle == CPU_NEWLY_IDLE)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
sg_mask = sched_group_mask(sg);
|
|
||||||
/* Try to find first idle cpu */
|
/* Try to find first idle cpu */
|
||||||
for_each_cpu_and(cpu, sg_mask, env->cpus) {
|
for_each_cpu_and(cpu, group_balance_mask(sg), env->cpus) {
|
||||||
if (!idle_cpu(cpu))
|
if (!idle_cpu(cpu))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
|
@ -1027,7 +1027,7 @@ struct sched_group_capacity {
|
||||||
int id;
|
int id;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
unsigned long cpumask[0]; /* iteration mask */
|
unsigned long cpumask[0]; /* balance mask */
|
||||||
};
|
};
|
||||||
|
|
||||||
struct sched_group {
|
struct sched_group {
|
||||||
|
@ -1054,10 +1054,9 @@ static inline struct cpumask *sched_group_cpus(struct sched_group *sg)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* cpumask masking which cpus in the group are allowed to iterate up the domain
|
* See build_balance_mask().
|
||||||
* tree.
|
|
||||||
*/
|
*/
|
||||||
static inline struct cpumask *sched_group_mask(struct sched_group *sg)
|
static inline struct cpumask *group_balance_mask(struct sched_group *sg)
|
||||||
{
|
{
|
||||||
return to_cpumask(sg->sgc->cpumask);
|
return to_cpumask(sg->sgc->cpumask);
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,9 +86,9 @@ static int sched_domain_debug_one(struct sched_domain *sd, int cpu, int level,
|
||||||
cpumask_pr_args(sched_group_cpus(group)));
|
cpumask_pr_args(sched_group_cpus(group)));
|
||||||
|
|
||||||
if ((sd->flags & SD_OVERLAP) &&
|
if ((sd->flags & SD_OVERLAP) &&
|
||||||
!cpumask_equal(sched_group_mask(group), sched_group_cpus(group))) {
|
!cpumask_equal(group_balance_mask(group), sched_group_cpus(group))) {
|
||||||
printk(KERN_CONT " mask=%*pbl",
|
printk(KERN_CONT " mask=%*pbl",
|
||||||
cpumask_pr_args(sched_group_mask(group)));
|
cpumask_pr_args(group_balance_mask(group)));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (group->sgc->capacity != SCHED_CAPACITY_SCALE)
|
if (group->sgc->capacity != SCHED_CAPACITY_SCALE)
|
||||||
|
@ -497,16 +497,16 @@ enum s_alloc {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Return the canonical balance CPU for this group, this is the first CPU
|
* Return the canonical balance CPU for this group, this is the first CPU
|
||||||
* of this group that's also in the iteration mask.
|
* of this group that's also in the balance mask.
|
||||||
*
|
*
|
||||||
* The iteration mask are all those CPUs that could actually end up at this
|
* The balance mask are all those CPUs that could actually end up at this
|
||||||
* group. See build_group_mask().
|
* group. See build_balance_mask().
|
||||||
*
|
*
|
||||||
* Also see should_we_balance().
|
* Also see should_we_balance().
|
||||||
*/
|
*/
|
||||||
int group_balance_cpu(struct sched_group *sg)
|
int group_balance_cpu(struct sched_group *sg)
|
||||||
{
|
{
|
||||||
return cpumask_first(sched_group_mask(sg));
|
return cpumask_first(group_balance_mask(sg));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -563,7 +563,7 @@ int group_balance_cpu(struct sched_group *sg)
|
||||||
* groups include the CPUs of Node-0, while those CPUs would not in fact ever
|
* groups include the CPUs of Node-0, while those CPUs would not in fact ever
|
||||||
* end up at those groups (they would end up in group: 0-1,3).
|
* end up at those groups (they would end up in group: 0-1,3).
|
||||||
*
|
*
|
||||||
* To correct this we have to introduce the group iteration mask. This mask
|
* To correct this we have to introduce the group balance mask. This mask
|
||||||
* will contain those CPUs in the group that can reach this group given the
|
* will contain those CPUs in the group that can reach this group given the
|
||||||
* (child) domain tree.
|
* (child) domain tree.
|
||||||
*
|
*
|
||||||
|
@ -607,11 +607,8 @@ int group_balance_cpu(struct sched_group *sg)
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Build an iteration mask that can exclude certain CPUs from the upwards
|
* Build the balance mask; it contains only those CPUs that can arrive at this
|
||||||
* domain traversal.
|
* group and should be considered to continue balancing.
|
||||||
*
|
|
||||||
* Only CPUs that can arrive at this group should be considered to continue
|
|
||||||
* balancing.
|
|
||||||
*
|
*
|
||||||
* We do this during the group creation pass, therefore the group information
|
* We do this during the group creation pass, therefore the group information
|
||||||
* isn't complete yet, however since each group represents a (child) domain we
|
* isn't complete yet, however since each group represents a (child) domain we
|
||||||
|
@ -619,7 +616,7 @@ int group_balance_cpu(struct sched_group *sg)
|
||||||
* complete).
|
* complete).
|
||||||
*/
|
*/
|
||||||
static void
|
static void
|
||||||
build_group_mask(struct sched_domain *sd, struct sched_group *sg, struct cpumask *mask)
|
build_balance_mask(struct sched_domain *sd, struct sched_group *sg, struct cpumask *mask)
|
||||||
{
|
{
|
||||||
const struct cpumask *sg_span = sched_group_cpus(sg);
|
const struct cpumask *sg_span = sched_group_cpus(sg);
|
||||||
struct sd_data *sdd = sd->private;
|
struct sd_data *sdd = sd->private;
|
||||||
|
@ -684,14 +681,14 @@ static void init_overlap_sched_group(struct sched_domain *sd,
|
||||||
struct cpumask *sg_span;
|
struct cpumask *sg_span;
|
||||||
int cpu;
|
int cpu;
|
||||||
|
|
||||||
build_group_mask(sd, sg, mask);
|
build_balance_mask(sd, sg, mask);
|
||||||
cpu = cpumask_first_and(sched_group_cpus(sg), mask);
|
cpu = cpumask_first_and(sched_group_cpus(sg), mask);
|
||||||
|
|
||||||
sg->sgc = *per_cpu_ptr(sdd->sgc, cpu);
|
sg->sgc = *per_cpu_ptr(sdd->sgc, cpu);
|
||||||
if (atomic_inc_return(&sg->sgc->ref) == 1)
|
if (atomic_inc_return(&sg->sgc->ref) == 1)
|
||||||
cpumask_copy(sched_group_mask(sg), mask);
|
cpumask_copy(group_balance_mask(sg), mask);
|
||||||
else
|
else
|
||||||
WARN_ON_ONCE(!cpumask_equal(sched_group_mask(sg), mask));
|
WARN_ON_ONCE(!cpumask_equal(group_balance_mask(sg), mask));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize sgc->capacity such that even if we mess up the
|
* Initialize sgc->capacity such that even if we mess up the
|
||||||
|
@ -852,10 +849,10 @@ static struct sched_group *get_group(int cpu, struct sd_data *sdd)
|
||||||
|
|
||||||
if (child) {
|
if (child) {
|
||||||
cpumask_copy(sched_group_cpus(sg), sched_domain_span(child));
|
cpumask_copy(sched_group_cpus(sg), sched_domain_span(child));
|
||||||
cpumask_copy(sched_group_mask(sg), sched_group_cpus(sg));
|
cpumask_copy(group_balance_mask(sg), sched_group_cpus(sg));
|
||||||
} else {
|
} else {
|
||||||
cpumask_set_cpu(cpu, sched_group_cpus(sg));
|
cpumask_set_cpu(cpu, sched_group_cpus(sg));
|
||||||
cpumask_set_cpu(cpu, sched_group_mask(sg));
|
cpumask_set_cpu(cpu, group_balance_mask(sg));
|
||||||
}
|
}
|
||||||
|
|
||||||
sg->sgc->capacity = SCHED_CAPACITY_SCALE * cpumask_weight(sched_group_cpus(sg));
|
sg->sgc->capacity = SCHED_CAPACITY_SCALE * cpumask_weight(sched_group_cpus(sg));
|
||||||
|
|
Loading…
Reference in New Issue