Commit 6d48ff8b authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

memcg: css_put after remove_list

mem_cgroup_uncharge_page does css_put on the mem_cgroup before uncharging from
it, and before removing page_cgroup from one of its lru lists: isn't there a
danger that struct mem_cgroup memory could be freed and reused before
completing that, so corrupting something?  Never seen it, and for all I know
there may be other constraints which make it impossible; but let's be
defensive and reverse the ordering there.

mem_cgroup_force_empty_list is safe because there's an extra css_get around
all its works; but even so, change its ordering the same way round, to help
get in the habit of doing it like this.
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hirokazu Takahashi <taka@valinux.co.jp>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Cc: Paul Menage <menage@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b9c565d5
...@@ -665,15 +665,15 @@ void mem_cgroup_uncharge_page(struct page *page) ...@@ -665,15 +665,15 @@ void mem_cgroup_uncharge_page(struct page *page)
page_assign_page_cgroup(page, NULL); page_assign_page_cgroup(page, NULL);
unlock_page_cgroup(page); unlock_page_cgroup(page);
mem = pc->mem_cgroup;
css_put(&mem->css);
res_counter_uncharge(&mem->res, PAGE_SIZE);
mz = page_cgroup_zoneinfo(pc); mz = page_cgroup_zoneinfo(pc);
spin_lock_irqsave(&mz->lru_lock, flags); spin_lock_irqsave(&mz->lru_lock, flags);
__mem_cgroup_remove_list(pc); __mem_cgroup_remove_list(pc);
spin_unlock_irqrestore(&mz->lru_lock, flags); spin_unlock_irqrestore(&mz->lru_lock, flags);
mem = pc->mem_cgroup;
res_counter_uncharge(&mem->res, PAGE_SIZE);
css_put(&mem->css);
kfree(pc); kfree(pc);
return; return;
} }
...@@ -774,9 +774,9 @@ static void mem_cgroup_force_empty_list(struct mem_cgroup *mem, ...@@ -774,9 +774,9 @@ static void mem_cgroup_force_empty_list(struct mem_cgroup *mem,
if (page_get_page_cgroup(page) == pc) { if (page_get_page_cgroup(page) == pc) {
page_assign_page_cgroup(page, NULL); page_assign_page_cgroup(page, NULL);
unlock_page_cgroup(page); unlock_page_cgroup(page);
css_put(&mem->css);
res_counter_uncharge(&mem->res, PAGE_SIZE);
__mem_cgroup_remove_list(pc); __mem_cgroup_remove_list(pc);
res_counter_uncharge(&mem->res, PAGE_SIZE);
css_put(&mem->css);
kfree(pc); kfree(pc);
} else { } else {
/* racing uncharge: let page go then retry */ /* racing uncharge: let page go then retry */
......
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