[PATCH v2] cgroup: don't destroy the default root

[PATCH v2] cgroup: don't destroy the default root

[Li Zefan]

The default root is allocated and initialized at boot phase, so we
shouldn't destroy the default root when it's umounted, otherwise
it will lead to disaster.

Just try mount and then umount the default root, and the kernel will
crash immediately.

v2:
- No need to check for CSS_NO_REF in cgroup_get/put(). (Tejun)
- Better call cgroup_put() for the default root in kill_sb(). (Tejun)
- Add a comment.

Signed-off-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>
---
 kernel/cgroup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index a5f75ac..3f46165 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1780,8 +1780,11 @@ static void cgroup_kill_sb(struct super_block *sb)
 	 * If @root doesn't have any mounts or children, start killing it.
 	 * This prevents new mounts by disabling percpu_ref_tryget_live().
 	 * cgroup_mount() may wait for @root's release.
+	 *
+	 * And don't kill the default root.
 	 */
-	if (css_has_online_children(&root->cgrp.self))
+	if (css_has_online_children(&root->cgrp.self) ||
+	    root == &cgrp_dfl_root)
 		cgroup_put(&root->cgrp);
 	else
 		percpu_ref_kill(&root->cgrp.self.refcnt);
-- 
1.8.0.2

[PATCH v2] cgroup: don't destroy the default root

[Li Zefan]

The default root is allocated and initialized at boot phase, so we
shouldn't destroy the default root when it's umounted, otherwise
it will lead to disaster.

Just try mount and then umount the default root, and the kernel will
crash immediately.

v2:
- No need to check for CSS_NO_REF in cgroup_get/put(). (Tejun)
- Better call cgroup_put() for the default root in kill_sb(). (Tejun)
- Add a comment.

Signed-off-by: Li Zefan <lizefan@huawei.com>
---
 kernel/cgroup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index a5f75ac..3f46165 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1780,8 +1780,11 @@ static void cgroup_kill_sb(struct super_block *sb)
 	 * If @root doesn't have any mounts or children, start killing it.
 	 * This prevents new mounts by disabling percpu_ref_tryget_live().
 	 * cgroup_mount() may wait for @root's release.
+	 *
+	 * And don't kill the default root.
 	 */
-	if (css_has_online_children(&root->cgrp.self))
+	if (css_has_online_children(&root->cgrp.self) ||
+	    root == &cgrp_dfl_root)
 		cgroup_put(&root->cgrp);
 	else
 		percpu_ref_kill(&root->cgrp.self.refcnt);
-- 
1.8.0.2

Re: [PATCH v2] cgroup: don't destroy the default root

[Tejun Heo]

On Wed, Jun 04, 2014 at 04:48:15PM +0800, Li Zefan wrote:
> The default root is allocated and initialized at boot phase, so we
> shouldn't destroy the default root when it's umounted, otherwise
> it will lead to disaster.
> 
> Just try mount and then umount the default root, and the kernel will
> crash immediately.
> 
> v2:
> - No need to check for CSS_NO_REF in cgroup_get/put(). (Tejun)
> - Better call cgroup_put() for the default root in kill_sb(). (Tejun)
> - Add a comment.
> 
> Signed-off-by: Li Zefan <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>

Applied to cgroup/for-3.16.

Thanks.

-- 
tejun

Re: [PATCH v2] cgroup: don't destroy the default root

[Tejun Heo]

On Wed, Jun 04, 2014 at 04:48:15PM +0800, Li Zefan wrote:
> The default root is allocated and initialized at boot phase, so we
> shouldn't destroy the default root when it's umounted, otherwise
> it will lead to disaster.
> 
> Just try mount and then umount the default root, and the kernel will
> crash immediately.
> 
> v2:
> - No need to check for CSS_NO_REF in cgroup_get/put(). (Tejun)
> - Better call cgroup_put() for the default root in kill_sb(). (Tejun)
> - Add a comment.
> 
> Signed-off-by: Li Zefan <lizefan@huawei.com>

Applied to cgroup/for-3.16.

Thanks.

-- 
tejun