mm-rmap-introduce-and-use-hugetlb_add_file_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: introduce and use hugetlb_add_file_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-introduce-and-use-hugetlb_add_file_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_add_file_rmap()
Date: Wed, 20 Dec 2023 23:44:27 +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.
Right now we're using page_dup_file_rmap() in some cases where "ordinary" rmap code would have used page_add_file_rmap(). So let's introduce and use hugetlb_add_file_rmap() instead. We won't be adding a "hugetlb_dup_file_rmap()" functon for the fork() case, as it would be doing the same: "dup" is just an optimization for "add".
What remains is a single page_dup_file_rmap() call in fork() code.
Add sanity checks that we end up with the right folios in the right functions.
---
include/linux/rmap.h | 8 ++++++++ mm/hugetlb.c | 6 +++--- mm/migrate.c | 2 +- mm/rmap.c | 1 + 4 files changed, 13 insertions(+), 4 deletions(-)
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-introduce-and-use-hugetlb_add_file_rmap +8 -0
@@ -211,6 +211,14 @@ 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_add_file_rmap (struct folio *folio) +{ +VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio); +VM_WARN_ON_FOLIO (folio_test_anon (folio), folio); + +atomic_inc (&folio->_entire_mapcount); +} +static inline void hugetlb_remove_rmap (struct folio *folio) {VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio);
mm/hugetlb.c renamed from mm/hugetlb.c~mm-rmap-introduce-and-use-hugetlb_add_file_rmap +3 -3
@@ -5408,7 +5408,7 @@ again:* sleep during the process. */ if (!folio_test_anon (pte_folio)) { -page_dup_file_rmap (&pte_folio->page, true); +hugetlb_add_file_rmap (pte_folio); }else if (page_try_dup_anon_rmap (&pte_folio->page, true, src_vma)) {pte_t src_pte_old = entry;
@@ -6279,7 +6279,7 @@ static vm_fault_t hugetlb_no_page(structif (anon_rmap)hugetlb_add_new_anon_rmap (folio, vma, haddr);else -page_dup_file_rmap (&folio->page, true); +hugetlb_add_file_rmap (folio); new_pte =make_huge_pte (vma, &folio->page, ((vma->vm_flags &VM_WRITE ) && (vma->vm_flags &VM_SHARED )));/*
@@ -6730,7 +6730,7 @@ int hugetlb_mfill_atomic_pte(pte_t *dst_ goto out_release_unlock;if (folio_in_pagecache) -page_dup_file_rmap (&folio->page, true); +hugetlb_add_file_rmap (folio);else hugetlb_add_new_anon_rmap (folio, dst_vma, dst_addr);
mm/migrate.c renamed from mm/migrate.c~mm-rmap-introduce-and-use-hugetlb_add_file_rmap +1 -1
@@ -252,7 +252,7 @@ static bool remove_migration_pte(structhugetlb_add_anon_rmap (folio, vma, pvmw.address, rmap_flags); else -page_dup_file_rmap (new ,true ); +hugetlb_add_file_rmap (folio );set_huge_pte_at (vma->vm_mm, pvmw.address, pvmw.pte, pte, psize); }else
mm/rmap.c renamed from mm/rmap.c~mm-rmap-introduce-and-use-hugetlb_add_file_rmap +1 -0
@@ -1395,6 +1395,7 @@ void folio_add_file_rmap_range(struct founsigned int nr_pmdmapped =0 , first;int nr =0 ; +VM_WARN_ON_FOLIO (folio_test_hugetlb (folio), folio);VM_WARN_ON_FOLIO (compound && !folio_test_pmd_mappable (folio), folio);/* Is page being mapped by PTE? Is this its first map to be added? */
_
Patches currently in -mm which might be from [email protected] are