This patchset adds the ability to handle page faults on parts of files which are already in the page cache without taking the mmap lock. I've taken a very gradual approach to pushing the lock down. I'm not 100% confident in my ability to grasp all the finer aspects of VMA handling, so some reviewrs may well feel that I could have combined some of these patches. I did try to skip one of these steps and it had a bug, so I feel justified in proceeding cautiously. Several people have volunteered to run benchmarks on this, so I haven't. I have run it through xfstests and it doesn't appear to introduce any regressions. This patchset is against next-20230711. There is a patch from Arjun Roy in there which has terrible conflicts with this work. At Eric Dumazet's suggestion I have started out by reverting it, then doing my patches and redoing Arjun's patch on top. It has the benefit of halving the size of Arjun's patch, Merging this is going to be a nightmare unless the networking tree reverts Arjun's patch (the mm tree can't revert a patch which isn't in the mm tree!). Arjun's patch did point out that using lock_vma_under_rcu() is currently very awkward, so that inspired patch 8 which makes it always available. Arjun Roy (1): tcp: Use per-vma locking for receive zerocopy Matthew Wilcox (Oracle) (8): Revert "tcp: Use per-vma locking for receive zerocopy" mm: Allow per-VMA locks on file-backed VMAs mm: Move FAULT_FLAG_VMA_LOCK check from handle_mm_fault() mm: Move FAULT_FLAG_VMA_LOCK check into handle_pte_fault() mm: Move FAULT_FLAG_VMA_LOCK check down in handle_pte_fault() mm: Move the FAULT_FLAG_VMA_LOCK check down from do_fault() mm: Run the fault-around code under the VMA lock mm: Remove CONFIG_PER_VMA_LOCK ifdefs MAINTAINERS | 1 - arch/arm64/mm/fault.c | 2 -- arch/powerpc/mm/fault.c | 4 ---- arch/riscv/mm/fault.c | 4 ---- arch/s390/mm/fault.c | 2 -- arch/x86/mm/fault.c | 4 ---- include/linux/mm.h | 6 ++++++ include/linux/net_mm.h | 17 ----------------- include/net/tcp.h | 1 - mm/hugetlb.c | 6 ++++++ mm/memory.c | 35 +++++++++++++++++++++++++---------- net/ipv4/tcp.c | 14 +++++--------- 12 files changed, 42 insertions(+), 54 deletions(-) delete mode 100644 include/linux/net_mm.h -- 2.39.2
