mm-rmap-fail-try_to_migrate-early-when-setting-a-pmd-migration-entry-fails.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: fail try_to_migrate() early when setting a PMD migration entry fails
has been removed from the -mm tree. Its filename was
mm-rmap-fail-try_to_migrate-early-when-setting-a-pmd-migration-entry-fails.patch
This patch was dropped because it was merged into mm-stable
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/rmap: fail try_to_migrate() early when setting a PMD migration entry fails
Let's fail right away in case we cannot clear PG_anon_exclusive because the anon THP may be pinned. Right now, we continue trying to install migration entries and the caller of try_to_migrate() will realize that the page is still mapped and has to restore the migration entries. Let's just fail fast just like for PTE migration entries.
---
include/linux/swapops.h | 4 ++-- mm/huge_memory.c | 8 +++++--- mm/rmap.c | 6 +++++- 3 files changed, 12 insertions(+), 6 deletions(-)
include/linux/swapops.h renamed from include/linux/swapops.h~mm-rmap-fail-try_to_migrate-early-when-setting-a-pmd-migration-entry-fails +2 -2
@@ -299,7 +299,7 @@ static inline bool is_pfn_swap_entry(swpstruct page_vma_mapped_walk ;#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION -extern void set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw, +extern int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page); extern void remove_migration_pmd(struct page_vma_mapped_walk *pvmw,
@@ -332,7 +332,7 @@ static inline int is_pmd_migration_entry return !pmd_present(pmd) && is_migration_entry(pmd_to_swp_entry(pmd)); }#else -static inline void set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw, +static inline int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) {BUILD_BUG ();
mm/huge_memory.c renamed from mm/huge_memory.c~mm-rmap-fail-try_to_migrate-early-when-setting-a-pmd-migration-entry-fails +5 -3
@@ -3071,7 +3071,7 @@ late_initcall(split_huge_pages_debugfs);#endif #ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION -void set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw, +int set_pmd_migration_entry (struct page_vma_mapped_walk *pvmw,struct page *page) {struct vm_area_struct *vma = pvmw->vma;
@@ -3083,7 +3083,7 @@ void set_pmd_migration_entry(struct pagepmd_t pmdswp;if (!(pvmw->pmd && !pvmw->pte)) -return ; +return 0 ;flush_cache_range (vma, address, address +HPAGE_PMD_SIZE ); pmdval =pmdp_invalidate (vma, address, pvmw->pmd);
@@ -3091,7 +3091,7 @@ void set_pmd_migration_entry(struct page anon_exclusive =PageAnon (page) &&PageAnonExclusive (page);if (anon_exclusive &&page_try_share_anon_rmap (page)) {set_pmd_at (mm, address, pvmw->pmd, pmdval); -return ; +return -EBUSY ; }if (pmd_dirty (pmdval))
@@ -3109,6 +3109,8 @@ void set_pmd_migration_entry(struct pagepage_remove_rmap (page, vma, true);put_page (page);trace_set_migration_pmd (address,pmd_val (pmdswp)); + +return 0 ; }void remove_migration_pmd (struct page_vma_mapped_walk *pvmw,struct page *new)
mm/rmap.c renamed from mm/rmap.c~mm-rmap-fail-try_to_migrate-early-when-setting-a-pmd-migration-entry-fails +5 -1
@@ -1856,7 +1856,11 @@ static bool try_to_migrate_one(struct foVM_BUG_ON_FOLIO (folio_test_hugetlb (folio) || !folio_test_pmd_mappable (folio), folio); -set_pmd_migration_entry (&pvmw, subpage); +if (set_pmd_migration_entry (&pvmw, subpage)) { + ret = false; +page_vma_mapped_walk_done (&pvmw); +break ; + } continue; }#endif
_
Patches currently in -mm which might be from [email protected] are