The patch titled
memcg: fix memory.memsw.usage_in_bytes for root cgroup
has been added to the -mm tree. Its filename is
memcg-fix-memorymemswusage_in_bytes-for-root-cgroup.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: fix memory.memsw.usage_in_bytes for root cgroup
From: "Kirill A. Shutemov" <kirill@xxxxxxxxxxxxx>
We really want to take MEM_CGROUP_STAT_SWAPOUT into account.
Signed-off-by: Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
Reviewed-by: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 1 +
1 file changed, 1 insertion(+)
diff -puN mm/memcontrol.c~memcg-fix-memorymemswusage_in_bytes-for-root-cgroup mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-fix-memorymemswusage_in_bytes-for-root-cgroup
+++ a/mm/memcontrol.c
@@ -2544,6 +2544,7 @@ static u64 mem_cgroup_read(struct cgroup
val += idx_val;
mem_cgroup_get_recursive_idx_stat(mem,
MEM_CGROUP_STAT_SWAPOUT, &idx_val);
+ val += idx_val;
val <<= PAGE_SHIFT;
} else
val = res_counter_read_u64(&mem->memsw, name);
_
Patches currently in -mm which might be from kirill@xxxxxxxxxxxxx are
memcg-fix-memorymemswusage_in_bytes-for-root-cgroup.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
