mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
mm, THP, swap: move anonymous THP split logic to vmscan
The add_to_swap aims to allocate swap_space(ie, swap slot and swapcache) so if it fails due to lack of space in case of THP or something(hdd swap but tries THP swapout) *caller* rather than add_to_swap itself should split the THP page and retry it with base page which is more natural. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Minchan Kim <[email protected]> Signed-off-by: "Huang, Ying" <[email protected]> Acked-by: Johannes Weiner <[email protected]> Cc: Andrea Arcangeli <[email protected]> Cc: Ebru Akagunduz <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Kirill A. Shutemov <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Shaohua Li <[email protected]> Cc: Tejun Heo <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
75f6d6d29a
commit
0f0746589e
3 changed files with 24 additions and 20 deletions
17
mm/vmscan.c
17
mm/vmscan.c
|
|
@ -1125,8 +1125,23 @@ static unsigned long shrink_page_list(struct list_head *page_list,
|
|||
!PageSwapCache(page)) {
|
||||
if (!(sc->gfp_mask & __GFP_IO))
|
||||
goto keep_locked;
|
||||
if (!add_to_swap(page, page_list))
|
||||
if (!add_to_swap(page)) {
|
||||
if (!PageTransHuge(page))
|
||||
goto activate_locked;
|
||||
/* Split THP and swap individual base pages */
|
||||
if (split_huge_page_to_list(page, page_list))
|
||||
goto activate_locked;
|
||||
if (!add_to_swap(page))
|
||||
goto activate_locked;
|
||||
}
|
||||
|
||||
/* XXX: We don't support THP writes */
|
||||
if (PageTransHuge(page) &&
|
||||
split_huge_page_to_list(page, page_list)) {
|
||||
delete_from_swap_cache(page);
|
||||
goto activate_locked;
|
||||
}
|
||||
|
||||
may_enter_fs = 1;
|
||||
|
||||
/* Adding to swap updated mapping */
|
||||
|
|
|
|||
Loading…
Reference in a new issue