Revert "mm: don't do swap readahead during speculative page fault"

This reverts commit c41742ec7c.

Bug: 128240262
Change-Id: Ide6a3bb060fd1792c1ac5880cfc2298931ad07ed
Signed-off-by: Minchan Kim <minchan@google.com>
[dereference23: Forward port to msm-5.4]
Signed-off-by: Alexander Winkowski <dereference23@outlook.com>
This commit is contained in:
Minchan Kim 2019-03-11 11:54:50 +09:00 • committed by Alexander Winkowski
commit fb1f97dab8
No known key found for this signature in database
GPG key ID: 72762A66704CDE44

View file

@ -3156,17 +3156,6 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
lru_cache_add_anon(page);
swap_readpage(page, true);
}
} else if (vmf->flags & FAULT_FLAG_SPECULATIVE) {
/*
* Don't try readahead during a speculative page fault
* as the VMA's boundaries may change in our back.
* If the page is not in the swap cache and synchronous
* read is disabled, fall back to the regular page fault
* mechanism.
*/
delayacct_clear_flag(DELAYACCT_PF_SWAPIN);
ret = VM_FAULT_RETRY;
goto out;
} else {
page = swapin_readahead(entry, GFP_HIGHUSER_MOVABLE,
vmf);