The patch titled comment adding to mlocking in try_to_unmap_one has been added to the -mm tree. Its filename is mm-mlocking-in-try_to_unmap_one-fix.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 *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: comment adding to mlocking in try_to_unmap_one From: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Current code doesn't tell us why we don't bother to nonlinear kindly. This patch added small adding explanation. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx> Cc: Andrea Arcangeli <aarcange@xxxxxxxxxx> Acked-by: Hugh Dickins <hugh.dickins@xxxxxxxxxxxxx> Cc: Izik Eidus <ieidus@xxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Lee Schermerhorn <Lee.Schermerhorn@xxxxxx> Cc: Minchan Kim <minchan.kim@xxxxxxxxx> Cc: Nick Piggin <npiggin@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Wu Fengguang <fengguang.wu@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/rmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff -puN mm/mlock.c~mm-mlocking-in-try_to_unmap_one-fix mm/mlock.c diff -puN mm/rmap.c~mm-mlocking-in-try_to_unmap_one-fix mm/rmap.c --- a/mm/rmap.c~mm-mlocking-in-try_to_unmap_one-fix +++ a/mm/rmap.c @@ -1065,7 +1065,11 @@ static int try_to_unmap_file(struct page if (list_empty(&mapping->i_mmap_nonlinear)) goto out; - /* We don't bother to try to find the munlocked page in nonlinears */ + /* + * We don't bother to try to find the munlocked page in nonlinears. + * It's costly. Instead, later, page reclaim logic may call + * try_to_unmap(TTU_MUNLOCK) and recover PG_mlocked lazily. + */ if (MLOCK_PAGES && TTU_ACTION(flags) == TTU_MUNLOCK) goto out; _ Patches currently in -mm which might be from kosaki.motohiro@xxxxxxxxxxxxxx are mm-allow-memory-hotplug-and-hibernation-in-the-same-kernel.patch linux-next.patch oom-dump-stack-and-vm-state-when-oom-killer-panics.patch readahead-add-blk_run_backing_dev.patch mmap-dont-return-enomem-when-mapcount-is-temporarily-exceeded-in-munmap.patch mmap-dont-return-enomem-when-mapcount-is-temporarily-exceeded-in-munmap-checkpatch-fixes.patch mm-vsmcan-check-shrink_active_list-sc-isolate_pages-return-value.patch mm-move-inc_zone_page_statenr_isolated-to-just-isolated-place.patch rmap-simplify-try_to_unmap_file.patch oom_kill-use-rss-value-instead-of-vm-size-for-badness.patch oom-kill-show-virtual-size-and-rss-information-of-the-killed-process.patch oom-kill-show-virtual-size-and-rss-information-of-the-killed-process-fix.patch oom-kill-fix-numa-consraint-check-with-nodemask-v42.patch oom-kill-fix-numa-consraint-check-with-nodemask-v42-checkpatch-fixes.patch page-allocator-wait-on-both-sync-and-async-congestion-after-direct-reclaim.patch vmscan-have-kswapd-sleep-for-a-short-interval-and-double-check-it-should-be-asleep.patch vmscan-stop-kswapd-waiting-on-congestion-when-the-min-watermark-is-not-being-met-v2.patch mm-define-page_mapping_flags.patch mm-mlocking-in-try_to_unmap_one.patch mm-config_mmu-for-pg_mlocked.patch mm-pass-address-down-to-rmap-ones.patch mm-stop-ptlock-enlarging-struct-page.patch mm-sigbus-instead-of-abusing-oom.patch mm-add-numa-node-symlink-for-memory-section-in-sysfs.patch mm-refactor-register_cpu_under_node.patch mm-refactor-unregister_cpu_under_node.patch mm-add-numa-node-symlink-for-cpu-devices-in-sysfs.patch documentation-abi-sys-devices-system-cpu-cpu-node.patch vmscan-separate-scswap_cluster_max-and-scnr_max_reclaim.patch vmscan-kill-hibernation-specific-reclaim-logic-and-unify-it.patch vmscan-zone_reclaim-dont-use-insane-swap_cluster_max.patch vmscan-kill-scswap_cluster_max.patch vmscan-make-consistent-of-reclaim-bale-out-between-do_try_to_free_page-and-shrink_zone.patch mm-memory_hotplug-make-offline_pages-static.patch lib-introduce-strim.patch fs-symlink-write_begin-allocation-context-fix-reiser4-fix.patch mm-mlocking-in-try_to_unmap_one-fix.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