mm-memory-page_remove_rmap-folio_remove_rmap_pte.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory: page_remove_rmap() -> folio_remove_rmap_pte()
has been removed from the -mm tree. Its filename was
mm-memory-page_remove_rmap-folio_remove_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_remove_rmap() -> folio_remove_rmap_pte()
Date: Wed, 20 Dec 2023 23:44:52 +0100
Let's convert zap_pte_range() and closely-related tlb_flush_rmap_batch(). While at it, perform some more folio conversion in zap_pte_range().
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 | 23 +++++++++++++---------- mm/mmu_gather.c | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-page_remove_rmap-folio_remove_rmap_pte +13 -10
@@ -1434,6 +1434,7 @@ static unsigned long zap_pte_range(strucarch_enter_lazy_mmu_mode (); do { pte_t ptent = ptep_get(pte); + struct folio *folio; struct page *page; if (pte_none(ptent))
@@ -1459,21 +1460,22 @@ static unsigned long zap_pte_range(struccontinue ; } + folio =page_folio (page); delay_rmap =0 ; -if (!PageAnon (page)) { +if (!folio_test_anon (folio)) {if (pte_dirty (ptent)) { -set_page_dirty (page); +folio_set_dirty (folio);if (tlb_delay_rmap (tlb)) { delay_rmap =1 ; force_flush =1 ; } }if (pte_young (ptent) &&likely (vma_has_recency (vma))) -mark_page_accessed (page); +folio_mark_accessed (folio); } rss[mm_counter (page)]--;if (!delay_rmap) { -page_remove_rmap (page, vma, false); +folio_remove_rmap_pte (folio, page, vma);if (unlikely (page_mapcount (page) <0 ))print_bad_pte (vma, addr, ptent, page); }
@@ -1489,6 +1491,7 @@ static unsigned long zap_pte_range(strucif (is_device_private_entry (entry) ||is_device_exclusive_entry (entry)) { page =pfn_swap_entry_to_page (entry); + folio =page_folio (page);if (unlikely (!should_zap_page (details, page)))continue ;/*
@@ -1500,8 +1503,8 @@ static unsigned long zap_pte_range(strucWARN_ON_ONCE (!vma_is_anonymous (vma)); rss[mm_counter (page)]--;if (is_device_private_entry (entry)) -page_remove_rmap (page, vma, false); -put_page (page); +folio_remove_rmap_pte (folio, page, vma); +folio_put (folio); }else if (!non_swap_entry (entry)) {/* Genuine swap entry, hence a private anon page */ if (!should_zap_cows (details))
@@ -3220,10 +3223,10 @@ static vm_fault_t wp_page_copy(struct vm* threads. * * The critical issue is to order this -* page_remove_rmap with the ptp_clear_flush above. -* Those stores are ordered by (if nothing else,) +* folio_remove_rmap_pte() with the ptp_clear_flush +* above. Those stores are ordered by (if nothing else,) * the barrier present in the atomic_add_negative -* in page_remove_rmap. +* in folio_remove_rmap_pte(); * * Then the TLB flush in ptep_clear_flush ensures that * no process can access the old page before the
@@ -3232,7 +3235,7 @@ static vm_fault_t wp_page_copy(struct vm* mapcount is visible. So transitively, TLBs to * old page will be flushed before it can be reused. */ -page_remove_rmap (vmf->page, vma, false); +folio_remove_rmap_pte (old_folio, vmf->page, vma); }/* Free the old page.. */
mm/mmu_gather.c renamed from mm/mmu_gather.c~mm-memory-page_remove_rmap-folio_remove_rmap_pte +1 -1
@@ -55,7 +55,7 @@ static void tlb_flush_rmap_batch(structif (encoded_page_flags (enc)) {struct page *page =encoded_page_ptr (enc); -page_remove_rmap (page, vma, false); +folio_remove_rmap_pte (page_folio (page), page, vma); } } }
_
Patches currently in -mm which might be from [email protected] are