The patch titled Subject: mm: add cond_resched() to generic_swapfile_activate() has been added to the -mm tree. Its filename is mm-add-cond_resched-to-generic_swapfile_activate.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-add-cond_resched-to-generic_swapfile_activate.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-add-cond_resched-to-generic_swapfile_activate.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Mikulas Patocka <mpatocka@xxxxxxxxxx> Subject: mm: add cond_resched() to generic_swapfile_activate() generic_swapfile_activate() can take quite long time, it iterates over all blocks of a file, so add cond_resched to it. I observed about 1 second stalls when activating a swapfile that was almost unfragmented - this patch fixes it. Link: http://lkml.kernel.org/r/alpine.LRH.2.02.1607221710580.4818@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx Signed-off-by: Mikulas Patocka <mpatocka@xxxxxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxxxxx> Cc: Alexander Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/page_io.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN mm/page_io.c~mm-add-cond_resched-to-generic_swapfile_activate mm/page_io.c --- a/mm/page_io.c~mm-add-cond_resched-to-generic_swapfile_activate +++ a/mm/page_io.c @@ -166,6 +166,8 @@ int generic_swapfile_activate(struct swa unsigned block_in_page; sector_t first_block; + cond_resched(); + first_block = bmap(inode, probe_block); if (first_block == 0) goto bad_bmap; _ Patches currently in -mm which might be from mpatocka@xxxxxxxxxx are mm-add-cond_resched-to-generic_swapfile_activate.patch mm-optimize-copy_page_to-from_iter_iovec.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html