mm-khugepaged-page_remove_rmap-folio_remove_rmap_pte.patch removed from -mm tree
The quilt patch titled
Subject: mm/khugepaged: page_remove_rmap() -> folio_remove_rmap_pte()
has been removed from the -mm tree. Its filename was
mm-khugepaged-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/khugepaged: page_remove_rmap() -> folio_remove_rmap_pte()
Date: Wed, 20 Dec 2023 23:44:50 +0100
Let's convert __collapse_huge_page_copy_succeeded() and collapse_pte_mapped_thp(). While at it, perform some more folio conversion in __collapse_huge_page_copy_succeeded().
We can get rid of release_pte_page().
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/khugepaged.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-page_remove_rmap-folio_remove_rmap_pte +7 -10
@@ -494,11 +494,6 @@ static void release_pte_folio(struct folfolio_putback_lru (folio); } -static void release_pte_page (struct page *page) -{ -release_pte_folio (page_folio (page)); -} -static void release_pte_pages (pte_t *pte,pte_t *_pte,struct list_head *compound_pagelist) {
@@ -687,6 +682,7 @@ static void __collapse_huge_page_copy_suspinlock_t *ptl, struct list_head *compound_pagelist) { + struct folio *src_folio;struct page *src_page;struct page *tmp;pte_t *_pte;
@@ -708,16 +704,17 @@ static void __collapse_huge_page_copy_su } }else { src_page =pte_page (pteval); -if (!PageCompound (src_page)) -release_pte_page (src_page); + src_folio =page_folio (src_page); +if (!folio_test_large (src_folio)) +release_pte_folio (src_folio);/* * ptl mostly unnecessary, but preempt has to * be disabled to update the per-cpu stats -* inside page_remove_rmap(). +* inside folio_remove_rmap_pte(). */ spin_lock (ptl);ptep_clear (vma->vm_mm, address, _pte); -page_remove_rmap (src_page, vma, false); +folio_remove_rmap_pte (src_folio, src_page, vma);spin_unlock (ptl);free_page_and_swap_cache (src_page); }
@@ -1625,7 +1622,7 @@ int collapse_pte_mapped_thp(struct mm_st* PTE dirty? Shmem page is already dirty; file is read-only. */ ptep_clear (mm, addr, pte); -page_remove_rmap (page, vma, false); +folio_remove_rmap_pte (folio, page, vma); nr_ptes++; }
_
Patches currently in -mm which might be from [email protected] are