diff options
| author | Yu Zhao <yuzhao@google.com> | 2017-06-17 00:02:31 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-09-15 20:30:54 +0300 |
| commit | 34b2d2c447529075db591c256e7af85d620af310 (patch) | |
| tree | 9dc1faad3ef98236f83ff18abd0f04e050c41b0b | |
| parent | 80f9b59cfb74661077b31a9853ffb62191d989d8 (diff) | |
| download | linux-34b2d2c447529075db591c256e7af85d620af310.tar.xz | |
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>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | mm/page_cgroup.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 6f4ef535c5af..c7a7e01fffc9 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -399,6 +399,9 @@ static int swap_cgroup_prepare(int type) if (!page) goto not_enough_page; ctrl->map[idx] = page; + + if (!(idx % SWAP_CLUSTER_MAX)) + cond_resched(); } return 0; not_enough_page: |