mm-memory-pass-folio-and-pte-to-restore_exclusive_pte.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory: pass folio and pte to restore_exclusive_pte()
has been removed from the -mm tree. Its filename was
mm-memory-pass-folio-and-pte-to-restore_exclusive_pte.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/memory: pass folio and pte to restore_exclusive_pte()
Date: Wed, 26 Feb 2025 14:22:55 +0100
Let's pass the folio and the pte to restore_exclusive_pte(), so we can avoid repeated page_folio() and ptep_get(). To do that, pass the pte to try_restore_exclusive_pte() and use a folio in there already.
While at it, just avoid the "swp_entry_t entry" variable in try_restore_exclusive_pte() and add a folio-locked check to restore_exclusive_pte().
---
mm/memory.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-pass-folio-and-pte-to-restore_exclusive_pte +14 -15
@@ -717,14 +717,13 @@ struct folio *vm_normal_folio_pmd(struct#endif static void restore_exclusive_pte (struct vm_area_struct *vma, -struct page *page,unsigned long address, -pte_t *ptep) +struct folio *folio,struct page *page,unsigned long address, +pte_t *ptep,pte_t orig_pte) { -struct folio *folio =page_folio (page); -pte_t orig_pte;pte_t pte; - orig_pte =ptep_get (ptep); +VM_WARN_ON_FOLIO (!folio_test_locked (folio), folio); + pte =pte_mkold (mk_pte (page,READ_ONCE (vma->vm_page_prot)));if (pte_swp_soft_dirty (orig_pte)) pte =pte_mksoft_dirty (pte);
@@ -751,16 +750,15 @@ static void restore_exclusive_pte(struct* Tries to restore an exclusive pte if the page lock can be acquired without * sleeping. */ -static int -try_restore_exclusive_pte (pte_t *src_pte,struct vm_area_struct *vma, -unsigned long addr) +static int try_restore_exclusive_pte (struct vm_area_struct *vma, +unsigned long addr,pte_t *ptep,pte_t orig_pte) { -swp_entry_t entry =pte_to_swp_entry (ptep_get (src_pte)); -struct page *page =pfn_swap_entry_to_page (entry); +struct page *page =pfn_swap_entry_to_page (pte_to_swp_entry (orig_pte)); +struct folio *folio =page_folio (page); -if (trylock_page (page)) { -restore_exclusive_pte (vma, page, addr, src_pte); -unlock_page (page); +if (folio_trylock (folio)) { +restore_exclusive_pte (vma, folio, page, addr, ptep, orig_pte); +folio_unlock (folio);return 0 ; }
@@ -866,7 +864,7 @@ copy_nonpresent_pte(struct mm_struct *ds* (ie. COW) mappings. */ VM_BUG_ON (!is_cow_mapping (src_vma->vm_flags)); -if (try_restore_exclusive_pte (src_pte, src_vma, addr)) +if (try_restore_exclusive_pte (src_vma, addr, src_pte, orig_pte))return -EBUSY ;return -ENOENT ; }else if (is_pte_marker_entry (entry)) {
@@ -3987,7 +3985,8 @@ static vm_fault_t remove_device_exclusiv vmf->pte =pte_offset_map_lock (vma->vm_mm, vmf->pmd, vmf->address, &vmf->ptl);if (likely (vmf->pte &&pte_same (ptep_get (vmf->pte), vmf->orig_pte))) -restore_exclusive_pte (vma, vmf->page, vmf->address, vmf->pte); +restore_exclusive_pte (vma, folio, vmf->page, vmf->address, + vmf->pte, vmf->orig_pte);if (vmf->pte)pte_unmap_unlock (vmf->pte, vmf->ptl);
_
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