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

memcg: let css_get_next() rely upon rcu_read_lock()

Remove lock and unlock around css_get_next()'s call to idr_get_next().
memcg iterators (only users of css_get_next) already did rcu_read_lock(),
and its comment demands that; but add a WARN_ON_ONCE to make sure of it.
Signed-off-by: default avatarHugh Dickins <hughd@google.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 42aee6c4
...@@ -5033,6 +5033,8 @@ css_get_next(struct cgroup_subsys *ss, int id, ...@@ -5033,6 +5033,8 @@ css_get_next(struct cgroup_subsys *ss, int id,
return NULL; return NULL;
BUG_ON(!ss->use_id); BUG_ON(!ss->use_id);
WARN_ON_ONCE(!rcu_read_lock_held());
/* fill start point for scan */ /* fill start point for scan */
tmpid = id; tmpid = id;
while (1) { while (1) {
...@@ -5040,10 +5042,7 @@ css_get_next(struct cgroup_subsys *ss, int id, ...@@ -5040,10 +5042,7 @@ css_get_next(struct cgroup_subsys *ss, int id,
* scan next entry from bitmap(tree), tmpid is updated after * scan next entry from bitmap(tree), tmpid is updated after
* idr_get_next(). * idr_get_next().
*/ */
spin_lock(&ss->id_lock);
tmp = idr_get_next(&ss->idr, &tmpid); tmp = idr_get_next(&ss->idr, &tmpid);
spin_unlock(&ss->id_lock);
if (!tmp) if (!tmp)
break; break;
if (tmp->depth >= depth && tmp->stack[depth] == rootid) { if (tmp->depth >= depth && tmp->stack[depth] == rootid) {
......
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