diff options
Diffstat (limited to 'mm/memory-failure.c')
| -rw-r--r-- | mm/memory-failure.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index b4d627d..809823d 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1338,8 +1338,8 @@ static int soft_offline_huge_page(struct page *page, int flags) /* Keep page count to indicate a given hugepage is isolated. */ list_add(&hpage->lru, &pagelist); - ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0, - true); + ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, false, + MIGRATE_SYNC); if (ret) { struct page *page1, *page2; list_for_each_entry_safe(page1, page2, &pagelist, lru) @@ -1386,9 +1386,17 @@ int soft_offline_page(struct page *page, int flags) { int ret; unsigned long pfn = page_to_pfn(page); + struct page *hpage = compound_trans_head(page); if (PageHuge(page)) return soft_offline_huge_page(page, flags); + if (PageTransHuge(hpage)) { + if (PageAnon(hpage) && unlikely(split_huge_page(hpage))) { + pr_info("soft offline: %#lx: failed to split THP\n", + pfn); + return -EBUSY; + } + } ret = get_any_page(page, pfn, flags); if (ret < 0) @@ -1469,10 +1477,10 @@ int soft_offline_page(struct page *page, int flags) list_add(&page->lru, &pagelist); #ifndef CONFIG_DMA_CMA ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, - 0, true); + false, MIGRATE_SYNC); #else ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, - 0, true, 0); + false, MIGRATE_SYNC, 0); #endif if (ret) { putback_lru_pages(&pagelist); |