The patch titled
thp: skip transhuge pages in ksm for now
has been removed from the -mm tree. Its filename was
thp-skip-transhuge-pages-in-ksm-for-now.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: thp: skip transhuge pages in ksm for now
From: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Skip transhuge pages in ksm for now.
Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx>
Reviewed-by: Rik van Riel <riel@xxxxxxxxxx>
Acked-by: Mel Gorman <mel@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/ksm.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff -puN mm/ksm.c~thp-skip-transhuge-pages-in-ksm-for-now mm/ksm.c
--- a/mm/ksm.c~thp-skip-transhuge-pages-in-ksm-for-now
+++ a/mm/ksm.c
@@ -430,7 +430,7 @@ static struct page *get_mergeable_page(s
page = follow_page(vma, addr, FOLL_GET);
if (IS_ERR_OR_NULL(page))
goto out;
- if (PageAnon(page)) {
+ if (PageAnon(page) && !PageTransCompound(page)) {
flush_anon_page(vma, page, addr);
flush_dcache_page(page);
} else {
@@ -1279,7 +1279,19 @@ next_mm:
if (ksm_test_exit(mm))
break;
*page = follow_page(vma, ksm_scan.address, FOLL_GET);
- if (!IS_ERR_OR_NULL(*page) && PageAnon(*page)) {
+ if (IS_ERR_OR_NULL(*page)) {
+ ksm_scan.address += PAGE_SIZE;
+ cond_resched();
+ continue;
+ }
+ if (PageTransCompound(*page)) {
+ put_page(*page);
+ ksm_scan.address &= HPAGE_PMD_MASK;
+ ksm_scan.address += HPAGE_PMD_SIZE;
+ cond_resched();
+ continue;
+ }
+ if (PageAnon(*page)) {
flush_anon_page(vma, *page, ksm_scan.address);
flush_dcache_page(*page);
rmap_item = get_next_rmap_item(slot,
@@ -1293,8 +1305,7 @@ next_mm:
up_read(&mm->mmap_sem);
return rmap_item;
}
- if (!IS_ERR_OR_NULL(*page))
- put_page(*page);
+ put_page(*page);
ksm_scan.address += PAGE_SIZE;
cond_resched();
}
_
Patches currently in -mm which might be from aarcange@xxxxxxxxxx are
origin.patch
thp-add-pagetranscompound.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
