From patchwork Mon Dec 23 09:40:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13918696 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 3BD9CE7718B for ; Mon, 23 Dec 2024 09:44:34 +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=hW6jy85GFxw1rlbhA2IQSgcMmC6SEwxIAu1eEJQsQ+g=; b=bOdkZ3xzcXV6hvQV946skutp7F 0p7jMhvNV6huM826ppi8kl5jrurs6YZDe23LYOdDY2yqAUXVv0l519LY5RI8Uo8M6wYc//IN2RBg6 P7kjouSoG2KUWpdl+hgcFp80v+MQm+cPK+Zz2FiNlZtdWsTwZ8OS5y37oUybY1Z52kOkrfczjo0Ju oTvTNqcXb1S1UqMn6u4WdHmaIjUqKWxMZGaCGP3COABF9j8REDqh3dyadjFoxJZ9vBj/rE8tvMbxv ONZ8AsDNF0P2OViF1ERRcDDICNOd7SEs/BvxN/qFo+Rd25fHCKZpTdnhPgNCZP5ebDIirVFPCcg7Z Uv1H0FMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tPez8-00000009gYS-0K2T; Mon, 23 Dec 2024 09:44:22 +0000 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tPexs-00000009fwp-3v3U for linux-arm-kernel@lists.infradead.org; Mon, 23 Dec 2024 09:43:07 +0000 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-725ee6f56b4so3376111b3a.3 for ; Mon, 23 Dec 2024 01:43:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1734946983; x=1735551783; 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=hW6jy85GFxw1rlbhA2IQSgcMmC6SEwxIAu1eEJQsQ+g=; b=iZBR0PIK8KaVLcYjJi2f9BpsCmm/hq/JDENN+EhksPmSIW/KR+W2SzUrRU1eIqC4w1 07ghI/b14H/kEErfovrhPcbTRsu809AuWhDO389Skolf6do0pUDwr64RfX6zUmcG8uU9 DEc0sr9yDWizA/6F0FLTSLdEXqexZo+IGY4zZnlNmUbYsrk7oR9ikooXAJn2uRkThN6P JsGJDrTk6tEF1ewU7yB/D8Us5EXbNMukAUQrlGc1Q6yu24O+hlq4fh5DmkHmbDLWcRDC iDkQumao8jHNtQJg20oqsWLt9U1N7dpbcrpDESd+/672ed57XAf1gUUkG2bYqACOWLJS fwoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734946983; x=1735551783; 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=hW6jy85GFxw1rlbhA2IQSgcMmC6SEwxIAu1eEJQsQ+g=; b=wtRvqybdX0b8W7O5qULNqPNZ0yys8vSvi2GMhK+wNCfBMKM2R9lgr9GNXrtsIoeKkw 5JDd70sScLOmgreQJOew7WjCrfxq7nKuBvK4Cwxr196lA9Qqv8K+El9wslh112k7MTEK LomP7jN7Hb1CPqOgf1JTiK0v7LlkPe393dPatT1+4UNWzCjJTTf8r6Ccl8+a/5p8PCfl VpaFIgDzGp8AQKazGd6E6KZXnYRngOf52yxIE0F6d0DlFoMrWCieI9ErGQ+PLNjNwFKe SAlZSahO4TDrarsqIt3wbNR7vWbF9PuOht5SFXGzjMNeI3SUmha59l4OAMI7QRFbe45H aVTQ== X-Forwarded-Encrypted: i=1; AJvYcCUQwCEh/4UWXmjR+HjeSWHFvE16HiRtDebs1TdSNKsvU2f7lHNBuclOhlnS902QdL/HQ4LfMYpqZIbEb99KIgnU@lists.infradead.org X-Gm-Message-State: AOJu0YwYl7W/vP/X1SnI+LVOCeio045l/fOJgSPNEnbNe30iiox234Vr n3pPuCf/1x8tZDA2vV+roV4VetgmsbPy6gobb6Av/FeMgDuMK8oPf5frcKBjTBI= X-Gm-Gg: ASbGncuB/Z40+8mStWQGd1LPTeEG8IgOIAy0mJtIBE4P5P+0qOUaAnZDeqxicziQhDk B1QcB03MWaR4GGJioVEr6FFgZibzS2T3B/2d6JomD+5RyWcnM4Y5bOm7Bm+SlM07bKKX9Amx1Jf TWulEUIvdNCTANVRXd9n4m8Q1Q2RebutRpUYkSFC72eiCyrs2sNGMIs+iO0W0DFgJ2f2mUFbI7Q ohxAVqaaFVlfi9+urYSkGd1KDgMR9BO1wTE7NG6UEUmO0I3QHXHXiScnE+AzS5aCWH5V2EpMbCy o0Xde97d4uxh2SFCuTlVlw== X-Google-Smtp-Source: AGHT+IFRta8/SfQvcBY4OAtIB9mripqs4z6X28qqGG6H0nQGOiKq9bgrNZS2epuvDdaQMCTGZ3ooIw== X-Received: by 2002:a05:6a21:4986:b0:1e1:b1bb:87a0 with SMTP id adf61e73a8af0-1e606dfe60fmr3973055637.34.1734946982984; Mon, 23 Dec 2024 01:43:02 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72aad8486c6sm7468309b3a.85.2024.12.23.01.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2024 01:43:02 -0800 (PST) From: Qi Zheng 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 Subject: [PATCH v3 00/17] move pagetable_*_dtor() to __tlb_remove_table() Date: Mon, 23 Dec 2024 17:40:46 +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-20241223_014305_176622_1B857FF7 X-CRM114-Status: GOOD ( 17.89 ) 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 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(-)