The patch titled
Subject: mm-add-per-order-mthp-swpin_refault-counter-fix
has been added to the -mm mm-unstable branch. Its filename is
mm-add-per-order-mthp-swpin_refault-counter-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-add-per-order-mthp-swpin_refault-counter-fix.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Barry Song <21cnbao@xxxxxxxxx>
Subject: mm-add-per-order-mthp-swpin_refault-counter-fix
Date: Thu, 11 Apr 2024 13:46:36 +1200
fix build errors on CONFIG_TRANSPARENT_HUGEPAGE=N
Link: https://lkml.kernel.org/r/20240411014636.14023-1-21cnbao@xxxxxxxxx
Signed-off-by: Barry Song <v-songbaohua@xxxxxxxx>
Reported-by: SeongJae Park <sj@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memory.c | 2 ++
1 file changed, 2 insertions(+)
--- a/mm/memory.c~mm-add-per-order-mthp-swpin_refault-counter-fix
+++ a/mm/memory.c
@@ -4141,6 +4141,7 @@ vm_fault_t do_swap_page(struct vm_fault
vmf->pte = pte_offset_map_lock(vma->vm_mm, vmf->pmd, vmf->address,
&vmf->ptl);
+#ifdef CONFIG_TRANSPARENT_HUGEPAGE
/* We hit large folios in swapcache */
if (start_pte && folio_test_large(folio) && folio_test_swapcache(folio)) {
int nr = folio_nr_pages(folio);
@@ -4170,6 +4171,7 @@ vm_fault_t do_swap_page(struct vm_fault
}
check_pte:
+#endif
if (unlikely(!vmf->pte || !pte_same(ptep_get(vmf->pte), vmf->orig_pte)))
goto out_nomap;
_
Patches currently in -mm which might be from 21cnbao@xxxxxxxxx are
mm-add-per-order-mthp-swpin_refault-counter-fix.patch
