From nobody Thu Dec 18 20:02:25 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (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 70F3C1ACEA4 for ; Wed, 18 Dec 2024 13:05:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527160; cv=none; b=u2nroRtV4UdHnd4jeMxgKxCPTk7BAAFa2cWEaCelA9QMs2Y9tdIt2SUZv2VsBB+S+MRhmZ280gaMc+1adRWKqz6kD9j1fL9VxKVFcALHm/YuxGyGWsxQ2IHptRyAHRLNAyOldfD1PuIUb43Xt7dFxU5dns1A8R14p38DJv6WlZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527160; c=relaxed/simple; bh=w9Tb6kkg2Q49UGEfUZpSUyo28N/wow0+21NvTYUEzY4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=eoyReXOqdsicocdiD3e6SDjMPmAnWmqSjdmRhOP3xPaC6FN5E43p2R6x5X/0g2MW5/zd9zhcaU2zWbXib5i6CjzzvU6cjjepwKq9mD3Zvgl2bdOsJ5B2ikF5aLUfzQGyab8aIcI/8yUav1dLc8yp6s+98C1FtHb2EKsUQE1601Q= 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=CVW+sNjP; arc=none smtp.client-ip=209.85.214.169 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="CVW+sNjP" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2164b1f05caso59754195ad.3 for ; Wed, 18 Dec 2024 05:05:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1734527159; x=1735131959; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0nJ0bdEaVLB0+13gaCQHdoBfFkuXXT3Pqta7GOjv8Bo=; b=CVW+sNjPZvAmtWDJaIy/lGCJUcCIMB4cYObcPLoNf5ONmwiIoEJt26j07aBce/XCkG HUjczFX0BDSaloaaHRC93wE8U/wPbngmblyKVrFa7oKcWB6SKbiOlO/GlRCAlOM1+6ml D+MjZSIxqpQpZdKzyKu9mL8kd8EHDsrb7KWr+CJeKGtpiWt7FbgKJHCwDvScQyBc8c7n rDNMt+F3/GHYcsyMgZDmnWsRm4MXK74r5mgIi2v8y7C2fPyHnEY3NhHc1fCY69ZeHHAz 3rTLfMd+lTpTbwLEoXNdA3cqlLbMKi7aaAKyqHOa9uaQNv0PEbqCRymtd+pzR0C2uv0o fTDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734527159; x=1735131959; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0nJ0bdEaVLB0+13gaCQHdoBfFkuXXT3Pqta7GOjv8Bo=; b=Hza1JT/ymzxjETsJ9AEY8y37jvIBhbSAG0UszmlkeMIbKa7eNNMsf8X1KwHYKWk5zV obn06o8LcuNA+JaaSBVgB08GyqLZKDbud3+YGv+sK2rs+QfyEjaC259xnMuQmeNJX8/H p2zDMvBgw9RTDloXRX3+MFlOq47eeXOVA69U1sGEnFt5C63QPvvLPafrWiPkX+uc+T0I Ag0QyejBDZscVFRfoqK0TAa5dYmbLQHlJN3npbYUXkelQkbMutLiFlYez6MOGmz4l0nY rPf+cZk5GcIh3Ui4WJwySJPMTI7b61nmbXLHaGvtzXH1GMZrerQ3QKB10r/FVxuiO+ti yimA== X-Forwarded-Encrypted: i=1; AJvYcCXUmuer3lePscQ8G+xhOPMY/pCNyztIanINfFx5HM4jfR9WFS8TzVuldsvq3N8TYQ9X9kYv4MbPJ6V0vRQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyvBt4odePQ4dorGgOLijB/jz7hfGM+bxWEyhDDO9w4LTsnbqNX XwDuU5Iqk3etxlcXjp8qedoeWPNONr3/uIgSJUbdyXkExZL7e9v5b6uyx2JRTxY= X-Gm-Gg: ASbGnctk+CCt+mY3X1anSLECXWwt4tS5PMadHJrl0eeh/NDaKcT1eZtQt/I3Ipprkkn MoiX5aR+LoxSnTZwF/ZudknJh+Jq6GJ688YcrAywNqYhbQMOSwOytORdiqfGOJ6rSXhaUCJ+0Ld OZXmU3RQgNzApJVKiyAq+VsIpzlNhFnEhJ85V1u43sVVMt+LsPI01Unag8nQ3R6GlrRvapto8Ua Qkw5Zmk6ZstR1XIzbTRl8KayiqaLg28vdKqpSkBD6XFyOkAtYDv1IIprItzCqh1kj1vdDzeNJ8N Df6cAbg1Qj/eN3q6N0OSXQ== X-Google-Smtp-Source: AGHT+IFH9P+x/Mfn/YDKtSKvkH1s3GazvpYiwIZf55I8HG6lzpeJuaV9oSxqUwHwuTwe8mBCoFXtDw== X-Received: by 2002:a17:903:41cf:b0:216:4dfe:3ebd with SMTP id d9443c01a7336-218d725ebd2mr32859975ad.50.1734527158730; Wed, 18 Dec 2024 05:05:58 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 05:05:58 -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 , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 07/15] arm64: pgtable: move pagetable_dtor() to __tlb_remove_table() Date: Wed, 18 Dec 2024 21:04:43 +0800 Message-Id: <634f0236b4b4effc528b06e108b7bda51cd0ea2c.1734526570.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Move pagetable_dtor() to __tlb_remove_table(), so that ptlock and page table pages can be freed together (regardless of whether RCU is used). This prevents the use-after-free problem where the ptlock is freed immediately but the page table pages is freed later via RCU. Page tables shouldn't have swap cache, so use pagetable_free() instead of free_page_and_swap_cache() to free page table pages. Signed-off-by: Qi Zheng Suggested-by: Peter Zijlstra (Intel) Cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/include/asm/tlb.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index 408d0f36a8a8f..93591a80b5bfb 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -9,11 +9,13 @@ #define __ASM_TLB_H =20 #include -#include =20 static inline void __tlb_remove_table(void *_table) { - free_page_and_swap_cache((struct page *)_table); + struct ptdesc *ptdesc =3D (struct ptdesc *)_table; + + pagetable_dtor(ptdesc); + pagetable_free(ptdesc); } =20 #define tlb_flush tlb_flush @@ -82,7 +84,6 @@ static inline void __pte_free_tlb(struct mmu_gather *tlb,= pgtable_t pte, { struct ptdesc *ptdesc =3D page_ptdesc(pte); =20 - pagetable_dtor(ptdesc); tlb_remove_ptdesc(tlb, ptdesc); } =20 @@ -92,7 +93,6 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb,= pmd_t *pmdp, { struct ptdesc *ptdesc =3D virt_to_ptdesc(pmdp); =20 - pagetable_dtor(ptdesc); tlb_remove_ptdesc(tlb, ptdesc); } #endif @@ -106,7 +106,6 @@ static inline void __pud_free_tlb(struct mmu_gather *tl= b, pud_t *pudp, if (!pgtable_l4_enabled()) return; =20 - pagetable_dtor(ptdesc); tlb_remove_ptdesc(tlb, ptdesc); } #endif @@ -120,7 +119,6 @@ static inline void __p4d_free_tlb(struct mmu_gather *tl= b, p4d_t *p4dp, if (!pgtable_l5_enabled()) return; =20 - pagetable_dtor(ptdesc); tlb_remove_ptdesc(tlb, ptdesc); } #endif --=20 2.20.1