mm-rmap-introduce-and-use-hugetlb_remove_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: introduce and use hugetlb_remove_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-introduce-and-use-hugetlb_remove_rmap.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: introduce and use hugetlb_remove_rmap()
Date: Wed, 20 Dec 2023 23:44:26 +0100
hugetlb rmap handling differs quite a lot from "ordinary" rmap code. For example, hugetlb currently only supports entire mappings, and treats any mapping as mapped using a single "logical PTE". Let's move it out of the way so we can overhaul our "ordinary" rmap. implementation/interface.
Let's introduce and use hugetlb_remove_rmap() and remove the hugetlb code from page_remove_rmap(). This effectively removes one check on the small-folio path as well.
Add sanity checks that we end up with the right folios in the right functions.
Note: all possible candidates that need care are page_remove_rmap() that
pass compound=true.
---
include/linux/rmap.h | 7 +++++++ mm/hugetlb.c | 4 ++-- mm/rmap.c | 18 +++++++++--------- 3 files changed, 18 insertions(+), 11 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-introduce-and-use-hugetlb_remove_rmap +7 -0
@@ -211,6 +211,13 @@ void hugetlb_add_anon_rmap(struct foliovoid hugetlb_add_new_anon_rmap (struct folio *,struct vm_area_struct *,unsigned long address); +static inline void hugetlb_remove_rmap (struct folio *folio) +{ +VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio); + +atomic_dec (&folio->_entire_mapcount); +} +static inline void __page_dup_rmap (struct page *page,bool compound) {if (compound) {
mm/hugetlb.c renamed from mm/hugetlb.c~mm-rmap-introduce-and-use-hugetlb_remove_rmap +2 -2
@@ -5676,7 +5676,7 @@ void __unmap_hugepage_range(struct mmu_gmake_pte_marker (PTE_MARKER_UFFD_WP ), sz);hugetlb_count_sub (pages_per_huge_page (h), mm); -page_remove_rmap (page, vma, true); +hugetlb_remove_rmap (page_folio (page));spin_unlock (ptl);tlb_remove_page_size (tlb, page,huge_page_size (h));
@@ -5987,7 +5987,7 @@ retry_avoidcopy:/* Break COW or unshare */ huge_ptep_clear_flush (vma, haddr, ptep); -page_remove_rmap (&old_folio->page, vma, true); +hugetlb_remove_rmap (old_folio);hugetlb_add_new_anon_rmap (new_folio, vma, haddr);if (huge_pte_uffd_wp (pte)) newpte =huge_pte_mkuffd_wp (newpte);
mm/rmap.c renamed from mm/rmap.c~mm-rmap-introduce-and-use-hugetlb_remove_rmap +9 -9
@@ -1480,15 +1480,9 @@ void page_remove_rmap(struct page *page,bool last;enum node_stat_item idx; +VM_WARN_ON_FOLIO (folio_test_hugetlb (folio), folio);VM_BUG_ON_PAGE (compound && !PageHead (page), page); -/* Hugetlb pages are not counted in NR_*MAPPED */ -if (unlikely (folio_test_hugetlb (folio))) { -/* hugetlb pages are always mapped with pmds */ -atomic_dec (&folio->_entire_mapcount); -return ; - } -/* Is page being unmapped by PTE? Is this its last map to be removed? */ if (likely (!compound)) { last =atomic_add_negative (-1 , &page->_mapcount);
@@ -1846,7 +1840,10 @@ static bool try_to_unmap_one(struct folidec_mm_counter (mm,mm_counter_file (&folio->page)); } discard: -page_remove_rmap (subpage, vma,folio_test_hugetlb (folio)); +if (unlikely (folio_test_hugetlb (folio))) +hugetlb_remove_rmap (folio); +else +page_remove_rmap (subpage, vma, false);if (vma->vm_flags &VM_LOCKED )mlock_drain_local ();folio_put (folio);
@@ -2199,7 +2196,10 @@ static bool try_to_migrate_one(struct fo*/ } -page_remove_rmap (subpage, vma,folio_test_hugetlb (folio)); +if (unlikely (folio_test_hugetlb (folio))) +hugetlb_remove_rmap (folio); +else +page_remove_rmap (subpage, vma, false);if (vma->vm_flags &VM_LOCKED )mlock_drain_local ();folio_put (folio);
_
Patches currently in -mm which might be from [email protected] are