The patch titled
mm-speculative-page-references-fix-fix
has been removed from the -mm tree. Its filename was
mm-speculative-page-references-fix-fix.patch
This patch was dropped because it was folded into mm-speculative-page-references.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: mm-speculative-page-references-fix-fix
From: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
free_it obviously should be below the unlock_page.
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: "Paul E. McKenney" <paulmck@xxxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmscan.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff -puN mm/vmscan.c~mm-speculative-page-references-fix-fix mm/vmscan.c
--- a/mm/vmscan.c~mm-speculative-page-references-fix-fix
+++ a/mm/vmscan.c
@@ -391,7 +391,7 @@ static pageout_t pageout(struct page *pa
}
/*
- * Save as remove_mapping, but if the page is removed from the mapping, it
+ * Same as remove_mapping, but if the page is removed from the mapping, it
* gets returned with a refcount of 0.
*/
static int __remove_mapping(struct address_space *mapping, struct page *page)
@@ -619,6 +619,13 @@ static unsigned long shrink_page_list(st
if (put_page_testzero(page))
goto free_it;
else {
+ /*
+ * rare race with speculative reference.
+ * the speculative reference will free
+ * this page shortly, so we may
+ * increment nr_reclaimed here (and
+ * leave it off the LRU).
+ */
nr_reclaimed++;
continue;
}
@@ -628,8 +635,8 @@ static unsigned long shrink_page_list(st
if (!mapping || !__remove_mapping(mapping, page))
goto keep_locked;
-free_it:
unlock_page(page);
+free_it:
nr_reclaimed++;
if (!pagevec_add(&freed_pvec, page)) {
__pagevec_free(&freed_pvec);
_
Patches currently in -mm which might be from nickpiggin@xxxxxxxxxxxx are
origin.patch
mm-speculative-page-references.patch
mm-speculative-page-references-fix-fix.patch
mm-speculative-page-references-hugh-fix3.patch
mm-speculative-page-references-fix-migration_entry_wait-for-speculative-page-cache.patch
ramfs-and-ram-disk-pages-are-unevictable-undo-the-brdc-part.patch
mlock-mlocked-pages-are-unevictable-restore-patch-failure-hunk-of-mlock-mlocked-pages-are-unevictablepatch.patch
slb-drop-kmem-cache-argument-from-constructor.patch
slb-drop-kmem-cache-argument-from-constructor-fix.patch
slb-drop-kmem-cache-argument-from-constructor-fix-fix.patch
slb-drop-kmem-cache-argument-from-constructor-fix-fix-logfs.patch
slb-drop-kmem-cache-argument-from-constructor-ubifs.patch
powerpc-hugetlb-pgtable-cache-access-cleanup.patch
reiser4-tree_lock-fixes.patch
reiser4-tree_lock-fixes-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
