From patchwork Wed Jan 8 06:57:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13930230 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C1A56E77188 for ; Wed, 8 Jan 2025 07:00:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=+oUJziA+3SIeve9hH8p/SUshEWFM4XR7pFGccDfjKoA=; b=RGaP+0T2zlPW1tLaWb9aCZh3xZ qKVtyWgaUvkmHyxOFfSYrqlo0HFZhEtxCEO02pKpi0HrZZtZ2UvOqRtkyqJkB5D22/iY7hR81IpmU fevMRENAFS5QWFMC+EeM6W7Rz7JtLUj4mmnTY/uemoxJRiDpXCVkiH3GGVjrlth3hWKoQ1VSbmRkT 0qhErt1TCN+vQfJ86WL3QvLSzxaIG1tcocoCYqDfuzaDjz5/if6K6IUtkYTmRjVM8SmqIVylK4Unb 8TMySXd8yXGRdBg0PW110eIrS0vjecl1HbRMHFty9BYXmvRnVecM5taWtfrS0924Z4s3NM9qhNg3O 0CR4s+KQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tVQ3M-00000007KYK-1yJ7; Wed, 08 Jan 2025 07:00:32 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tVQ28-00000007K0J-30En for linux-arm-kernel@lists.infradead.org; Wed, 08 Jan 2025 06:59:18 +0000 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2ee86a1a92dso19474862a91.1 for ; Tue, 07 Jan 2025 22:59:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1736319555; x=1736924355; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=+oUJziA+3SIeve9hH8p/SUshEWFM4XR7pFGccDfjKoA=; b=Hp2r2ZDb0iQZvl44i9hhpy7ywxgkloDPIJqkqoayluwJ5duknWGDJZnkSS6wJ3AR7b ZYImgJcOY04unRKcxHjM+eDu3zG7yPfSzQ1bp7ii2IKV1gX5eSssJ7Uf+EE98+ItJ5qA mG0ue4D9AxbUuuYYBj279HifhvjD4MhheSJyJT6ZyUppCW0HmyNKz+iN1IuNcHY3Va0B sLyyBQ5pqQqmwSpK81a6JCkLwzLBv9btR9K+6YRRB4aeHtpLnGVRUG80N5Bv4eQRJoDq RS9rbq2CRpF85YjsuwzA9wlY1K0c4A8G7E8Xoi8ICECNjbFBN7dWjH1RAEpjvYK6Houe xIIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736319555; x=1736924355; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=+oUJziA+3SIeve9hH8p/SUshEWFM4XR7pFGccDfjKoA=; b=YMkP2/MtoY7aat/mnm0FQwE1khFqLZCKi5C/HG6EavIfyO14jaZ+wRUuHF1ge2Jv7J oq3v6pSAL+opNTvIAP99puefm7tiMmeOn9bN0C2Lb/kgEVCmzg4yWyYZ7KvCXp0tWV0V LcMo3fRCSCyoEEwiYatzkXMfGt+w7xxBjOWrLDppDRSWMSLIz9yT2ru+Qw9H7LNuu+vK Ae3mtSjstkxwbPuqn4tC51oofNSxDFbqngudLIGulJtdRUsJm1AKIO2zH14WpAgECvB4 1aGgESqA4ZDaDIH99Zy6zk1JRDy8OJjrYVxPbaBrYkLM4EIcGEHJOf65fIss0N0rWpEp 2cVA== X-Forwarded-Encrypted: i=1; AJvYcCWSJv4zG1qw2A8193g/8lyr4+G46dlIt87cTi63cExpA+ThZOJI4u6pYMe41ogWnv/j5NbfC3kssCmPlvaocWFG@lists.infradead.org X-Gm-Message-State: AOJu0YzSwkQFysKNnd3SIQOhn1Iw6ah+YWpDrPDwNJYlVw1S+TfQ/9L7 lpOf0/eMUeABHOO80yJIs/PAoafNeSDkceQgTjgYpeGs9nl5x8ll/4xQAbmm+1g= X-Gm-Gg: ASbGncsHoIZ2rp8+ryWQ+Xk8AXrYn5iKmFq/q92UnLW4y7fJ59MRJQchz4fYOyxhNVT eBlgzQJ4+XIH4VmJONztToWkmJOK4SfCpOzvvtJxgIG8WNIsjI+4XLmcfa7cyrnbrw+jOvjvCWE wmO+u3Txf2u8siQcwVtGylyxODWcozwoAWrgKZPkC4R0ONV4gDKN5EOBiXnVblMvRat+b3Aa044 E4VIFoQPk5nVUMrmimNlI/+CltfVIwysvPMKJ3naAXqXq7iu5PfjM/VN4rZxuUY3enqTA6GnE9E Ew9bzYmsEQCIm0Fg7ntS5i20q9w= X-Google-Smtp-Source: AGHT+IF0KICf2IpNdbhCgJ/4FLwWodDPqZ+kJ6jQ+m3hTC2SCt6RG6Dd8PQChw/e3cG7DLZH3PR19A== X-Received: by 2002:a17:90b:4d05:b0:2ee:f80c:6884 with SMTP id 98e67ed59e1d1-2f548f426ccmr2612187a91.33.1736319554907; Tue, 07 Jan 2025 22:59:14 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.244]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca023a3sm320067275ad.250.2025.01.07.22.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2025 22:59:14 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, agordeev@linux.ibm.com, kevin.brodsky@arm.com, alex@ghiti.fr, andreas@gaisler.com, palmer@dabbelt.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 Subject: [PATCH v5 00/17] move pagetable_*_dtor() to __tlb_remove_table() Date: Wed, 8 Jan 2025 14:57:16 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250107_225916_765703_536FD71A X-CRM114-Status: GOOD ( 19.79 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Changes in v5: - cancel the move of p4d_free_tlb()'s location in [PATCH v4 06/15] (Alexander Gordeev) - fix the missing pagetable_dtor() in [PATCH v4 08/15] (Kevin Brodsky) - change the subject and description in [PATCH v4 12/15] (Alexander Gordeev) - remove the redundant __HAVE_ARCH_TLB_REMOVE_TABLE definition in [PATCH v4 13/15] (Andreas Larsson) - add "mm: pgtable: completely move pagetable_dtor() to generic tlb_remove_table()" (Kevin Brodsky) - add "x86: pgtable: convert __tlb_remove_table() to use struct ptdesc" - collect Acked-bys and Reviewed-bys 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 (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: convert __tlb_remove_table() to use struct ptdesc x86: pgtable: move pagetable_dtor() to __tlb_remove_table() s390: pgtable: consolidate PxD and PTE TLB free paths mm: pgtable: introduce generic __tlb_remove_table() mm: pgtable: completely move pagetable_dtor() to 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 | 10 ++-- arch/s390/mm/pgalloc.c | 23 +------- arch/sh/include/asm/pgalloc.h | 2 +- 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 | 5 +- arch/x86/mm/pgtable.c | 23 ++++---- include/asm-generic/pgalloc.h | 55 +++++++++++++++-- include/asm-generic/tlb.h | 24 ++++++-- include/linux/mm.h | 50 ++++++---------- include/linux/mm_types.h | 9 +-- mm/memory.c | 23 +++----- mm/mmu_gather.c | 20 ++++++- 38 files changed, 211 insertions(+), 299 deletions(-)