mm-rmap-introduce-and-use-hugetlb_try_dup_anon_rmap.patch removed from -mm tree
The quilt patch titled
Subject: mm/rmap: introduce and use hugetlb_try_dup_anon_rmap()
has been removed from the -mm tree. Its filename was
mm-rmap-introduce-and-use-hugetlb_try_dup_anon_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_try_dup_anon_rmap()
Date: Wed, 20 Dec 2023 23:44:28 +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.
So let's introduce and use hugetlb_try_dup_anon_rmap() to make all hugetlb handling use dedicated hugetlb_* rmap functions.
Add sanity checks that we end up with the right folios in the right functions.
Note that is_device_private_page() does not apply to hugetlb.
---
include/linux/mm.h | 12 +++++++++--- include/linux/rmap.h | 18 ++++++++++++++++++ mm/hugetlb.c | 3 +-- 3 files changed, 28 insertions(+), 5 deletions(-)
include/linux/mm.h renamed from include/linux/mm.h~mm-rmap-introduce-and-use-hugetlb_try_dup_anon_rmap +9 -3
@@ -1964,15 +1964,21 @@ static inline bool page_maybe_dma_pinned* * The caller has to hold the PT lock and the vma->vm_mm->->write_protect_seq. */ -static inline bool page_needs_cow_for_dma (struct vm_area_struct *vma, -struct page *page) +static inline bool folio_needs_cow_for_dma (struct vm_area_struct *vma, +struct folio *folio) {VM_BUG_ON (!(raw_read_seqcount (&vma->vm_mm->write_protect_seq) &1 ));if (!test_bit (MMF_HAS_PINNED , &vma->vm_mm->flags))return false; -return page_maybe_dma_pinned (page); +return folio_maybe_dma_pinned (folio); +} + +static inline bool page_needs_cow_for_dma (struct vm_area_struct *vma, +struct page *page) +{ +return folio_needs_cow_for_dma (vma,page_folio (page)); }/**
include/linux/rmap.h renamed from include/linux/rmap.h~mm-rmap-introduce-and-use-hugetlb_try_dup_anon_rmap +18 -0
@@ -211,6 +211,22 @@ void hugetlb_add_anon_rmap(struct foliovoid hugetlb_add_new_anon_rmap (struct folio *,struct vm_area_struct *,unsigned long address); +/* See page_try_dup_anon_rmap() */ +static inline int hugetlb_try_dup_anon_rmap (struct folio *folio, +struct vm_area_struct *vma) +{ +VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio); +VM_WARN_ON_FOLIO (!folio_test_anon (folio), folio); + +if (PageAnonExclusive (&folio->page)) { +if (unlikely (folio_needs_cow_for_dma (vma, folio))) +return -EBUSY ; +ClearPageAnonExclusive (&folio->page); + } +atomic_inc (&folio->_entire_mapcount); +return 0 ; +} +static inline void hugetlb_add_file_rmap (struct folio *folio) {VM_WARN_ON_FOLIO (!folio_test_hugetlb (folio), folio);
@@ -228,6 +244,8 @@ static inline void hugetlb_remove_rmap(sstatic inline void __page_dup_rmap (struct page *page,bool compound) { +VM_WARN_ON (folio_test_hugetlb (page_folio (page))); +if (compound) {struct folio *folio = (struct folio *)page;
mm/hugetlb.c renamed from mm/hugetlb.c~mm-rmap-introduce-and-use-hugetlb_try_dup_anon_rmap +1 -2
@@ -5409,8 +5409,7 @@ again:*/ if (!folio_test_anon (pte_folio)) {hugetlb_add_file_rmap (pte_folio); - }else if (page_try_dup_anon_rmap (&pte_folio->page, - true, src_vma)) { + }else if (hugetlb_try_dup_anon_rmap (pte_folio, src_vma)) {pte_t src_pte_old = entry;struct folio *new_folio;
_
Patches currently in -mm which might be from [email protected] are