The patch titled Subject: mm: mprotect: use a folio in change_pte_range() has been added to the -mm mm-unstable branch. Its filename is mm-mprotect-use-a-folio-in-change_pte_range.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-mprotect-use-a-folio-in-change_pte_range.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: mprotect: use a folio in change_pte_range() Date: Wed, 18 Oct 2023 22:07:56 +0800 Use a folio in change_pte_range() to save three compound_head() calls. Since now only normal and PMD-mapped page is handled by numa balancing, it is enough to only update the entire folio's access time. Link: https://lkml.kernel.org/r/20231018140806.2783514-10-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/mprotect.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) --- a/mm/mprotect.c~mm-mprotect-use-a-folio-in-change_pte_range +++ a/mm/mprotect.c @@ -114,7 +114,7 @@ static long change_pte_range(struct mmu_ * pages. See similar comment in change_huge_pmd. */ if (prot_numa) { - struct page *page; + struct folio *folio; int nid; bool toptier; @@ -122,13 +122,14 @@ static long change_pte_range(struct mmu_ if (pte_protnone(oldpte)) continue; - page = vm_normal_page(vma, addr, oldpte); - if (!page || is_zone_device_page(page) || PageKsm(page)) + folio = vm_normal_folio(vma, addr, oldpte); + if (!folio || folio_is_zone_device(folio) || + folio_test_ksm(folio)) continue; /* Also skip shared copy-on-write pages */ if (is_cow_mapping(vma->vm_flags) && - page_count(page) != 1) + folio_ref_count(folio) != 1) continue; /* @@ -136,14 +137,15 @@ static long change_pte_range(struct mmu_ * it cannot move them all from MIGRATE_ASYNC * context. */ - if (page_is_file_lru(page) && PageDirty(page)) + if (folio_is_file_lru(folio) && + folio_test_dirty(folio)) continue; /* * Don't mess with PTEs if page is already on the node * a single-threaded process is running on. */ - nid = page_to_nid(page); + nid = folio_nid(folio); if (target_node == nid) continue; toptier = node_is_toptier(nid); @@ -157,7 +159,7 @@ static long change_pte_range(struct mmu_ continue; if (sysctl_numa_balancing_mode & NUMA_BALANCING_MEMORY_TIERING && !toptier) - xchg_page_access_time(page, + folio_xchg_access_time(folio, jiffies_to_msecs(jiffies)); } _ 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