From nobody Thu Dec 18 20:18:29 2025 Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) (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 B68971B042E for ; Wed, 18 Dec 2024 13:05:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527154; cv=none; b=S0p/Igkosy+l7aVRm0uoa0yc1jv0S+dlIPwvWDqqF6t/4FMoC0Vm5uq0dYv3aBpk/EAWC617TJhp+q/P4KEO0/3aGBWVDYSQtxATZaKPKGfdx0J7HliTpvUz1EHGJRwDXvcVrBfyqb5vYTjkIBD/GSwehPZ7poI5T94ozu5R8Kw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527154; c=relaxed/simple; bh=H/x1u07M3HXF9oVd+o3reuerQgd2pca8MMjlY49GFUc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QcCGSAsMAYsHlcOdYuo0rMrSl7nR13BVEVeUCxA4cJereHRBqq0qsa/isHiyKO2+9NQFge7qqY0sqwExcUuA83rD8tR/xuTHLNuelxunLI98c9TeB6rQDEhum4vDCBAKMFZY9/n7ksbKV355A312Tm7Jlqm9RD+mz5Rvh2zuE7E= 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=LPmI5lFU; arc=none smtp.client-ip=209.85.210.175 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="LPmI5lFU" Received: by mail-pf1-f175.google.com with SMTP id d2e1a72fcca58-725d9f57d90so4827079b3a.1 for ; Wed, 18 Dec 2024 05:05:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1734527152; x=1735131952; 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=qA0mhWnXo6upWemI3POPEc6VJyAkyxFJggkOB6WNq2k=; b=LPmI5lFUqZD0ocomrR73yFWz3Kr3g0JV5phlLfgkCyCoDr0MDFu2qY6roLwkAdzSMj O1CRVi2a0N4bkfZKQKo2ipFwVcqeRdjvGHXZ3reW4h6Oc6sjDgtZvqKwTzsa4hrQv92g zPpM2tQYq1+QG2LFkQb0vjgl4Cn8P+mH0lhVbnj1Ey5uNOt9xbOKx2tVr+SQSvvK/eFj v0arJZcLm3R704fc1vuCl7aoGxFAPxYdnha8/E1cpmrC2+zAVxaA3dwu7F1YyriYMZPI +ALjILfNTKc3tm6u0D5Ofl1RirbFWlodys+o3ywudohKMDUmhpmp8nlh9Ian9yI50C/L px/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734527152; x=1735131952; 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=qA0mhWnXo6upWemI3POPEc6VJyAkyxFJggkOB6WNq2k=; b=I8SSs3h5p5jxAWPmva+atKNlfKmIGMoVChA3+XGYQLTo4/mK2qyIRFVxR/wroIJcgQ 8US3MR0mAGj+b5pAAMcR2VDdezk0PGajeUInfX/tAI9BDMZhZFONTIgYfPGrLU4gzzjz D0HW+nRIiyAiv/0mRg7pojY7tue5Mi9qtOI1OXVtFxmsE2cGNpyu2EFnSHwZa5PV4Hry zCkD3QUPK49xT7ArlQMx2xM88rTlnEEa//JP8JHnU21Jw0UrutZizTrQvjZpgpEj2vqD cI6cUccI6YlfCfGUN5/+90hc9ucsX/5p/HNmxSTisaOVpaTjSzUbrnbuPIuDhXLMEVnN qldQ== X-Forwarded-Encrypted: i=1; AJvYcCUqm+gNOn7ydYXBmkWif7yS7a1sRpk+9v20/Wq19ggsEoNnWag21jFhDvR6iIfFCHQ7is3T4YGdsCQ1CLw=@vger.kernel.org X-Gm-Message-State: AOJu0YzWgZXwoqoXZXWec7LMFafzCw9j6EKnGWu6J/04derMd+X+Tluf /uITESQS6ZAFGdptuq+Ppeu+HRSUekxhGsc6wPu5xc9mINRihX8ehSfRkdCc/Ew= X-Gm-Gg: ASbGnctJCYybW00IBzzZJb5aqKwg+N9SmSM0SyQXyTcTdg4KmYXLStxMwxf+R0KMuiv G1FfxhaihBbGqtdRIu5CDIYqpq8tt1foB0Lo/BLLZfUuvYLCvZUhK4n87YY6zJNIv6bQURoBPyU PbqktP/CtLuxzK5cg7aCHWLBaquATil0EyamYdpPp/S5HzkkTFtqCUpIl0XlnbDvwHwv5WrNOPU msWMdOwX3wiZlNOkATMtq6JfmlBvbAxNjfdGfYv4GL++GZWXrz7jRMwK/ApZlw48dZIq19X9OBY bydusqotqkIhrof2bwoE2g== X-Google-Smtp-Source: AGHT+IFdeNYkaToIEDdUvkBTd8lP/0QrRZpL4HARu9WlaN/FvfyhXaaWSW9JhSu0jLr2tRkQ6EUdVw== X-Received: by 2002:a17:902:f68d:b0:215:b058:289c with SMTP id d9443c01a7336-218d70fe050mr36430515ad.8.1734527152123; Wed, 18 Dec 2024 05:05:52 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 05:05:51 -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 06/15] arm: pgtable: move pagetable_dtor() to __tlb_remove_table() Date: Wed, 18 Dec 2024 21:04:42 +0800 Message-Id: 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/arm/include/asm/tlb.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/tlb.h b/arch/arm/include/asm/tlb.h index ef79bf1e8563f..264ab635e807a 100644 --- a/arch/arm/include/asm/tlb.h +++ b/arch/arm/include/asm/tlb.h @@ -26,12 +26,14 @@ =20 #else /* !CONFIG_MMU */ =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 #include @@ -41,8 +43,6 @@ __pte_free_tlb(struct mmu_gather *tlb, pgtable_t pte, uns= igned long addr) { struct ptdesc *ptdesc =3D page_ptdesc(pte); =20 - pagetable_dtor(ptdesc); - #ifndef CONFIG_ARM_LPAE /* * With the classic ARM MMU, a pte page has two corresponding pmd @@ -61,7 +61,6 @@ __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmdp, unsig= ned long addr) #ifdef CONFIG_ARM_LPAE struct ptdesc *ptdesc =3D virt_to_ptdesc(pmdp); =20 - pagetable_dtor(ptdesc); tlb_remove_ptdesc(tlb, ptdesc); #endif } --=20 2.20.1