The patch titled
mm-speculative-page-references-hugh-fix3
has been removed from the -mm tree. Its filename was
mm-speculative-page-references-hugh-fix3.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-hugh-fix3
From: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Fix the VM_BUG_ON assertion check to actually do what I want, noted by
Christoph.
Also, fix an error-path-leak type issue with frozen refcount not being
unfrozen. Found by review. In practice, this check is very rare to
hit because a page dirtier is likely to hold the refcount elevated for
much longer than it takes to check and non-racy-recheck. So it doesn't
pose a big problem for users of -mm, but of course needs fixing.
Cc: Christoph Lameter <cl@xxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/pagemap.h | 2 +-
mm/vmscan.c | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff -puN include/linux/pagemap.h~mm-speculative-page-references-hugh-fix3 include/linux/pagemap.h
--- a/include/linux/pagemap.h~mm-speculative-page-references-hugh-fix3
+++ a/include/linux/pagemap.h
@@ -138,7 +138,7 @@ static inline int page_cache_get_specula
return 0;
}
#endif
- VM_BUG_ON(PageCompound(page) && (struct page *)page_private(page) != page);
+ VM_BUG_ON(PageTail(page));
return 1;
}
diff -puN mm/vmscan.c~mm-speculative-page-references-hugh-fix3 mm/vmscan.c
--- a/mm/vmscan.c~mm-speculative-page-references-hugh-fix3
+++ a/mm/vmscan.c
@@ -428,8 +428,10 @@ static int __remove_mapping(struct addre
if (!page_freeze_refs(page, 2))
goto cannot_free;
/* note: atomic_cmpxchg in page_freeze_refs provides the smp_rmb */
- if (unlikely(PageDirty(page)))
+ if (unlikely(PageDirty(page))) {
+ page_unfreeze_refs(page, 2);
goto cannot_free;
+ }
if (PageSwapCache(page)) {
swp_entry_t swap = { .val = page_private(page) };
_
Patches currently in -mm which might be from nickpiggin@xxxxxxxxxxxx are
origin.patch
mm-speculative-page-references.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
