mm-memory-page_add_file_rmap-folio_add_file_rmap_.patch removed from -mm tree
The quilt patch titled
Subject: mm/memory: page_add_file_rmap() -> folio_add_file_rmap_[pte|pmd]()
has been removed from the -mm tree. Its filename was
mm-memory-page_add_file_rmap-folio_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/memory: page_add_file_rmap() -> folio_add_file_rmap_[pte|pmd]()
Date: Wed, 20 Dec 2023 23:44:32 +0100
Let's convert insert_page_into_pte_locked() and do_set_pmd(). While at it, perform some folio conversion.
Signed-off-by David Hildenbrand <[email protected]>
Reviewed-by Yin Fengwei <[email protected]>
Reviewed-by Ryan Roberts <[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]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/memory.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
mm/memory.c renamed from mm/memory.c~mm-memory-page_add_file_rmap-folio_add_file_rmap_ +8 -6
@@ -1859,12 +1859,14 @@ static int validate_page_before_insert(sstatic int insert_page_into_pte_locked (struct vm_area_struct *vma,pte_t *pte,unsigned long addr,struct page *page,pgprot_t prot) { +struct folio *folio =page_folio (page); +if (!pte_none (ptep_get (pte)))return -EBUSY ;/* Ok, finally just insert the thing.. */ -get_page (page); +folio_get (folio);inc_mm_counter (vma->vm_mm,mm_counter_file (page)); -page_add_file_rmap (page, vma, false); +folio_add_file_rmap_pte (folio, page, vma);set_pte_at (vma->vm_mm, addr, pte,mk_pte (page, prot));return 0 ; }
@@ -4410,6 +4412,7 @@ static void deposit_prealloc_pte(structvm_fault_t do_set_pmd (struct vm_fault *vmf,struct page *page) { +struct folio *folio =page_folio (page);struct vm_area_struct *vma = vmf->vma;bool write = vmf->flags &FAULT_FLAG_WRITE ;unsigned long haddr = vmf->address &HPAGE_PMD_MASK ;
@@ -4419,8 +4422,7 @@ vm_fault_t do_set_pmd(struct vm_fault *vif (!thp_vma_suitable_order (vma, haddr,PMD_ORDER ))return ret; - page =compound_head (page); -if (compound_order (page) !=HPAGE_PMD_ORDER ) +if (page != &folio->page ||folio_order (folio) !=HPAGE_PMD_ORDER )return ret;/*
@@ -4429,7 +4431,7 @@ vm_fault_t do_set_pmd(struct vm_fault *v* check. This kind of THP just can be PTE mapped. Access to * the corrupted subpage should trigger SIGBUS as expected. */ -if (unlikely (PageHasHWPoisoned (page))) +if (unlikely (folio_test_has_hwpoisoned (folio)))return ret;/*
@@ -4453,7 +4455,7 @@ vm_fault_t do_set_pmd(struct vm_fault *v entry =maybe_pmd_mkwrite (pmd_mkdirty (entry), vma);add_mm_counter (vma->vm_mm,mm_counter_file (page),HPAGE_PMD_NR ); -page_add_file_rmap (page, vma, true); +folio_add_file_rmap_pmd (folio, page, vma);/* * deposit and withdraw with pmd lock held
_
Patches currently in -mm which might be from [email protected] are