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: 13930173 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B0A611A8417 for ; Wed, 8 Jan 2025 06:59:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736319557; cv=none; b=sXAJ0DkRXmh0GRGsfF2lQ3NiEeJreJWimRuah4fwjMYygAI+H20d3VTJIAmws0Eqfd3DX2v9qeDdtVphlR4ND0qJHfpEWWHq+Yb1Ms5ayPthVF/TvP/WbXErbMD/JgreJ0SuwBwB3I+MhQ2Vz4RHfOxSkjNHx3NJTGHI4OPpOLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736319557; c=relaxed/simple; bh=EdTs1gy5zYgx6BoMVvtYVm1nCTmCaYsA6ZdI4rTRksQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=FCtay/P7BEViTpAV87ilpOcVMH6zZlYc3sDKRFbnq2mq3P4ZH131qUZIT+ldDswOMlBL4ZnP1x3gtzkqaB0FQTdz2sc554nVOwpYcD/tHbwoW+ebpkDcHfdciFGyvKQYAmq/DOgEQhQ8E5ksOsaMhNx8rgp/nKq82ryjUi+iHBk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=Dqj/YQm1; arc=none smtp.client-ip=209.85.216.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="Dqj/YQm1" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-2f42992f608so19482013a91.0 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=vger.kernel.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=Dqj/YQm1bfzrDP7DQ/Ic9GW1KGuM2dMvaJwVKjeZPFhAtabgeh2VZ9zKIJ3s5a+5oJ Otd0i/ATtjG8HecynSEhahYK2aba6UHEgbi8t2y/NE2FU91cptxKUwRZD5EZ4+rVA4lr wRVdqJHFXig/GgDpGj5DLE8+p7Uy5apd74P9rAWo6wdmHHOBy8zZetKiV7gp95emdlZa HjYO9cJEnGhNHroCbBgtjHkJi7O6Jdxd7kiDXL/mMcQFdq120JyzURtGvDrVXiWY+urw 5ThXXXSBvM/JTLb+skk6PEDTLG5Oi5s+Qp4y2XoXv4y/fOrQE/SXFPVfFffPLrZoztJu yddw== 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=saY0ga7VWrHrNs/a0/qcOdtAz+U5JP4NAXgn2hWE5vDFqjd08Tc2Oy1eZw+MUzBU+F sc7dMq0Ra/eVc1PADaK5uU4Y494lFvOtJrrRI6pgOSonG+i+xjm/JO6bf1NzEcUOyeQH uKtwt07YwiePCU9q7zS1VJTIvEhA8H/Ch5SinQAYLKe9d4nHmOpnVvz2wOyXZCeHtChd Xz54Tl5RZLySFFAfts0Phtfx07PJXCod4HiGQOgQnDcwuqEslJ935ErYBbzWjybweD7W /MxPSdTA77rLlmd8LG8NO16nZBUDcDG3WUNnYZw2MhFVoz6jvcZeKZkSV8pacozWL8wy qG8A== X-Forwarded-Encrypted: i=1; AJvYcCV5mebSRhPFP9C7rEprr3gOmrbdx6VhlMsr/avEpGH6XQxppZKbKecet4pAMJIJnW2TUD9YYhTffoB8@vger.kernel.org X-Gm-Message-State: AOJu0YyE+YMZluL52j1orNsv1ppzzj0WX1jgq4hh/fIwOND00U4Yurko DZR3Js/D9nEFRveKrqctKDyPXF4tt4YiBX7jqohbALihYm5zxp38RH/Nwp3Tg3U= X-Gm-Gg: ASbGncthcm01wnpfIde2yejCZvQxKq0UNmQB+LqxhgpD0mbJCM69PKin515U+i7oHF5 /yoXaebkaafh3obOdtCGy2UqMgQcaBsHPE+q2IgeahFg6e/ZCOHK24InOQPig1L50CXymMsjxFc Y5sg5PTG+4xfdWt2wZMO8o5VMBD8P+wxOEnCoDoYaFdBoQ+VKcnQJ7fV7efxPuuXx+TSKpg515B QYEXxHiwQcWwTnLOPZod1m9mXK+GbaZ8XYVCQBjcSXvO+ZcjrFKkIlNPxjgDLR2OQdVorA7wIdr WQRSZPC3NAdM0qkPJ8O6LiLvREE= 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) Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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(-)