The patch titled
memcg: try_get_mem_cgroup_from_swapcache fix
has been removed from the -mm tree. Its filename was
cgroups-use-css-id-in-swap-cgroup-for-saving-memory-v5-fix.patch
This patch was dropped because it was folded into cgroups-use-css-id-in-swap-cgroup-for-saving-memory-v5.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: try_get_mem_cgroup_from_swapcache fix
From: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
css_tryget can be called twice in !PageCgroupUsed case.
Signed-off-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Li Zefan <lizf@xxxxxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxx>
Cc: Paul Menage <menage@xxxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff -puN mm/memcontrol.c~cgroups-use-css-id-in-swap-cgroup-for-saving-memory-v5-fix mm/memcontrol.c
--- a/mm/memcontrol.c~cgroups-use-css-id-in-swap-cgroup-for-saving-memory-v5-fix
+++ a/mm/memcontrol.c
@@ -1027,9 +1027,11 @@ static struct mem_cgroup *try_get_mem_cg
/*
* Used bit of swapcache is solid under page lock.
*/
- if (PageCgroupUsed(pc))
+ if (PageCgroupUsed(pc)) {
mem = pc->mem_cgroup;
- else {
+ if (mem && !css_tryget(&mem->css))
+ mem = NULL;
+ } else {
ent.val = page_private(page);
id = lookup_swap_cgroup(ent);
rcu_read_lock();
@@ -1038,10 +1040,6 @@ static struct mem_cgroup *try_get_mem_cg
mem = NULL;
rcu_read_unlock();
}
- if (!mem)
- return NULL;
- if (!css_tryget(&mem->css))
- return NULL;
return mem;
}
_
Patches currently in -mm which might be from nishimura@xxxxxxxxxxxxxxxxx are
cgroup-css-id-support.patch
cgroup-fix-frequent-ebusy-at-rmdir.patch
memcg-use-css-id.patch
memcg-hierarchical-stat.patch
memcg-fix-shrinking-memory-to-return-ebusy-by-fixing-retry-algorithm.patch
memcg-fix-oom-killer-under-memcg.patch
memcg-show-memcg-information-during-oom.patch
memcg-charge-swapcache-to-proper-memcg.patch
cgroups-use-css-id-in-swap-cgroup-for-saving-memory-v5.patch
cgroups-use-css-id-in-swap-cgroup-for-saving-memory-v5-fix.patch
memcg-cleanup-cache_charge.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
