The patch titled
memcg: avoid overflow in memcg_hierarchical_free_pages()
has been removed from the -mm tree. Its filename was
memcg-add-dirty-limits-to-mem_cgroup-avoid-overflow-in-memcg_hierarchical_free_pages.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: memcg: avoid overflow in memcg_hierarchical_free_pages()
From: Greg Thelen <gthelen@xxxxxxxxxx>
Use page counts rather than byte counts to avoid overflowing
unsigned long local variables.
Signed-off-by: Greg Thelen <gthelen@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Dave Young <hidave.darkstar@xxxxxxxxx>
Cc: Andrea Righi <arighi@xxxxxxxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Daisuke Nishimura <nishimura@xxxxxxxxxxxxxxxxx>
Cc: Balbir Singh <balbir@xxxxxxxxxxxxxxxxxx>
Cc: Minchan Kim <minchan.kim@xxxxxxxxx>
Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff -puN mm/memcontrol.c~memcg-add-dirty-limits-to-mem_cgroup-avoid-overflow-in-memcg_hierarchical_free_pages mm/memcontrol.c
--- a/mm/memcontrol.c~memcg-add-dirty-limits-to-mem_cgroup-avoid-overflow-in-memcg_hierarchical_free_pages
+++ a/mm/memcontrol.c
@@ -1321,17 +1321,17 @@ memcg_hierarchical_free_pages(struct mem
{
unsigned long free, min_free;
- min_free = global_page_state(NR_FREE_PAGES) << PAGE_SHIFT;
+ min_free = global_page_state(NR_FREE_PAGES);
while (mem) {
- free = res_counter_read_u64(&mem->res, RES_LIMIT) -
- res_counter_read_u64(&mem->res, RES_USAGE);
+ free = (res_counter_read_u64(&mem->res, RES_LIMIT) -
+ res_counter_read_u64(&mem->res, RES_USAGE)) >>
+ PAGE_SHIFT;
min_free = min(min_free, free);
mem = parent_mem_cgroup(mem);
}
- /* Translate free memory in pages */
- return min_free >> PAGE_SHIFT;
+ return min_free;
}
/*
_
Patches currently in -mm which might be from gthelen@xxxxxxxxxx are
linux-next.patch
memcg-res_counter_read_u64-fix-potential-races-on-32-bit-machines.patch
memcg-break-out-event-counters-from-other-stats.patch
memcg-use-native-word-page-statistics-counters.patch
mm-memcontrolc-suppress-uninitializer-var-warning-with-older-gccs.patch
memcg-document-cgroup-dirty-memory-interfaces.patch
memcg-add-page_cgroup-flags-for-dirty-page-tracking.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
