The patch titled Subject: mm: use folio_xchg_last_cpupid() in wp_page_reuse() has been added to the -mm mm-unstable branch. Its filename is mm-use-folio_xchg_last_cpupid-in-wp_page_reuse.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-use-folio_xchg_last_cpupid-in-wp_page_reuse.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: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx> Subject: mm: use folio_xchg_last_cpupid() in wp_page_reuse() Date: Wed, 18 Oct 2023 22:08:05 +0800 Convert to use folio_xchg_last_cpupid() in wp_page_reuse(), and remove page variable. Since now only normal and PMD-mapped page is handled by numa balancing, it's enough to only update the entire folio's last cpupid. Link: https://lkml.kernel.org/r/20231018140806.2783514-19-wangkefeng.wang@xxxxxxxxxx Signed-off-by: Kefeng Wang <wangkefeng.wang@xxxxxxxxxx> Cc: David Hildenbrand <david@xxxxxxxxxx> Cc: Huang Ying <ying.huang@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: Juri Lelli <juri.lelli@xxxxxxxxxx> Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Vincent Guittot <vincent.guittot@xxxxxxxxxx> Cc: Zi Yan <ziy@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/memory.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) --- a/mm/memory.c~mm-use-folio_xchg_last_cpupid-in-wp_page_reuse +++ a/mm/memory.c @@ -3022,19 +3022,20 @@ static inline void wp_page_reuse(struct __releases(vmf->ptl) { struct vm_area_struct *vma = vmf->vma; - struct page *page = vmf->page; pte_t entry; VM_BUG_ON(!(vmf->flags & FAULT_FLAG_WRITE)); - VM_BUG_ON(folio && folio_test_anon(folio) && !PageAnonExclusive(page)); - /* - * Clear the pages cpupid information as the existing - * information potentially belongs to a now completely - * unrelated process. - */ - if (page) - page_cpupid_xchg_last(page, (1 << LAST_CPUPID_SHIFT) - 1); + if (folio) { + VM_BUG_ON(folio_test_anon(folio) && + !PageAnonExclusive(vmf->page)); + /* + * Clear the folio's cpupid information as the existing + * information potentially belongs to a now completely + * unrelated process. + */ + folio_xchg_last_cpupid(folio, (1 << LAST_CPUPID_SHIFT) - 1); + } flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte)); entry = pte_mkyoung(vmf->orig_pte); _ Patches currently in -mm which might be from wangkefeng.wang@xxxxxxxxxx are mm_types-add-virtual-and-_last_cpupid-into-struct-folio.patch mm-add-folio_last_cpupid.patch mm-memory-use-folio_last_cpupid-in-do_numa_page.patch mm-huge_memory-use-folio_last_cpupid-in-do_huge_pmd_numa_page.patch mm-huge_memory-use-folio_last_cpupid-in-__split_huge_page_tail.patch mm-remove-page_cpupid_last.patch mm-add-folio_xchg_access_time.patch sched-fair-use-folio_xchg_access_time-in-numa_hint_fault_latency.patch mm-mprotect-use-a-folio-in-change_pte_range.patch mm-huge_memory-use-a-folio-in-change_huge_pmd.patch mm-remove-xchg_page_access_time.patch mm-add-folio_xchg_last_cpupid.patch sched-fair-use-folio_xchg_last_cpupid-in-should_numa_migrate_memory.patch mm-migrate-use-folio_xchg_last_cpupid-in-folio_migrate_flags.patch mm-huge_memory-use-folio_xchg_last_cpupid-in-__split_huge_page_tail.patch mm-make-finish_mkwrite_fault-static.patch mm-convert-wp_page_reuse-and-finish_mkwrite_fault-to-take-a-folio.patch mm-use-folio_xchg_last_cpupid-in-wp_page_reuse.patch mm-remove-page_cpupid_xchg_last.patch