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

torvalds · torvalds · commit c976a67b0282 · 2015-01-26T15:17:34.000-08:00
Pull cgroup fix from Tejun Heo:
 "The lifetime rules of cgroup hierarchies always have been somewhat
  counter-intuitive and cgroup core tried to enforce that hierarchies
  w/o userland-visible usages must die in finite amount of time so that
  the controllers can be reused for other hierarchies; unfortunately,
  this can't be implemented reasonably for the memory controller - the
  kmemcg part doesn't have any way to forcefully drain the existing
  usages, leading to an interruptible hang if a following mount attempts
  to use the controller in any way.

  So, it seems like we're stuck with "hierarchies live on till they die
  whenever that may be" at least for now.  This pretty much confines
  attaching controllers to hierarchies to before the hierarchies are
  actively used by making dynamic configurations post active usages
  unreliable.  This has never been reliable and should be fine in
  practice given how cgroups are used.

  After the patch, hierarchies aren't killed if it isn't already
  drained.  A following mount attempt of the same mount options will
  reuse the existing hierarchy.  Mount attempts with differing options
  will fail w/ -EBUSY"

* 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
  cgroup: prevent mount hang due to memory controller lifetime
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
@@ -1909,7 +1909,7 @@ static void cgroup_kill_sb(struct super_block *sb)
 	 *
 	 * And don't kill the default root.
 	 */
-	if (css_has_online_children(&root->cgrp.self) ||
+	if (!list_empty(&root->cgrp.self.children) ||
 	    root == &cgrp_dfl_root)
 		cgroup_put(&root->cgrp);
 	else

Original file line number	Diff line number	Diff line change
`@@ -1909,7 +1909,7 @@ static void cgroup_kill_sb(struct super_block *sb)`
`1909`	`1909`	`*`
`1910`	`1910`	`* And don't kill the default root.`
`1911`	`1911`	`*/`
`1912`		`- if (css_has_online_children(&root->cgrp.self) \|\|`
	`1912`	`+ if (!list_empty(&root->cgrp.self.children) \|\|`
`1913`	`1913`	`root == &cgrp_dfl_root)`
`1914`	`1914`	`cgroup_put(&root->cgrp);`
`1915`	`1915`	`else`