Skip to content

Commit 33278f7

Browse files
namhyungtorvalds
authored andcommitted
memcg: fix off-by-one when calculating swap cgroup map length
It allocated one more page than necessary if @max_pages was a multiple of SC_PER_PAGE. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> Acked-by: Balbir Singh <balbir@linux.vnet.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Cc: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 268433b commit 33278f7

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

mm/page_cgroup.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
475475
if (!do_swap_account)
476476
return 0;
477477

478-
length = ((max_pages/SC_PER_PAGE) + 1);
478+
length = DIV_ROUND_UP(max_pages, SC_PER_PAGE);
479479
array_size = length * sizeof(void *);
480480

481481
array = vmalloc(array_size);

0 commit comments

Comments
 (0)