Commit d6326047 authored by Chen Ridong's avatar Chen Ridong Committed by Tejun Heo

cgroup/cpuset: remove child_ecpus_count

The child_ecpus_count variable was previously used to update
sibling cpumask when parent's effective_cpus is updated. However, it became
obsolete after commit e2ffe502 ("cgroup/cpuset: Add
cpuset.cpus.exclusive for v2"). It should be removed.

tj: Restored {} for style consistency.
Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
Acked-by: default avatarWaiman Long <longman@redhat.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 8400291e
...@@ -188,10 +188,8 @@ struct cpuset { ...@@ -188,10 +188,8 @@ struct cpuset {
/* /*
* Default hierarchy only: * Default hierarchy only:
* use_parent_ecpus - set if using parent's effective_cpus * use_parent_ecpus - set if using parent's effective_cpus
* child_ecpus_count - # of children with use_parent_ecpus set
*/ */
int use_parent_ecpus; int use_parent_ecpus;
int child_ecpus_count;
/* /*
* number of SCHED_DEADLINE tasks attached to this cpuset, so that we * number of SCHED_DEADLINE tasks attached to this cpuset, so that we
...@@ -1512,7 +1510,6 @@ static void reset_partition_data(struct cpuset *cs) ...@@ -1512,7 +1510,6 @@ static void reset_partition_data(struct cpuset *cs)
if (!cpumask_and(cs->effective_cpus, if (!cpumask_and(cs->effective_cpus,
parent->effective_cpus, cs->cpus_allowed)) { parent->effective_cpus, cs->cpus_allowed)) {
cs->use_parent_ecpus = true; cs->use_parent_ecpus = true;
parent->child_ecpus_count++;
cpumask_copy(cs->effective_cpus, parent->effective_cpus); cpumask_copy(cs->effective_cpus, parent->effective_cpus);
} }
} }
...@@ -1688,12 +1685,8 @@ static int remote_partition_enable(struct cpuset *cs, int new_prs, ...@@ -1688,12 +1685,8 @@ static int remote_partition_enable(struct cpuset *cs, int new_prs,
spin_lock_irq(&callback_lock); spin_lock_irq(&callback_lock);
isolcpus_updated = partition_xcpus_add(new_prs, NULL, tmp->new_cpus); isolcpus_updated = partition_xcpus_add(new_prs, NULL, tmp->new_cpus);
list_add(&cs->remote_sibling, &remote_children); list_add(&cs->remote_sibling, &remote_children);
if (cs->use_parent_ecpus) { if (cs->use_parent_ecpus)
struct cpuset *parent = parent_cs(cs);
cs->use_parent_ecpus = false; cs->use_parent_ecpus = false;
parent->child_ecpus_count--;
}
spin_unlock_irq(&callback_lock); spin_unlock_irq(&callback_lock);
update_unbound_workqueue_cpumask(isolcpus_updated); update_unbound_workqueue_cpumask(isolcpus_updated);
...@@ -2318,14 +2311,10 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp, ...@@ -2318,14 +2311,10 @@ static void update_cpumasks_hier(struct cpuset *cs, struct tmpmasks *tmp,
*/ */
if (is_in_v2_mode() && !remote && cpumask_empty(tmp->new_cpus)) { if (is_in_v2_mode() && !remote && cpumask_empty(tmp->new_cpus)) {
cpumask_copy(tmp->new_cpus, parent->effective_cpus); cpumask_copy(tmp->new_cpus, parent->effective_cpus);
if (!cp->use_parent_ecpus) { if (!cp->use_parent_ecpus)
cp->use_parent_ecpus = true; cp->use_parent_ecpus = true;
parent->child_ecpus_count++;
}
} else if (cp->use_parent_ecpus) { } else if (cp->use_parent_ecpus) {
cp->use_parent_ecpus = false; cp->use_parent_ecpus = false;
WARN_ON_ONCE(!parent->child_ecpus_count);
parent->child_ecpus_count--;
} }
if (remote) if (remote)
...@@ -4139,7 +4128,6 @@ static int cpuset_css_online(struct cgroup_subsys_state *css) ...@@ -4139,7 +4128,6 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
cpumask_copy(cs->effective_cpus, parent->effective_cpus); cpumask_copy(cs->effective_cpus, parent->effective_cpus);
cs->effective_mems = parent->effective_mems; cs->effective_mems = parent->effective_mems;
cs->use_parent_ecpus = true; cs->use_parent_ecpus = true;
parent->child_ecpus_count++;
} }
spin_unlock_irq(&callback_lock); spin_unlock_irq(&callback_lock);
...@@ -4205,12 +4193,8 @@ static void cpuset_css_offline(struct cgroup_subsys_state *css) ...@@ -4205,12 +4193,8 @@ static void cpuset_css_offline(struct cgroup_subsys_state *css)
is_sched_load_balance(cs)) is_sched_load_balance(cs))
update_flag(CS_SCHED_LOAD_BALANCE, cs, 0); update_flag(CS_SCHED_LOAD_BALANCE, cs, 0);
if (cs->use_parent_ecpus) { if (cs->use_parent_ecpus)
struct cpuset *parent = parent_cs(cs);
cs->use_parent_ecpus = false; cs->use_parent_ecpus = false;
parent->child_ecpus_count--;
}
cpuset_dec(); cpuset_dec();
clear_bit(CS_ONLINE, &cs->flags); clear_bit(CS_ONLINE, &cs->flags);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment