mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-31 18:09:19 +00:00
thp: skip transhuge pages in ksm for now
Skip transhuge pages in ksm for now. Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Reviewed-by: Rik van Riel <riel@redhat.com> Acked-by: Mel Gorman <mel@csn.ul.ie> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b15d00b6af
commit
21ae5b0175
1 changed files with 15 additions and 4 deletions
19
mm/ksm.c
19
mm/ksm.c
|
@ -430,7 +430,7 @@ static struct page *get_mergeable_page(struct rmap_item *rmap_item)
|
|||
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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue