Commit 654a0dd0 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds

cgroup, memcg, writeback: drop spurious rcu locking around mem_cgroup_css_from_page()

In earlier versions, mem_cgroup_css_from_page() could return non-root
css on a legacy hierarchy which can go away and required rcu locking;
however, the eventual version simply returns the root cgroup if memcg is
on a legacy hierarchy and thus doesn't need rcu locking around or in it.
Remove spurious rcu lockings.
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reported-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6f8d2b8a
...@@ -677,9 +677,7 @@ void wbc_account_io(struct writeback_control *wbc, struct page *page, ...@@ -677,9 +677,7 @@ void wbc_account_io(struct writeback_control *wbc, struct page *page,
if (!wbc->wb) if (!wbc->wb)
return; return;
rcu_read_lock();
id = mem_cgroup_css_from_page(page)->id; id = mem_cgroup_css_from_page(page)->id;
rcu_read_unlock();
if (id == wbc->wb_id) { if (id == wbc->wb_id) {
wbc->wb_bytes += bytes; wbc->wb_bytes += bytes;
......
...@@ -382,14 +382,11 @@ struct cgroup_subsys_state *mem_cgroup_css_from_page(struct page *page) ...@@ -382,14 +382,11 @@ struct cgroup_subsys_state *mem_cgroup_css_from_page(struct page *page)
{ {
struct mem_cgroup *memcg; struct mem_cgroup *memcg;
rcu_read_lock();
memcg = page->mem_cgroup; memcg = page->mem_cgroup;
if (!memcg || !cgroup_subsys_on_dfl(memory_cgrp_subsys)) if (!memcg || !cgroup_subsys_on_dfl(memory_cgrp_subsys))
memcg = root_mem_cgroup; memcg = root_mem_cgroup;
rcu_read_unlock();
return &memcg->css; return &memcg->css;
} }
......
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