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: 13930191 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 57240E77188 for ; Wed, 8 Jan 2025 06:59:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E2F36B0088; Wed, 8 Jan 2025 01:59:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 893456B0089; Wed, 8 Jan 2025 01:59:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 70CA16B008A; Wed, 8 Jan 2025 01:59:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 171AA6B0088 for ; Wed, 8 Jan 2025 01:59:21 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 5DC921C7BCD for ; Wed, 8 Jan 2025 06:59:19 +0000 (UTC) X-FDA: 82983383238.24.AD6A0F2 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by imf13.hostedemail.com (Postfix) with ESMTP id B314B20002 for ; Wed, 8 Jan 2025 06:59:16 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=bxotu633; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.47 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1736319557; a=rsa-sha256; cv=none; b=JsREanm/RfHjhGUznR/NFt/dSdxxHEzQr3xYHOW0l1gCjBF4M/THUMB/tnRdIAoYt7Lrfn hdNc7LpkFw9iLIpXB0/R90Ty0SeBMYZOdjV5Z17OuOXlmnV+kkoyhxnlz9get2C67qNYL3 /ecRIEuVpx6xtiNV0hoKCKws+Pi9gBM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=bxotu633; spf=pass (imf13.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.216.47 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=1736319557; 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=+oUJziA+3SIeve9hH8p/SUshEWFM4XR7pFGccDfjKoA=; b=ICYitZSvpzxIHDA3U9Thapy4zTBuVbX5UTyz5aLUaDWDw4lq3f4ycz+phEsj3GxzfG1Ktj pfAn/3L1I37/2ADBQmjYPU8Upc8py7EeV3je8zM13ssM6OqOfqxazQV5FnDqzDhyoIrbIo bzDmmJLKsxNZF+CIULWM5/dsmKkAh9I= Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-2f42992f608so19482015a91.0 for ; Tue, 07 Jan 2025 22:59:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1736319555; x=1736924355; 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=+oUJziA+3SIeve9hH8p/SUshEWFM4XR7pFGccDfjKoA=; b=bxotu633AUXOsT5hLj8tVP+PYXYsAuBM6p6e904opxO67GzH7u6xKh+fZ1W+h1kzUp EpqHinyOwrYVdnx7s8BfUhVMBtxn2FsMBWAA5fK1GnY2R8VXFvmyY8C1bgzrDDvYLOjw dzQOzrjjIuWstxn3nRd1mXC617Dl/UTdVG/2X8PqBFWSIQhviWTd88HSi4zoNgWxk/5M eRlSW6o6f7fraRe8oCjTGa2n4uwAieM40diuxdDKd1IUJRzWuw3dE5YWWG9E+XdGlF4l F4dN+enI+CWsnp9VTaVql0p4bF6KISajT2v+o/RfXM7Ojp/WxB4iITuAc3hUrQ032Z1m MzKw== 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=URxEhrabLC1YcHg7iLgnCKLCI8dkwrCvR+2IPycQ0mLTZh4R5val5SnENA36z78+uw 4RO00kyoVvRDj7igUVAlhZ+eNR78rwt7GAvC9kJJ4w1M5t+4xxFfjooGjKvfKRadp486 DXyXmg9xA2gcNWUOmCKc127ygO/rX1Z77I8lNkBSqYiW1TNToyslkTt2kFkkZUAkpI0C D+7uHZPRal5jSyLyAqqkplmmC94May8BO6HuftUtS5ZvFxzDShSEa/QWSloJXRNRItbj A+8cerT2silmwN07S8UBJUdJ3/oKlUucqnLNW43zuVjcyb89E5SVcTRUke4v86T/maPe Txmw== X-Gm-Message-State: AOJu0Yw34T88SYrx2WdGDYJ9WXr2t9+Ak89LtUfzbWVg8xAW4LNrplq8 Hxdsa5NHhZR9eQVDcZuvfgM/FWKuOJhhPSFZH8kZaUwkoYdwfDI+yHb4Ik5gUBE= X-Gm-Gg: ASbGncuMp8ljPTJknb5uYa2L5arYBfJuHJdfpYc6nLSKn/Fha2Qn3pOuT6Y2SN7azQ+ fFhyqPXWXAwJXzU87X7FeiKQIX5JWzp/5ZBZLIqKe+m63hHwyUxO7Q5eqDWEV9rHPLY5Q5P/umh DIk0hin99HUDqleF6CObzYBNBmpn15Xbv1LBp9PwpG/0ucGzxuBK+WyeQTIRywPENzmxPSa9UMz d1bxfxvcPqiROmjOOVKaPmAZ8AbM2h+GqwD8jr9HE42LWcbVQfQprzCe6Rv7YUxvTmYIcuqEtkS zi1I/3VpFTpTWqS4Bo2xrXfDq7c= 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-Rspamd-Queue-Id: B314B20002 X-Stat-Signature: gpuq4appap1xgom1m3tqnbu8szh9711s X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1736319556-700201 X-HE-Meta: U2FsdGVkX19d5p4SyqDXd5RfpBGVEBNnrYGs5w9SGXVScwhe+SMYovZ7FiHXjwXqaSNDRayuxZEKyS0zrvHRHKYdVpZNl0n2FRIj7jOwTWdCtY75YzbMiLLd0/sEM2MXahwd0/o9CzbfVvP0f4qIXJJcgjNuio+aAg6T7SjcQzLj9MGh/4xRAQfPFW3WlU1pJQFHihdN6i5UjlCS+l047F8xMNSCuLZ501QaKQbpHOo//S0TB/i8wBwQS5wTzVdI1yL1f4n7qGUVuVTVpnF3BU+z1cw5mn7P5AWr59T/7pCD/oSaIFJl8PyEyA8nwUUxdTG1oCb6n97Vl9KGNFFvrMXLjGFCfzbLchZL1xvdBoLEv4DT+880qBZVikvQrWjtphUNvk2A3idj9TXcrtEdboPnq6faYFF9XKoKtW5NTspsD8H/+391lw5bUEwwZ1iQgl3/4TsbjrJe2KU/7Ub2GmdNKx86TvAWDedyTlnljlCaVTNTdj9/CROdnmUA/2P94U8gZa3yi1yBYxHUkG7m4x4OH1yFe0BxVmE871Kmkfl8i209x6y/PvEOZFzT3QCJGBmt31Z/k0l/p77DIqhO1ZAwsJRA6QJwWyuUIcdhoyG2bi0BiNdP5w1g7N5/gRdIG7+Gs49wdBc6ayaRNBiCBpelDAjqWB0nGyRkB4adk6+eOSQR63HHAmqNNI5ytWFWLAIiI8LPS6NafHBtBRoV+d80mppazYgYPRoClII+mJzs4wUuJne5AoXb83v4SVJlQNnWRonqBtICSSmH38VmPtqbKk8vQIxm7pqztK/W5nLJ59Qt7/hG8YMoLcZD8r2174TQpuYxV1IthgpUCTzLGXfVEAn941CSl0aqWoX7R3xUrvionFwhZNmGLv0tYTGzwpX3HvL+rp/h0MR/iFJ1RkqrfRrIKbdWKTRaDXnfWND6huaYKtKtdG+rvTQTzWt/UEvsGDXIDFwO7GRYNnh QdzmtXJX kxvhemKswgfnHKRXxvzj3z/LOtTjTXyOiUYwPZvXdQ/937UbFZ9iZZdEpQWxGtVRewK9bI+yAAN2ytpW2dRmQV2bf1bk9qjQICMuENDtSXbRQ4H5N4Cn006acRHqMuHRWataeVaPBcBM8d8IWJkbWJBcJnJyJnHJ5y6asxpnZraUi1hW1d0OI5Te14NI3JaSaCJsXI94dx4GQoQP2bahTSo/oZTDU6iWw48tALKeDq2W3Ys2FDi9Fng1tIabqaDUw1FDJCW+ADixdGX4cCDCm2JTbv6eW3AtBNDy8bXq+24It0iZLKF+c1QvYNqEz3CWaoapaD4vKQUzMrOl3xEPNKHKJJwkJIORpIsr+3ugII+3E0r5jHDPqr6wPzGKQwfqWkCUXDxtUMb+RmqlUocqB6M6m19hO5CJX7b9h3VckbAEqBW5nMN43Z5HmEWsuwngbDwRd+Ar3UT+8hMqLvK2BgpjtJ4WZ2DFBPC/njqRfWtu+cPS4pIJYGXqT6Lu4yB2iDSgGPKKjMqIIQBySuNP8Pa5HY/9QEsDwJIrefd2z6D1kPKAQdc2dmb/JVKbhfYz0LwV+H2SaF84TbTD6Xi32vx8+pWw3uZJDoYHJ8H69uOQ3gnObtt0vWoq/Pk+1GWFJeSRg 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 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(-)