From patchwork Mon Dec 30 09:07:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13923108 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF190E77188 for ; Mon, 30 Dec 2024 09:08:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 818266B007B; Mon, 30 Dec 2024 04:08:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A1F36B0083; Mon, 30 Dec 2024 04:08:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F3DE6B0085; Mon, 30 Dec 2024 04:08:44 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 3E6BF6B007B for ; Mon, 30 Dec 2024 04:08:44 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E7E4D1218FC for ; Mon, 30 Dec 2024 09:08:43 +0000 (UTC) X-FDA: 82951048782.24.8C6C862 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf17.hostedemail.com (Postfix) with ESMTP id 26DD240019 for ; Mon, 30 Dec 2024 09:08:05 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=BlHsZRsd; spf=pass (imf17.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735549668; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=KCS148NFM6neePcbo7P2q7bn6Gnf3WOST+giN1oaVZ4=; b=zHZRjCKGuwnBq7lA1P7f/zHNDwiwxj9WM6bCk5S/Hn2qqn2L/2fTXupqE1IoZsFUrVn36v Lc3hmjp6tQj2EwvkRnPVAZATyHNy29iltIJYFKjORp4VunWeHUDbKyeHRC5GmNrGORnLcc zTI2iSMhubH0a0ZmRpPzExuo47zL6/c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735549668; a=rsa-sha256; cv=none; b=zwYaY6VoqnhJIGwJ3M1xj+7qGrV1fBUxkSDt7z6ANQyEZIRqb/otoSw9rfTAXFp1dgxSGq seG2Ny5zItaFlAJ2n4qqP/lg9leNqBOTJJTTfYsW2IB6Xs30SfC3OkeR6pLCa1szjX56sa bEPBrOFm/52q5Rxoda6APZnppBVsb0I= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=BlHsZRsd; spf=pass (imf17.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.175 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21a1e6fd923so58834505ad.1 for ; Mon, 30 Dec 2024 01:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1735549720; x=1736154520; darn=kvack.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KCS148NFM6neePcbo7P2q7bn6Gnf3WOST+giN1oaVZ4=; b=BlHsZRsd/HohYLPT9evfyA0YkrtnMeWG08b0+stCLd6YAFAleu3L2r5oFs6T8o3rEi KuSGb6TslBHFtrbU6TQIOPm3BHc1eMoXWb7wQwXQlRroMDvt3kazqFQIXxWCCSQtF18n xH5nrC/cStZJ5vJEgoUeqBesy19obP0f3c9c4UJCxFYQPhyUKvogMVRSyznhaVhYXsVF nJW1pRePHSvJsEPwr3LRMtMboIr+sDD4GmO3OwM35yfhAze/dnoqv1agm45BL3HVMJ6g bUYIUKVjje38enGima92l8jH5ME15QBszJPj2xboYSqdoNBQsGVT+t8+8DpLSeKJWyS2 iZqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735549720; x=1736154520; 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=KCS148NFM6neePcbo7P2q7bn6Gnf3WOST+giN1oaVZ4=; b=AaEFZeNC1D9lWt38WzTEz6PG3VretGCRumiYJ+dSZlMNtucXtImjJh+5Gl0By97bdg la0X9UP3oyQaIUn67iuqusM/5TR4iRq7A9hT9yO5lbpFFbIItibc2EH17kvepcUtb1QF guH3itfklb9409SZKLOxWW14wl/bANiJVdP9ChvlNiaM/Si+jhhwpJqzZ2GpqFf2XOAU zgikoLSvoXAf+d5mZH3jMKmvvHB+1yMC5BwKl1JnHx92wxu3Hae7rp4Sq6ar6c528Cu7 oBNM3WJv+omcM+PA89JMA2Kd+ja/33ETH/DeWaCUERSYwYGuIjGqOvg1r5hXbuMxbW9+ 9bfg== X-Gm-Message-State: AOJu0YwR/v8CpzwipbDwZkq9rczTRW4wvwtNLRj78GhLcsmsmvmDMLC1 eCD6tWbuLNTK83jpudppgAQRoGtwxAqpavtqrmrq2EOPA8iQKi8P5sXaUdxVs4w= X-Gm-Gg: ASbGnctbeRKSnq7T48LhsWt5a4StIXbBnREWydElJjx/PEwwXm1jQQ9Ypn6k4Yeoosp bHNvGX21C53lo3cmly1k4tFypnf67gCXN/tHTsgOqr8VLmnDDc6uFU5+FY/OF5+97d25NYmF6GW FSv8SSZ7rwow0zWFifG37W5i6F8xIC2CdY7DQhLBLDHndgMljJJ92UTik/EOp00tUpRVUiKHocJ D3bYgXgIMCwiAsfku+HjtUaL4qz/EvcUcuHw222QT8y4Xn1OCylmaa7rqqKP2I3XbhCOLyUH6/R ChERnR5hjyKT1kZBSb1/JA== X-Google-Smtp-Source: AGHT+IHgLmMaWHwHgL0oRHIhYJ2vWpvY6ebuDt6AqrGAyIjEWzK95W7/7i/VdRxGUDUWQcC+IVrQ/g== X-Received: by 2002:a05:6a00:e06:b0:725:9dc7:4f8b with SMTP id d2e1a72fcca58-72abde30cc7mr45836853b3a.15.1735549719834; Mon, 30 Dec 2024 01:08:39 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842aba72f7csm17057841a12.4.2024.12.30.01.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:08:39 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, agordeev@linux.ibm.com, kevin.brodsky@arm.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 v4 00/15] move pagetable_*_dtor() to __tlb_remove_table() Date: Mon, 30 Dec 2024 17:07:35 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Rspamd-Queue-Id: 26DD240019 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: hnigusgpuygwzywps5spsyjet1mr55aa X-HE-Tag: 1735549685-871631 X-HE-Meta: U2FsdGVkX1/G5GUxVj61bS1ff6ga9GGMhjtTWKo0xzJ325wUyuehxuvheEgmV0xhacV5WPrS6YQ+yX7fXguYFiI9Ao2/2PsyuVByND4G5KtzEkTx7buZCTV2pXlUu8EgaifF2rAegDPgO2DWA5R2iYlk9FGPz4GERIb0XM/Mi4gyXJRpyzSMXrgMrV0hupSoXScakvjzuXckE0bJpcmDFVPefAxQgQsFgDH0bScEfyqxvnBYwY5Vivnp1HPuND4IrJBQhH1Ig5j+b6vmVsye6Q/4ILsTf0gk8MTWYvXUOyShd81DlohChlAzBmC/N+hraNJnDLaMtnpQz/Gu0cVDIOycPBkkRcNMVo9xJHYGC3Z16cu2C5EeebR2LWX2t9fS0isnBOvOlSAB3BqXEoEEvYrnvsQMt+Lvvk8EgCA9seANsDsBvq3atIyhXhXFA7pLt4fKL4MrxIcZlt+kIzCnTyHwpTcImmXgRM/FbwsWhZBL3yKyBldoTcv0wvxNTxddBVZkJfw0YPKSx/6oHEKSxWiDSfQlB0yXBW+ZYVOpX2pW6fA0lQP/9fUeaGk2JiPGl/enjI9QcU2+NrsQwOdYJgz+Ni6QRQOxhc/jgb75zwNkwXkmthKc8El0Ri5SXzBz5NrhHoTN5IeNw4RHpptEUsdD0wDOcoF7wwJSOT46raYUuHpORr4SrpEBTO3rp9VEsagBAgmBvl9DZx8RWUUlhoUHp0LHxqbou6AaSglzFM9RVgwUq23ZvLMo+pW2tm7dvJJdnMnADTGx+lptOyesR0K/8zmyYi5QUDX3ID7biTbsFK6D0QtLMt/rtxB4ZlNYxBRAPc5Qzf7tXwaweIbqy5SZlgjnufdfpaK0DpYeF062bGnbFZ0knBGpL3zRfyzonAvddkbN8R0k8X30A0xfJRQZzzq38+OmmQZEnbQ4rNr9CI4q7vdxzEzVIIK3/AJLMk++9s/8IgA48ZfuTqq XF0KrCGy 1ePmLinB37MDW/NouxznDbEZEL3wvphrnZ6xO9n2Kzv0n9OWQT6Cj33QY73hVEOvnzcY3kMQo49WEaVKfRLLJPw4dOEViKHzz4QOroiGcoggdW8h9rv6ZiGLT/fwmtZtv5NnhytjzcOBTyLnre4L1UZJkDsr0yWRqkYjfPC3y2dLPBkk68MdndkJfPEBpI3w9ZWhh2L2vFzqYreRLqxPjduC3Z+xyprW2KOhVUY3ysKxrcppCJ8KjllFgAB2tfHqWmpLWcTPdKZMzkLJDiLPvSlifpzpLN+eTQ2F0sJeWmYohWYb3EBIofd58OHDbYUwAVb1kOjklLiJ+819sZzkvl7aIo32IQXZUfPtygtUJ490olYkIJM7ozE6v5EQT8fIZ4ZPd4RYmQ+/VsjH67abG8QNSrjOdmhrZWDuM8LyUKbph5vqlig3vBZMHmtrMFl1YaqxZ26EFQwb9vKa09RHgcoD8Bt0Qcj/aykxGCzUXOiaOvWSknLDxoZ5VDU/V2q2hAo7rxlp3lDcaYNsSFMlgf0/1A9ji1vSOsduiP962PkuEQ48rvS2ABYFj8bB7ocD6GpOB7THffj4jXDVn3KEE2WySOp62VDCO7lMxvVrEXxHmwSVkA/paZo2DSQbX/YAPIdmM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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(-) Reviewed-by: Kevin Brodsky