Here is v2 third series of patches to mm (and a few architectures), based on v6.4-rc5 with the preceding two series applied: in which khugepaged takes advantage of pte_offset_map[_lock]() allowing for pmd transitions. Differences from v1 are noted patch by patch below This follows on from the v2 "arch: allow pte_offset_map[_lock]() to fail" https://lore.kernel.org/linux-mm/a4963be9-7aa6-350-66d0-2ba843e1af44@xxxxxxxxxx/ series of 23 posted on 2023-06-08 (and now in mm-stable - thank you), and the v2 "mm: allow pte_offset_map[_lock]() to fail" https://lore.kernel.org/linux-mm/c1c9a74a-bc5b-15ea-e5d2-8ec34bc921d@xxxxxxxxxx/ series of 32 posted on 2023-06-08 (and now in mm-stable - thank you), and replaces the v1 "mm: free retracted page table by RCU" https://lore.kernel.org/linux-mm/35e983f5-7ed3-b310-d949-9ae8b130cdab@xxxxxxxxxx/ series of 12 posted on 2023-05-28 (which was bad on powerpc and s390). The first two series were "independent": neither depending for build or correctness on the other, but both series had to be in before this third series is added to make the effective changes; and it would probably be best to hold this series back until the following release, since it might now reveal missed imbalances which the first series hoped to fix. What is it all about? Some mmap_lock avoidance i.e. latency reduction. Initially just for the case of collapsing shmem or file pages to THPs: the usefulness of MADV_COLLAPSE on shmem is being limited by that mmap_write_lock it currently requires. Likely to be relied upon later in other contexts e.g. freeing of empty page tables (but that's not work I'm doing). mmap_write_lock avoidance when collapsing to anon THPs? Perhaps, but again that's not work I've done: a quick attempt was not as easy as the shmem/file case. These changes (though of course not these exact patches) have been in Google's data centre kernel for three years now: we do rely upon them. Based on the preceding two series over v6.4-rc5, or any v6.4-rc; and almost good on current mm-everything or current linux-next - just one patch conflicts, the 10/12: I'll reply to that one with its mm-everything or linux-next equivalent (ptent replacing *pte). 01/12 mm/pgtable: add rcu_read_lock() and rcu_read_unlock()s v2: same as v1 02/12 mm/pgtable: add PAE safety to __pte_offset_map() v2: rename to pmdp_get_lockless_start/end() per Matthew; so use inlines without _irq_save(flags) macro oddity; add pmdp_get_lockless_sync() for use later in 09/12. 03/12 arm: adjust_pte() use pte_offset_map_nolock() v2: same as v1 04/12 powerpc: assert_pte_locked() use pte_offset_map_nolock() v2: same as v1 05/12 powerpc: add pte_free_defer() for pgtables sharing page v2: fix rcu_head usage to cope with concurrent deferrals; add para to commit message explaining rcu_head issue. 06/12 sparc: add pte_free_defer() for pte_t *pgtable_t v2: use page_address() instead of less common page_to_virt(); add para to commit message explaining simple conversion; changed title since sparc64 pgtables do not share page. 07/12 s390: add pte_free_defer() for pgtables sharing page v2: complete rewrite, integrated with s390's existing pgtable management; temporarily using a global mm_pgtable_list_lock, to be restored to per-mm spinlock in a later followup patch. 08/12 mm/pgtable: add pte_free_defer() for pgtable as page v2: add comment on rcu_head to "Page table pages", per JannH 09/12 mm/khugepaged: retract_page_tables() without mmap or vma lock v2: repeat checks under ptl because UFFD, per PeterX and JannH; bring back mmu_notifier calls for PMD, per JannH and Jason; pmdp_get_lockless_sync() to issue missing interrupt if PAE. 10/12 mm/khugepaged: collapse_pte_mapped_thp() with mmap_read_lock() v2: first check VMA, in case page tables torn down, per JannH; pmdp_get_lockless_sync() to issue missing interrupt if PAE; moved mmu_notifier after step 1, reworked final goto labels. 11/12 mm/khugepaged: delete khugepaged_collapse_pte_mapped_thps() v2: same as v1 12/12 mm: delete mmap_write_trylock() and vma_try_start_write() v2: same as v1 arch/arm/mm/fault-armv.c | 3 +- arch/powerpc/include/asm/pgalloc.h | 4 + arch/powerpc/mm/pgtable-frag.c | 51 ++++ arch/powerpc/mm/pgtable.c | 16 +- arch/s390/include/asm/pgalloc.h | 4 + arch/s390/mm/pgalloc.c | 205 +++++++++---- arch/sparc/include/asm/pgalloc_64.h | 4 + arch/sparc/mm/init_64.c | 16 + include/linux/mm.h | 17 -- include/linux/mm_types.h | 6 +- include/linux/mmap_lock.h | 10 - include/linux/pgtable.h | 10 +- mm/khugepaged.c | 481 +++++++++++------------------- mm/pgtable-generic.c | 53 +++- 14 files changed, 467 insertions(+), 413 deletions(-) Hugh