提交 d8423011 编写于 作者: M Michal Hocko 提交者: Tejun Heo

memcg: root_cgroup cannot reach mem_cgroup_move_parent

The root cgroup cannot be destroyed so we never hit it down the
mem_cgroup_pre_destroy path and mem_cgroup_force_empty_write shouldn't
even try to do anything if called for the root.

This means that mem_cgroup_move_parent doesn't have to bother with the
root cgroup and it can assume it can always move charges upwards.
Signed-off-by: NMichal Hocko <mhocko@suse.cz>
Reviewed-by: NTejun Heo <tj@kernel.org>
Reviewed-by: NGlauber Costa <glommer@parallels.com>
Signed-off-by: NTejun Heo <tj@kernel.org>
上级 c26251f9
...@@ -2715,9 +2715,7 @@ static int mem_cgroup_move_parent(struct page *page, ...@@ -2715,9 +2715,7 @@ static int mem_cgroup_move_parent(struct page *page,
unsigned long uninitialized_var(flags); unsigned long uninitialized_var(flags);
int ret; int ret;
/* Is ROOT ? */ VM_BUG_ON(mem_cgroup_is_root(child));
if (mem_cgroup_is_root(child))
return -EINVAL;
ret = -EBUSY; ret = -EBUSY;
if (!get_page_unless_zero(page)) if (!get_page_unless_zero(page))
...@@ -3823,6 +3821,8 @@ static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event) ...@@ -3823,6 +3821,8 @@ static int mem_cgroup_force_empty_write(struct cgroup *cont, unsigned int event)
struct mem_cgroup *memcg = mem_cgroup_from_cont(cont); struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);
int ret; int ret;
if (mem_cgroup_is_root(memcg))
return -EINVAL;
css_get(&memcg->css); css_get(&memcg->css);
ret = mem_cgroup_force_empty(memcg); ret = mem_cgroup_force_empty(memcg);
css_put(&memcg->css); css_put(&memcg->css);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册