Skip to content

Commit 6af9009

Browse files
Yu Zhaogregkh
authored andcommitted
swap: cond_resched in swap_cgroup_prepare()
commit ef70762948dde012146926720b70e79736336764 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.com Signed-off-by: Yu Zhao <yuzhao@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Vladimir Davydov <vdavydov.dev@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent bfbd244 commit 6af9009

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

mm/swap_cgroup.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ static int swap_cgroup_prepare(int type)
4848
if (!page)
4949
goto not_enough_page;
5050
ctrl->map[idx] = page;
51+
52+
if (!(idx % SWAP_CLUSTER_MAX))
53+
cond_resched();
5154
}
5255
return 0;
5356
not_enough_page:

0 commit comments

Comments
 (0)