mm-introduce-arch_do_swap_page_nr-which-allows-restore-metadata-for-nr-pages.patch removed from -mm tree
The quilt patch titled
Subject: mm: introduce arch_do_swap_page_nr() which allows restore metadata for nr pages
has been removed from the -mm tree. Its filename was
mm-introduce-arch_do_swap_page_nr-which-allows-restore-metadata-for-nr-pages.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: Barry Song <[email protected]>
Subject: mm: introduce arch_do_swap_page_nr() which allows restore metadata for nr pages
Date: Wed, 29 May 2024 20:28:22 +1200
Should do_swap_page() have the capability to directly map a large folio, metadata restoration becomes necessary for a specified number of pages denoted as nr. It's important to highlight that metadata restoration is solely required by the SPARC platform, which, however, does not enable THP_SWAP. Consequently, in the present kernel configuration, there exists no practical scenario where users necessitate the restoration of nr metadata. Platforms implementing THP_SWAP might invoke this function with nr values exceeding 1, subsequent to do_swap_page() successfully mapping an entire large folio. Nonetheless, their arch_do_swap_page_nr() functions remain empty.
---
include/linux/pgtable.h | 24 +++++++++++++++++++----- mm/memory.c | 3 ++- 2 files changed, 21 insertions(+), 6 deletions(-)
include/linux/pgtable.h renamed from include/linux/pgtable.h~mm-introduce-arch_do_swap_page_nr-which-allows-restore-metadata-for-nr-pages +19 -5
@@ -1089,6 +1089,15 @@ static inline int pgd_same(pgd_t pgd_a, })#ifndef __HAVE_ARCH_DO_SWAP_PAGE +static inline void arch_do_swap_page_nr (struct mm_struct *mm, +struct vm_area_struct *vma, +unsigned long addr, +pte_t pte,pte_t oldpte, +int nr) +{ + +} +#else /* * Some architectures support metadata associated with a page. When a * page is being swapped out, this metadata must be saved so it can be
@@ -1097,12 +1106,17 @@ static inline int pgd_same(pgd_t pgd_a,* page as metadata for the page. arch_do_swap_page() can restore this * metadata when a page is swapped back in. */ -static inline void arch_do_swap_page (struct mm_struct *mm, -struct vm_area_struct *vma, -unsigned long addr, -pte_t pte,pte_t oldpte) +static inline void arch_do_swap_page_nr (struct mm_struct *mm, +struct vm_area_struct *vma, +unsigned long addr, +pte_t pte,pte_t oldpte, +int nr) { - +for (int i =0 ; i < nr; i++) { +arch_do_swap_page (vma->vm_mm, vma, addr + i *PAGE_SIZE , +pte_advance_pfn (pte, i), +pte_advance_pfn (oldpte, i)); + } }#endif
mm/memory.c renamed from mm/memory.c~mm-introduce-arch_do_swap_page_nr-which-allows-restore-metadata-for-nr-pages +2 -1
@@ -4308,7 +4308,8 @@ vm_fault_t do_swap_page(struct vm_faultVM_BUG_ON (!folio_test_anon (folio) || (pte_write (pte) && !PageAnonExclusive (page)));set_pte_at (vma->vm_mm, vmf->address, vmf->pte, pte); -arch_do_swap_page (vma->vm_mm, vma, vmf->address, pte, vmf->orig_pte); +arch_do_swap_page_nr (vma->vm_mm, vma, vmf->address, + pte, vmf->orig_pte,1 );folio_unlock (folio);if (folio != swapcache && swapcache) {
_
Patches currently in -mm which might be from [email protected] are
mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap.patch mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap-fix-2.patch mm-extend-rmap-flags-arguments-for-folio_add_new_anon_rmap-fix-3.patch mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false.patch mm-use-folio_add_new_anon_rmap-if-folio_test_anonfolio==false-fix-2.patch mm-remove-folio_test_anonfolio==false-path-in-__folio_add_anon_rmap.patch tools-mm-introduce-a-tool-to-assess-swap-entry-allocation-for-thp_swapout.patch