From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (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 0526C157A5A for ; Wed, 18 Dec 2024 13:05:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527111; cv=none; b=lqXdB5WmqYScloLLT0q//GvtxlFXHB7hNjdCNA8K6tgfCUnqKU4uwC8Mduf6c1sLwzcLAjzr/MnuvC0cE5N0+6Osl3e6OizMGScp2f7wohuNi8IAC3eMgiSkYVWjqbj3l0y9x7W1n6fjZoG3FOnt8Lva9FTUnnGELUXmsY92rcE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527111; c=relaxed/simple; bh=0tL6SGfYqVE2iHthsZccYfg72+kHwFTNtzPJ3TzsgZ4=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=YB+0l6UgfR/4gzFjY0vmvK/Gcx/QNTwqWWKjweNjH/bRDgbDFlo7k02yzyEdL4D0z5zOwgKBmtxuD912mqiGHc4Tn1ErrHuSzTNTtkuDms7dQouPqhgNasyQ+9mL9U0m1ZaEq+lLqW7uUGG6ym6ZPGXYkb2l3w5R0wovai6wA44= 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=AW9FBQvQ; arc=none smtp.client-ip=209.85.214.172 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="AW9FBQvQ" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-218c8aca5f1so23388245ad.0 for ; Wed, 18 Dec 2024 05:05:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1734527108; x=1735131908; 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=WiEONMPazeHcIAONxAFAw/Gkcv+vbsaJIFc7nuITEBQ=; b=AW9FBQvQKdxQBvM1JhWJnifybT+5EWQ3MSL38At0zfJtoobUVGm7doDOcVpr3Q6ey4 NmBGi2Ax8hfulH4FJPHUcCu9oXsMkpZqYf4R/q9/dyO32q0zIdBwQ1e3LPkTo9XSOnbk zIRhUsmKZk/nT+F4bCCV/1R0pcJiRwZQlHC0S5/1egVPs6HDBAmscbfvcmWkb2gYQgg8 V4DMLgJjyL1h8roWNdHY0An64irnLR1RmPL+2qiZCvfFZMa6BkMzl0R7+HzXri5W1u1Q CbcBqkzVfmDdjx5sPHBoJ5tmI1qRp2oVQZWjtGv6c9G01MuJnU0nyzqy5+M+ZZ4RgjaP 3PQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734527108; x=1735131908; 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=WiEONMPazeHcIAONxAFAw/Gkcv+vbsaJIFc7nuITEBQ=; b=UBaUNGdmxai3HEs8UMDLlPxMFeWZnYtYwjoo3r5whirH+euEColZ4zeEp2BYKIQ3XN S0V7+gF/OniqP7VruPL+v1xaVAB+T9EXlMIo4ZOOglladjOungTN6SDk8hw9IN57QA1A h4KzcPNoAJAvxnGVptx4+uJFq/nQvT31fyV0T4GyJ50Ba/eUrLJUSSCIWyo8DfwJ5Wlu TVp5eYoYjTPjyhyunX+azZ4XEy/3PcAz8bxk699Jibfi5OIMxnrOaXYIf9IgneNi151K dphSjbY9Tm3klPe2ZXR3ftkSR7uox9b0UpBr6IzvtKm4Fffi6puN5wE7bD99KB6zo5GB Juiw== X-Forwarded-Encrypted: i=1; AJvYcCVngmKn0ywAj/7O4hfHgG60HYCwi166JLzRUFqVfQy9RyXBIWtf3c/ltNS48fTTCPCHpRL+BWDzlsf69Uw=@vger.kernel.org X-Gm-Message-State: AOJu0YwnBkw9g3YG8Zh2+CZBrqoeKDRCDSgOulSKQKmb2aymg0m4d8jp tvHDxwGzXVjff6YrREDS35Hq8es1ZOwjud2ksUOjoYqfk44h5zm92vrTL3zTmmw= X-Gm-Gg: ASbGnctdNDjV6qTgijct2PTv7mJ1N7uXcpYNsNJmgLABP238ehL4PePhO+xJ3C4/kOf vZgcnAhrTz8AsrTmfsBbpQOjsKZplCWhQNzpuErBqEMwrNV5py8E2Zwzm6c/2qWxetqO2f/BCOl wdy4802Ag5uOW7bszpxFGRP/BrdYou1McaMtkWwiQBOsJ5lx7qJyJLBZM0wYAmnr8XxcebgYW11 vhEjavoR5Ef0or4PhuutUjGHTNauAbuyK89EIC12MlBReNy7AuKhaXvlrP9TdUWGNVgYJhWB4kv 09UPPP/KTRgDtxk8GnA8xg== X-Google-Smtp-Source: AGHT+IEcnHJkEaHNyly9J7O9EGZK0KKB7FcVZXYeiJvyZFmOr6EilhlGu4DwYJ0VLCmee1DoPSpVpQ== X-Received: by 2002:a17:902:c44c:b0:216:69ca:772a with SMTP id d9443c01a7336-218d726d7d8mr35312535ad.53.1734527108178; Wed, 18 Dec 2024 05:05:08 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([139.177.225.238]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-218a1db755dsm75751825ad.42.2024.12.18.05.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 05:05:07 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, 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 Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng Subject: [PATCH v2 00/15] move pagetable_*_dtor() to __tlb_remove_table() Date: Wed, 18 Dec 2024 21:04:36 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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-20241218. And I tested this patch series on x86 and only cross-compiled it on arm[|64], 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/ Qi Zheng (15): Revert "mm: pgtable: make ptlock be freed by RCU" mm: pgtable: introduce generic p4d_alloc_one() and p4d_free() 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 | 17 +++--- 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 | 57 ++++++++---------- 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 | 16 +++-- arch/x86/include/asm/tlb.h | 33 ----------- arch/x86/kernel/paravirt.c | 1 + arch/x86/mm/pgtable.c | 13 ++--- include/asm-generic/pgalloc.h | 68 +++++++++++++++++----- 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, 255 insertions(+), 321 deletions(-) -- 2.20.1