Commit d8ad3055 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

mm/memcg: iteration skip memcgs not yet fully initialized

It is surprising that the mem_cgroup iterator can return memcgs which
have not yet been fully initialized.  By accident (or trial and error?)
this appears not to present an actual problem; but it may be better to
prevent such surprises, by skipping memcgs not yet online.
Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Cc: Tejun Heo <tj@kernel.org>
Acked-by: default avatarMichal Hocko <mhocko@suse.cz>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: <stable@vger.kernel.org>	[3.12+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d2ab70aa
...@@ -1119,10 +1119,8 @@ static struct mem_cgroup *__mem_cgroup_iter_next(struct mem_cgroup *root, ...@@ -1119,10 +1119,8 @@ static struct mem_cgroup *__mem_cgroup_iter_next(struct mem_cgroup *root,
* protected by css_get and the tree walk is rcu safe. * protected by css_get and the tree walk is rcu safe.
*/ */
if (next_css) { if (next_css) {
struct mem_cgroup *mem = mem_cgroup_from_css(next_css); if ((next_css->flags & CSS_ONLINE) && css_tryget(next_css))
return mem_cgroup_from_css(next_css);
if (css_tryget(&mem->css))
return mem;
else { else {
prev_css = next_css; prev_css = next_css;
goto skip_node; goto skip_node;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment