From: Qi Zheng <zhengqi.arch@bytedance.com>
To: peterz@infradead.org, agordeev@linux.ibm.com,
kevin.brodsky@arm.com, tglx@linutronix.de, david@redhat.com,
jannh@google.com, hughd@google.com, yuzhao@google.com,
willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org,
lorenzo.stoakes@oracle.com, akpm@linux-foundation.org,
rientjes@google.com, vishal.moola@gmail.com, arnd@arndb.de,
will@kernel.org, aneesh.kumar@kernel.org, npiggin@gmail.com,
dave.hansen@linux.intel.com, rppt@kernel.org,
ryan.roberts@arm.com
Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org,
linux-s390@vger.kernel.org, sparclinux@vger.kernel.org,
linux-kernel@vger.kernel.org, x86@kernel.org,
linux-arch@vger.kernel.org, linux-csky@vger.kernel.org,
linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev,
linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
linux-openrisc@vger.kernel.org, linux-sh@vger.kernel.org,
linux-um@lists.infradead.org,
Qi Zheng <zhengqi.arch@bytedance.com>
Subject: [PATCH v3 00/17] move pagetable_*_dtor() to __tlb_remove_table()
Date: Mon, 23 Dec 2024 17:40:46 +0800 [thread overview]
Message-ID: <cover.1734945104.git.zhengqi.arch@bytedance.com> (raw)
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 (15):
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: remove tlb_remove_page_ptdesc()
mm: pgtable: remove tlb_remove_ptdesc()
mm: pgtable: introduce generic pagetable_dtor_free()
Documentation/mm/split_page_table_lock.rst | 4 +-
arch/arm/include/asm/tlb.h | 18 +-----
arch/arm64/include/asm/pgalloc.h | 18 ------
arch/arm64/include/asm/tlb.h | 31 ++++-----
arch/csky/include/asm/pgalloc.h | 4 +-
arch/hexagon/include/asm/pgalloc.h | 4 +-
arch/loongarch/include/asm/pgalloc.h | 4 +-
arch/m68k/include/asm/mcf_pgalloc.h | 4 +-
arch/m68k/include/asm/sun3_pgalloc.h | 4 +-
arch/m68k/mm/motorola.c | 2 +-
arch/mips/include/asm/pgalloc.h | 4 +-
arch/nios2/include/asm/pgalloc.h | 4 +-
arch/openrisc/include/asm/pgalloc.h | 4 +-
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 | 75 ++++++----------------
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 | 31 ++-------
arch/sh/include/asm/pgalloc.h | 4 +-
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 | 12 ++--
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 | 60 +++++++++++++----
include/asm-generic/tlb.h | 23 +++----
include/linux/mm.h | 52 ++++++---------
include/linux/mm_types.h | 9 +--
mm/memory.c | 23 ++-----
mm/mmu_gather.c | 19 +++++-
39 files changed, 228 insertions(+), 361 deletions(-)
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Qi Zheng <zhengqi.arch@bytedance.com>
To: peterz@infradead.org, agordeev@linux.ibm.com,
kevin.brodsky@arm.com, tglx@linutronix.de, david@redhat.com,
jannh@google.com, hughd@google.com, yuzhao@google.com,
willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org,
lorenzo.stoakes@oracle.com, akpm@linux-foundation.org,
rientjes@google.com, vishal.moola@gmail.com, arnd@arndb.de,
will@kernel.org, aneesh.kumar@kernel.org, npiggin@gmail.com,
dave.hansen@linux.intel.com, rppt@kernel.org,
ryan.roberts@arm.com
Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org,
linux-s390@vger.kernel.org, sparclinux@vger.kernel.org,
linux-kernel@vger.kernel.org, x86@kernel.org,
linux-arch@vger.kernel.org, linux-csky@vger.kernel.org,
linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev,
linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org,
linux-openrisc@vger.kernel.org, linux-sh@vger.kernel.org,
linux-um@lists.infradead.org,
Qi Zheng <zhengqi.arch@bytedance.com>
Subject: [PATCH v3 00/17] move pagetable_*_dtor() to __tlb_remove_table()
Date: Mon, 23 Dec 2024 17:40:46 +0800 [thread overview]
Message-ID: <cover.1734945104.git.zhengqi.arch@bytedance.com> (raw)
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 (15):
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: remove tlb_remove_page_ptdesc()
mm: pgtable: remove tlb_remove_ptdesc()
mm: pgtable: introduce generic pagetable_dtor_free()
Documentation/mm/split_page_table_lock.rst | 4 +-
arch/arm/include/asm/tlb.h | 18 +-----
arch/arm64/include/asm/pgalloc.h | 18 ------
arch/arm64/include/asm/tlb.h | 31 ++++-----
arch/csky/include/asm/pgalloc.h | 4 +-
arch/hexagon/include/asm/pgalloc.h | 4 +-
arch/loongarch/include/asm/pgalloc.h | 4 +-
arch/m68k/include/asm/mcf_pgalloc.h | 4 +-
arch/m68k/include/asm/sun3_pgalloc.h | 4 +-
arch/m68k/mm/motorola.c | 2 +-
arch/mips/include/asm/pgalloc.h | 4 +-
arch/nios2/include/asm/pgalloc.h | 4 +-
arch/openrisc/include/asm/pgalloc.h | 4 +-
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 | 75 ++++++----------------
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 | 31 ++-------
arch/sh/include/asm/pgalloc.h | 4 +-
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 | 12 ++--
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 | 60 +++++++++++++----
include/asm-generic/tlb.h | 23 +++----
include/linux/mm.h | 52 ++++++---------
include/linux/mm_types.h | 9 +--
mm/memory.c | 23 ++-----
mm/mmu_gather.c | 19 +++++-
39 files changed, 228 insertions(+), 361 deletions(-)
--
2.20.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next reply other threads:[~2024-12-23 9:43 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-23 9:40 Qi Zheng [this message]
2024-12-23 9:40 ` [PATCH v3 00/17] move pagetable_*_dtor() to __tlb_remove_table() Qi Zheng
2024-12-23 9:40 ` [PATCH v3 01/17] Revert "mm: pgtable: make ptlock be freed by RCU" Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 02/17] riscv: mm: Skip pgtable level check in {pud,p4d}_alloc_one Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-27 16:40 ` Palmer Dabbelt
2024-12-27 16:40 ` Palmer Dabbelt
2024-12-28 6:36 ` Qi Zheng
2024-12-28 6:36 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 03/17] asm-generic: pgalloc: Provide generic p4d_{alloc_one,free} Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 04/17] mm: pgtable: add statistics for P4D level page table Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 05/17] arm64: pgtable: use mmu gather to free p4d " Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 06/17] s390: pgtable: add statistics for PUD and P4D " Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 07/17] mm: pgtable: introduce pagetable_dtor() Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 08/17] arm: pgtable: move pagetable_dtor() to __tlb_remove_table() Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 09/17] arm64: " Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 10/17] riscv: " Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 11/17] x86: " Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 12/17] s390: pgtable: also move pagetable_dtor() of PxD " Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:40 ` [PATCH v3 13/17] mm: pgtable: introduce generic __tlb_remove_table() Qi Zheng
2024-12-23 9:40 ` Qi Zheng
2024-12-23 9:41 ` [PATCH v3 14/17] mm: pgtable: move __tlb_remove_table_one() in x86 to generic file Qi Zheng
2024-12-23 9:41 ` Qi Zheng
2024-12-23 9:41 ` [PATCH v3 15/17] mm: pgtable: remove tlb_remove_page_ptdesc() Qi Zheng
2024-12-23 9:41 ` Qi Zheng
2024-12-28 9:26 ` Mike Rapoport
2024-12-28 9:26 ` Mike Rapoport
2024-12-30 3:12 ` Qi Zheng
2024-12-30 3:12 ` Qi Zheng
2024-12-30 4:55 ` Andrew Morton
2024-12-30 4:55 ` Andrew Morton
2024-12-30 5:01 ` Qi Zheng
2024-12-30 5:01 ` Qi Zheng
2025-01-03 11:14 ` Peter Zijlstra
2025-01-03 11:14 ` Peter Zijlstra
2025-01-06 3:53 ` Qi Zheng
2025-01-06 3:53 ` Qi Zheng
2024-12-23 9:41 ` [PATCH v3 16/17] mm: pgtable: remove tlb_remove_ptdesc() Qi Zheng
2024-12-23 9:41 ` Qi Zheng
2024-12-23 9:41 ` [PATCH v3 17/17] mm: pgtable: introduce generic pagetable_dtor_free() Qi Zheng
2024-12-23 9:41 ` Qi Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1734945104.git.zhengqi.arch@bytedance.com \
--to=zhengqi.arch@bytedance.com \
--cc=agordeev@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@kernel.org \
--cc=arnd@arndb.de \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=jannh@google.com \
--cc=kevin.brodsky@arm.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-csky@vger.kernel.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-openrisc@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=loongarch@lists.linux.dev \
--cc=lorenzo.stoakes@oracle.com \
--cc=muchun.song@linux.dev \
--cc=npiggin@gmail.com \
--cc=peterz@infradead.org \
--cc=rientjes@google.com \
--cc=rppt@kernel.org \
--cc=ryan.roberts@arm.com \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=vbabka@kernel.org \
--cc=vishal.moola@gmail.com \
--cc=will@kernel.org \
--cc=willy@infradead.org \
--cc=x86@kernel.org \
--cc=yuzhao@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.