Commit 34b2d2c4 authored by Yu Zhao's avatar Yu Zhao Committed by Ben Hutchings

swap: cond_resched in swap_cgroup_prepare()

commit ef707629 upstream.

I saw need_resched() warnings when swapping on large swapfile (TBs)
because continuously allocating many pages in swap_cgroup_prepare() took
too long.

We already cond_resched when freeing page in swap_cgroup_swapoff().  Do
the same for the page allocation.

Link: http://lkml.kernel.org/r/20170604200109.17606-1-yuzhao@google.comSigned-off-by: default avatarYu Zhao <yuzhao@google.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Acked-by: default avatarVladimir Davydov <vdavydov.dev@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 80f9b59c
...@@ -399,6 +399,9 @@ static int swap_cgroup_prepare(int type) ...@@ -399,6 +399,9 @@ static int swap_cgroup_prepare(int type)
if (!page) if (!page)
goto not_enough_page; goto not_enough_page;
ctrl->map[idx] = page; ctrl->map[idx] = page;
if (!(idx % SWAP_CLUSTER_MAX))
cond_resched();
} }
return 0; return 0;
not_enough_page: not_enough_page:
......
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