Commit c0e99a71 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup 

Pull cgroup fixes from Tejun Heo:
 "The cgroup iteration update two years ago and the recent cpuset
  restructuring introduced regressions in subset of cpuset
  configurations.  Three patches to fix them.

  All are marked for -stable"

* 'for-4.0-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cpuset: Fix cpuset sched_relax_domain_level
  cpuset: fix a warning when clearing configured masks in old hierarchy
  cpuset: initialize effective masks when clone_children is enabled
parents f930713b 283cb41f

kernel/cpuset.c

+4 −5
Original line number Diff line number Diff line
@@ -548,9 +548,6 @@ static void update_domain_attr_tree(struct sched_domain_attr *dattr, 


	rcu_read_lock();

	cpuset_for_each_descendant_pre(cp, pos_css, root_cs) {

		if (cp == root_cs)

			continue;



		/* skip the whole subtree if @cp doesn't have any CPU */

		if (cpumask_empty(cp->cpus_allowed)) {

			pos_css = css_rightmost_descendant(pos_css);
@@ -873,7 +870,7 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus) 
		 * If it becomes empty, inherit the effective mask of the

		 * parent, which is guaranteed to have some CPUs.

		 */

		if (cpumask_empty(new_cpus))

		if (cgroup_on_dfl(cp->css.cgroup) && cpumask_empty(new_cpus))

			cpumask_copy(new_cpus, parent->effective_cpus);



		/* Skip the whole subtree if the cpumask remains the same. */
@@ -1129,7 +1126,7 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems) 
		 * If it becomes empty, inherit the effective mask of the

		 * parent, which is guaranteed to have some MEMs.

		 */

		if (nodes_empty(*new_mems))

		if (cgroup_on_dfl(cp->css.cgroup) && nodes_empty(*new_mems))

			*new_mems = parent->effective_mems;



		/* Skip the whole subtree if the nodemask remains the same. */
@@ -1979,7 +1976,9 @@ static int cpuset_css_online(struct cgroup_subsys_state *css) 


	spin_lock_irq(&callback_lock);

	cs->mems_allowed = parent->mems_allowed;

	cs->effective_mems = parent->mems_allowed;

	cpumask_copy(cs->cpus_allowed, parent->cpus_allowed);

	cpumask_copy(cs->effective_cpus, parent->cpus_allowed);

	spin_unlock_irq(&callback_lock);

out_unlock:

	mutex_unlock(&cpuset_mutex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE