mm-memory-page_add_anon_rmap-folio_add_anon_rmap_pte.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory: page_add_anon_rmap() -> folio_add_anon_rmap_pte()
has been removed from the -mm tree. Its filename was
mm-memory-page_add_anon_rmap-folio_add_anon_rmap_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: page_add_anon_rmap() -> folio_add_anon_rmap_pte()
Date: Wed, 20 Dec 2023 23:44:44 +0100
Let's convert restore_exclusive_pte() and do_swap_page(). While at it, perform some folio conversion in restore_exclusive_pte().
Signed-off-by David Hildenbrand <[email protected]>
Cc Hugh Dickins <[email protected]>
Cc Matthew Wilcox (Oracle) <[email protected]>
Cc Muchun Song <[email protected]>
Cc Muchun Song <[email protected]>
Cc Peter Xu <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Yin Fengwei <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memory.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-page_add_anon_rmap-folio_add_anon_rmap_pte +7 -4
@@ -710,6 +710,7 @@ static void restore_exclusive_pte(struct struct page *page, unsigned long address, pte_t *ptep) { + struct folio *folio = page_folio(page);pte_t orig_pte;pte_t pte;swp_entry_t entry;
@@ -725,14 +726,15 @@ static void restore_exclusive_pte(structelse if (is_writable_device_exclusive_entry (entry)) pte =maybe_mkwrite (pte_mkdirty (pte), vma); -VM_BUG_ON (pte_write (pte) && !(PageAnon (page) &&PageAnonExclusive (page))); +VM_BUG_ON_FOLIO (pte_write (pte) && (!folio_test_anon (folio) && +PageAnonExclusive (page)), folio);/* * No need to take a page reference as one was already * created when the swap entry was made. */ -if (PageAnon (page)) -page_add_anon_rmap (page, vma, address,RMAP_NONE ); +if (folio_test_anon (folio)) +folio_add_anon_rmap_pte (folio, page, vma, address,RMAP_NONE );else /* * Currently device exclusive access only supports anonymous
@@ -4076,7 +4078,8 @@ vm_fault_t do_swap_page(struct vm_faultfolio_add_new_anon_rmap (folio, vma, vmf->address);folio_add_lru_vma (folio, vma); }else { -page_add_anon_rmap (page, vma, vmf->address, rmap_flags); +folio_add_anon_rmap_pte (folio, page, vma, vmf->address, + rmap_flags); } VM_BUG_ON(!folio_test_anon(folio) ||
_
Patches currently in -mm which might be from [email protected] are