| Message ID | cover.1735549103.git.zhengqi.arch@bytedance.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | move pagetable_*_dtor() to __tlb_remove_table() | expand |
On Mon, 30 Dec 2024 17:07:35 +0800 Qi Zheng <zhengqi.arch@bytedance.com> wrote: > Changes in v4: > - remove [PATCH v3 15/17] and [PATCH v3 16/17] (Mike Rapoport) > (the tlb_remove_page_ptdesc() and tlb_remove_ptdesc() are intermediate > products of the project: https://kernelnewbies.org/MatthewWilcox/Memdescs, > so keep them) > - collect Acked-by Thanks, I've updated mm.git to v5.
On 30/12/2024 10:07, Qi Zheng wrote: > Qi Zheng (13): > Revert "mm: pgtable: make ptlock be freed by RCU" > mm: pgtable: add statistics for P4D level page table > arm64: pgtable: use mmu gather to free p4d level page table > s390: pgtable: add statistics for PUD and P4D level page table > mm: pgtable: introduce pagetable_dtor() > arm: pgtable: move pagetable_dtor() to __tlb_remove_table() > arm64: pgtable: move pagetable_dtor() to __tlb_remove_table() > riscv: pgtable: move pagetable_dtor() to __tlb_remove_table() > x86: pgtable: move pagetable_dtor() to __tlb_remove_table() > s390: pgtable: also move pagetable_dtor() of PxD to > __tlb_remove_table() > mm: pgtable: introduce generic __tlb_remove_table() > mm: pgtable: move __tlb_remove_table_one() in x86 to generic file > mm: pgtable: introduce generic pagetable_dtor_free() Aside from the nit on patch 4 and the request for clarification on patch 10, this is looking good to me, so for the whole series (aside from my own patches of course): Reviewed-by: Kevin Brodsky <kevin.brodsky@arm.com> And happy new year! Cheers, - Kevin
On 2025/1/3 01:00, Kevin Brodsky wrote: > On 30/12/2024 10:07, Qi Zheng wrote: >> Qi Zheng (13): >> Revert "mm: pgtable: make ptlock be freed by RCU" >> mm: pgtable: add statistics for P4D level page table >> arm64: pgtable: use mmu gather to free p4d level page table >> s390: pgtable: add statistics for PUD and P4D level page table >> mm: pgtable: introduce pagetable_dtor() >> arm: pgtable: move pagetable_dtor() to __tlb_remove_table() >> arm64: pgtable: move pagetable_dtor() to __tlb_remove_table() >> riscv: pgtable: move pagetable_dtor() to __tlb_remove_table() >> x86: pgtable: move pagetable_dtor() to __tlb_remove_table() >> s390: pgtable: also move pagetable_dtor() of PxD to >> __tlb_remove_table() >> mm: pgtable: introduce generic __tlb_remove_table() >> mm: pgtable: move __tlb_remove_table_one() in x86 to generic file >> mm: pgtable: introduce generic pagetable_dtor_free() > > Aside from the nit on patch 4 and the request for clarification on patch > 10, this is looking good to me, so for the whole series (aside from my > own patches of course): > > Reviewed-by: Kevin Brodsky <kevin.brodsky@arm.com> Thanks for your review! > > And happy new year! Happy New Year!! :) > > Cheers, > - Kevin
Changes in v4: - remove [PATCH v3 15/17] and [PATCH v3 16/17] (Mike Rapoport) (the tlb_remove_page_ptdesc() and tlb_remove_ptdesc() are intermediate products of the project: https://kernelnewbies.org/MatthewWilcox/Memdescs, so keep them) - collect Acked-by Changes in v3: - take patch #5 and #6 from Kevin Brodsky's patch series below. Link: https://lore.kernel.org/lkml/20241219164425.2277022-1-kevin.brodsky@arm.com/ - separate the statistics part from [PATCH v2 02/15] as [PATCH v3 04/17], and replace the rest part with Kevin Brodsky's patch #6 (Alexander Gordeev and Kevin Brodsky) - change the commit message of [PATCH v2 10/15] and [PATCH v2 11/15] (Alexander Gordeev) - fix the bug introduced by [PATCH v2 11/15] (Peter Zijlstra) - rebase onto the next-20241220 Changes in v2: - add [PATCH v2 13|14|15/15] (suggested by Peter Zijlstra) - add Originally-bys and Suggested-bys - rebase onto the next-20241218 Hi all, As proposed [1] by Peter Zijlstra below, this patch series aims to move pagetable_*_dtor() into __tlb_remove_table(). This will cleanup pagetable_*_dtor() a bit and more gracefully fix the UAF issue [2] reported by syzbot. ``` Notably: - s390 pud isn't calling the existing pagetable_pud_[cd]tor() - none of the p4d things have pagetable_p4d_[cd]tor() (x86,arm64,s390,riscv) and they have inconsistent accounting - while much of the _ctor calls are in generic code, many of the _dtor calls are in arch code for hysterial raisins, this could easily be fixed - if we fix ptlock_free() to handle NULL, then all the _dtor() functions can use it, and we can observe they're all identical and can be folded after all that cleanup, you can move the _dtor from *_free_tlb() into tlb_remove_table() -- which for the above case, would then have it called from __tlb_remove_table_free(). ``` And hi Andrew, I developed the code based on the latest linux-next, so I reverted the "mm: pgtable: make ptlock be freed by RCU" first. Once the review of this patch series is completed, the "mm: pgtable: make ptlock be freed by RCU" can be dropped directly from mm tree, and this revert patch will not be needed. This series is based on next-20241220. And I tested this patch series on x86 and only cross-compiled it on arm, arm64, powerpc, riscv, s390 and sparc. Comments and suggestions are welcome! Thanks, Qi [1]. https://lore.kernel.org/all/20241211133433.GC12500@noisy.programming.kicks-ass.net/ [2]. https://lore.kernel.org/all/67548279.050a0220.a30f1.015b.GAE@google.com/ Kevin Brodsky (2): riscv: mm: Skip pgtable level check in {pud,p4d}_alloc_one asm-generic: pgalloc: Provide generic p4d_{alloc_one,free} Qi Zheng (13): Revert "mm: pgtable: make ptlock be freed by RCU" mm: pgtable: add statistics for P4D level page table arm64: pgtable: use mmu gather to free p4d level page table s390: pgtable: add statistics for PUD and P4D level page table mm: pgtable: introduce pagetable_dtor() arm: pgtable: move pagetable_dtor() to __tlb_remove_table() arm64: pgtable: move pagetable_dtor() to __tlb_remove_table() riscv: pgtable: move pagetable_dtor() to __tlb_remove_table() x86: pgtable: move pagetable_dtor() to __tlb_remove_table() s390: pgtable: also move pagetable_dtor() of PxD to __tlb_remove_table() mm: pgtable: introduce generic __tlb_remove_table() mm: pgtable: move __tlb_remove_table_one() in x86 to generic file mm: pgtable: introduce generic pagetable_dtor_free() Documentation/mm/split_page_table_lock.rst | 4 +- arch/arm/include/asm/tlb.h | 10 ---- arch/arm64/include/asm/pgalloc.h | 18 ------ arch/arm64/include/asm/tlb.h | 21 ++++--- arch/csky/include/asm/pgalloc.h | 2 +- arch/hexagon/include/asm/pgalloc.h | 2 +- arch/loongarch/include/asm/pgalloc.h | 2 +- arch/m68k/include/asm/mcf_pgalloc.h | 4 +- arch/m68k/include/asm/sun3_pgalloc.h | 2 +- arch/m68k/mm/motorola.c | 2 +- arch/mips/include/asm/pgalloc.h | 2 +- arch/nios2/include/asm/pgalloc.h | 2 +- arch/openrisc/include/asm/pgalloc.h | 2 +- arch/powerpc/include/asm/tlb.h | 1 + arch/powerpc/mm/book3s64/mmu_context.c | 2 +- arch/powerpc/mm/book3s64/pgtable.c | 2 +- arch/powerpc/mm/pgtable-frag.c | 4 +- arch/riscv/include/asm/pgalloc.h | 69 +++++----------------- arch/riscv/include/asm/tlb.h | 18 ------ arch/riscv/mm/init.c | 4 +- arch/s390/include/asm/pgalloc.h | 31 +++++++--- arch/s390/include/asm/tlb.h | 43 +++++++------- arch/s390/mm/pgalloc.c | 23 +------- arch/sh/include/asm/pgalloc.h | 2 +- arch/sparc/include/asm/tlb_32.h | 1 + arch/sparc/include/asm/tlb_64.h | 1 + arch/sparc/mm/init_64.c | 2 +- arch/sparc/mm/srmmu.c | 2 +- arch/um/include/asm/pgalloc.h | 6 +- arch/x86/include/asm/pgalloc.h | 18 ------ arch/x86/include/asm/tlb.h | 33 ----------- arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/pgtable.c | 13 ++-- include/asm-generic/pgalloc.h | 55 +++++++++++++++-- include/asm-generic/tlb.h | 14 ++++- include/linux/mm.h | 50 ++++++---------- include/linux/mm_types.h | 9 +-- mm/memory.c | 23 +++----- mm/mmu_gather.c | 20 ++++++- 39 files changed, 211 insertions(+), 309 deletions(-)