The patch titled unevictable lru: remember page's active state has been added to the -mm tree. Its filename is unevictable-lru-infrastructure-remember-pages-active-state.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://www.zip.com.au/~akpm/linux/patches/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: unevictable lru: remember page's active state From: Lee Schermerhorn <lee.schermerhorn@xxxxxx> Fix to unevictable-lru-infrastructure.patch Not sure this is absolutely required, but: Preserve page's incoming active flag across retries in putback_lru_page(). Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/vmscan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN mm/vmscan.c~unevictable-lru-infrastructure-remember-pages-active-state mm/vmscan.c --- a/mm/vmscan.c~unevictable-lru-infrastructure-remember-pages-active-state +++ a/mm/vmscan.c @@ -483,12 +483,12 @@ int remove_mapping(struct address_space void putback_lru_page(struct page *page) { int lru; + int active = !!TestClearPageActive(page); int was_unevictable = PageUnevictable(page); VM_BUG_ON(PageLRU(page)); redo: - lru = !!TestClearPageActive(page); ClearPageUnevictable(page); if (page_evictable(page, NULL)) { @@ -498,7 +498,7 @@ redo: * unevictable page on [in]active list. * We know how to handle that. */ - lru += page_is_file_cache(page); + lru = active + page_is_file_cache(page); lru_cache_add_lru(page, lru); } else { /* _ Patches currently in -mm which might be from lee.schermerhorn@xxxxxx are vmscan-use-an-indexed-array-for-lru-variables.patch define-page_file_cache-function.patch vmscan-split-lru-lists-into-anon-file-sets.patch pageflag-helpers-for-configed-out-flags.patch unevictable-lru-infrastructure.patch unevictable-lru-infrastructure-nommu-fix.patch unevictable-lru-infrastructure-remember-pages-active-state.patch unevictable-lru-page-statistics.patch ramfs-and-ram-disk-pages-are-unevictable.patch shm_locked-pages-are-unevictable.patch mlock-mlocked-pages-are-unevictable.patch doc-unevictable-lru-and-mlocked-pages-documentation.patch mlock-downgrade-mmap-sem-while-populating-mlocked-regions.patch mmap-handle-mlocked-pages-during-map-remap-unmap.patch vmstat-mlocked-pages-statistics.patch swap-cull-unevictable-pages-in-fault-path.patch vmstat-unevictable-and-mlocked-pages-vm-events.patch vmscan-unevictable-lru-scan-sysctl.patch mlock-count-attempts-to-free-mlocked-page.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