On Thu, Jun 01, 2017 at 12:56:35PM -0700, Yu Zhao wrote: > Saw need_resched() warnings when swapping on large swapfile (TBs) > because page allocation 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. > > Signed-off-by: Yu Zhao <yuzhao@xxxxxxxxxx> Acked-by: Vladimir Davydov <vdavydov.dev@xxxxxxxxx> > --- > mm/swap_cgroup.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/mm/swap_cgroup.c b/mm/swap_cgroup.c > index ac6318a064d3..3405b4ee1757 100644 > --- a/mm/swap_cgroup.c > +++ b/mm/swap_cgroup.c > @@ -48,6 +48,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: We should probably do the same on the error path. -- To unsubscribe from this list: send the line "unsubscribe cgroups" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
