mm-rmap-avoid-ebusy-from-make_device_exclusive.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: avoid -EBUSY from make_device_exclusive()
has been removed from the -mm tree. Its filename was
mm-rmap-avoid-ebusy-from-make_device_exclusive.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: David Hildenbrand <[email protected]>
Subject: mm/rmap: avoid -EBUSY from make_device_exclusive()
Date: Mon, 10 Feb 2025 20:37:59 +0100
Failing to obtain the folio lock, for example because the folio is concurrently getting migrated or swapped out, can easily make the callers
fail: for example, the hmm selftest can sometimes be observed to fail because of this. Instead of forcing the caller to retry, let's simply retry in this to-be-expected case.
Similarly, avoid spurious failures simply because we raced with someone (e.g., swapout) modifying the page table such that our folio_walk fails.
Simply unconditionally lock the folio, and retry GUP if our folio_walk fails. Note that the folio_walk repeatedly failing is not something we expect.
Note that we might want to avoid grabbing the folio lock at some point; for now, keep that as is and only unconditionally lock the folio.
With this change, the hmm selftests don't fail simply because the folio is already locked. While this fixes the selftests in some cases, it's likely not something that deserves a "Fixes:".
---
mm/rmap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
mm/rmap.c renamed from mm/rmap.c~mm-rmap-avoid-ebusy-from-make_device_exclusive +6 -3
@@ -2435,6 +2435,7 @@ struct page *make_device_exclusive(strucstruct page *page;swp_entry_t entry;pte_t swp_pte; +int ret;mmap_assert_locked (mm); addr =PAGE_ALIGN_DOWN (addr);
@@ -2448,6 +2449,7 @@ struct page *make_device_exclusive(struc* fault will trigger a conversion to an ordinary * (non-device-exclusive) PTE and issue a MMU_NOTIFY_EXCLUSIVE. */ +retry: page =get_user_page_vma_remote (mm, addr,FOLL_GET |FOLL_WRITE |FOLL_SPLIT_PMD , &vma);
@@ -2460,9 +2462,10 @@ struct page *make_device_exclusive(strucreturn ERR_PTR (-EOPNOTSUPP ); } -if (!folio_trylock (folio)) { + ret =folio_lock_killable (folio); +if (ret) {folio_put (folio); -return ERR_PTR (-EBUSY ); +return ERR_PTR (ret); }/*
@@ -2488,7 +2491,7 @@ struct page *make_device_exclusive(strucmmu_notifier_invalidate_range_end (&range);folio_unlock (folio);folio_put (folio); -return ERR_PTR (-EBUSY ); + goto retry; }/* Nuke the page table entry so we get the uptodate dirty bit. */
_
Patches currently in -mm which might be from [email protected] are
mm-factor-out-large-folio-handling-from-folio_order-into-folio_large_order.patch mm-factor-out-large-folio-handling-from-folio_nr_pages-into-folio_large_nr_pages.patch mm-let-_folio_nr_pages-overlay-memcg_data-in-first-tail-page.patch mm-let-_folio_nr_pages-overlay-memcg_data-in-first-tail-page-fix.patch mm-move-hugetlb-specific-things-in-folio-to-page.patch mm-move-_pincount-in-folio-to-page-on-32bit.patch mm-move-_entire_mapcount-in-folio-to-page-on-32bit.patch mm-rmap-pass-dst_vma-to-folio_dup_file_rmap_pte-and-friends.patch mm-rmap-pass-vma-to-__folio_add_rmap.patch mm-rmap-abstract-large-mapcount-operations-for-large-folios-hugetlb.patch bit_spinlock-__always_inline-unlock-functions.patch mm-rmap-use-folio_large_nr_pages-in-add-remove-functions.patch mm-rmap-basic-mm-owner-tracking-for-large-folios-hugetlb.patch mm-copy-on-write-cow-reuse-support-for-pte-mapped-thp.patch mm-convert-folio_likely_mapped_shared-to-folio_maybe_mapped_shared.patch mm-config_no_page_mapcount-to-prepare-for-not-maintain-per-page-mapcounts-in-large-folios.patch fs-proc-page-remove-per-page-mapcount-dependency-for-proc-kpagecount-config_no_page_mapcount.patch fs-proc-task_mmu-remove-per-page-mapcount-dependency-for-pm_mmap_exclusive-config_no_page_mapcount.patch fs-proc-task_mmu-remove-per-page-mapcount-dependency-for-mapmax-config_no_page_mapcount.patch fs-proc-task_mmu-remove-per-page-mapcount-dependency-for-smaps-smaps_rollup-config_no_page_mapcount.patch mm-stop-maintaining-the-per-page-mapcount-of-large-folios-config_no_page_mapcount.patch