Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b00c52da authored by Wenwei Tao's avatar Wenwei Tao Committed by Tejun Heo
Browse files

cgroup: remove redundant cleanup in css_create 



When create css failed, before call css_free_rcu_fn, we remove the css
id and exit the percpu_ref, but we will do these again in
css_free_work_fn, so they are redundant.  Especially the css id, that
would cause problem if we remove it twice, since it may be assigned to
another css after the first remove.

tj: This was broken by two commits updating the free path without
    synchronizing the creation failure path.  This can be easily
    triggered by trying to create more than 64k memory cgroups.

Signed-off-by: default avatarWenwei Tao <ww.tao0320@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Vladimir Davydov <vdavydov@parallels.com>
Fixes: 9a1049da ("percpu-refcount: require percpu_ref to be exited explicitly")
Fixes: 01e58659 ("cgroup: release css->id after css_free")
Cc: stable@vger.kernel.org # v3.17+
parent ea8ea737

kernel/cgroup.c

+1 −4
Original line number Diff line number Diff line
@@ -5150,7 +5150,7 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp, 


	err = cgroup_idr_alloc(&ss->css_idr, NULL, 2, 0, GFP_KERNEL);

	if (err < 0)

		goto err_free_percpu_ref;

		goto err_free_css;

	css->id = err;



	/* @css is ready to be brought online now, make it visible */
@@ -5174,9 +5174,6 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp, 


err_list_del:

	list_del_rcu(&css->sibling);

	cgroup_idr_remove(&ss->css_idr, css->id);

err_free_percpu_ref:

	percpu_ref_exit(&css->refcnt);

err_free_css:

	call_rcu(&css->rcu_head, css_free_rcu_fn);

	return ERR_PTR(err);