From nobody Thu Dec 18 20:02:26 2025 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 7C9E61B4258 for ; Wed, 18 Dec 2024 13:06:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527182; cv=none; b=iFnmbt+FSlOns3qmnKsQTLIgQEMhq3J3JvPlQFb+Tpa7rUHJP9VtEL70KX/byZ6kFlM0wfmPElOqBn2QiM609Nqa9DdJO/uXxm2LWBsedzwF/uIYSOJFA65qY49DqwYg818+m+ptaL4Y8aqHeHI9LTPrOrUDegXUtg2/UYHIzv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734527182; c=relaxed/simple; bh=EkdNyEu/xMej7Pyo7zL4QlgTElqHC2seEuKnGSW3Tk8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=G9WtITU5fkff8zChL1H3AgWjx0dt7f5R1lc8uZiZhUp2kfAyNKJf7r34bys2Enj8tqQfbPFImbiS+XeQt11gE2H7xaoG08nHctw41hi0A/zthSg5nixT9QuhkCvvh8Vrlqf+L++y4U0ssmiCl/aNIskpYm5ej4h+2fOY1t3vpeM= 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=MH0oF+G1; arc=none smtp.client-ip=209.85.214.182 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="MH0oF+G1" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2164b1f05caso59760315ad.3 for ; Wed, 18 Dec 2024 05:06:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1734527179; x=1735131979; 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=3Ahoctd41Xu7L+7olWYCaTwfCpap8BqbvCHiRFQm2vo=; b=MH0oF+G1vSbumryty/6/5cVbka9T1WBVFiQ49sPhATE4mEsSnV4mzYmEGUHSrkqPCw t12Ni1OsgKWI4/MOsnwRZMZeIFt/VDBenHhFz4pfXGM4IhCIXlXj7o61h+nLpnnL8H+Z Oc7SFnpCxlrhpld3STpkcYj8kXoOjOqLwSZu64A52vgjYVM/FRmMRxT809cN1pBTxjH9 Q5fqENHAk1TaTLopc0Rm5r5n1MxrYeiosxbaZNzm1osWXXA8ByC/Ye9X9CIqazR9UqEA f4FFoOGPny6kkPAXZio+UcW0q4YDhG4+9Rd35LDB5NJW85CgTupRtltdCDRzIM1tueW7 1aOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734527179; x=1735131979; 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=3Ahoctd41Xu7L+7olWYCaTwfCpap8BqbvCHiRFQm2vo=; b=kNV99ZrVq4Tfbew4/gDjdS8V21vtYvRtnAE+rn2ISxP4rPmr5/a9DuaMQF51GKArUl w/X58kz8GczpLGZUR1Ckatd7vx/o9VkthL9DZU1wFeTZt52cHi68pQe7rzigL/rHAdsI 6NTJ0tbpk9ocTBXyPsAB/Z6qlBeIzWuOVV/MR0SQEcqSoSoqdDH+tt9UUsskMyUr2Oe1 NgXGGePt3+GDzN/5piTC3185TN2WDvdG4MwkX3PKSTVlbsADZaiTsgQpzxL56kr5jBlI MKDq0fSwd7NDLu6Xtml7REdT+gKa/DcjFQd7uB5AMDNMuAbkg0VL6Z7f2F5QfAdW8y5L Km1g== X-Forwarded-Encrypted: i=1; AJvYcCUYFMYUQZCb/MHhM7xewVPxmocWapQnh2Em8mfLHmDVNTKg6bsvE6BwzsuHGIfHf1PKpT1EEq0m/OkszCI=@vger.kernel.org X-Gm-Message-State: AOJu0Yy8IaJr7v5SlRnfCInVoU968IdElfJa5a57EtCogr0gTbGbaTzU 3g0zYnWCNblVCTNJNeY5zlWEA4m9GzlaL7totiC5uqvsQVLkxxmGHcLwqpgvWSE= X-Gm-Gg: ASbGncsISCOyUZElBlCXDg0v2ewNNQ3Jhq5FKjhkcoEdJmQVoyzcPFGooZEhBB7OOlw /N5xPB0GUyNhCmCMMDdCzyT4x2J/H3bc8fR7ecWeEcYQFQXJittgksK3KeYpFH/MZccyrBVyr1K WgmcIUmYwT64JvBaoWlIXrvaLrzZ69xAds+4W9Ae4enU0BcEkYK05NtpVp9PEPdMwEzLE/zF+kb 9RE2rmYMBm00XTCDIAfSm3LN/6ni23ufV3SpWGLf7UoxaLsDYAU3YKZfAW/9xc1baiGHsz87EkQ kjb9lWoNl3zYoVjh/aw2XQ== X-Google-Smtp-Source: AGHT+IErwrhCem5fzBI6a6wl06mNTQ9yKVlkmz7hDOEqq4HxfcsAp66u7+2R+nQ/CreR8BGTw2JG1g== X-Received: by 2002:a17:902:f646:b0:216:393b:23c9 with SMTP id d9443c01a7336-218d71fd765mr39074785ad.29.1734527178847; Wed, 18 Dec 2024 05:06:18 -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.06.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 05:06:17 -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-s390@vger.kernel.org Subject: [PATCH v2 10/15] s390: pgtable: also move pagetable_dtor() of PxD to __tlb_remove_table() Date: Wed, 18 Dec 2024 21:04:46 +0800 Message-Id: <0a6caf8305409173b5d41dccb6ecd46460cf9c1c.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" In s390, the pagetable_dtor() of PTE has long been moved to __tlb_remove_table(). So similarly, also move the pagetable_dtor() of PMD|PUD|P4D to __tlb_remove_table(). This prevents the use-after-free problem where the ptlock is freed immediately but the page table pages is freed later via RCU. By the way, rename pagetable_pte_dtor_free() to pagetable_dtor_free(). Signed-off-by: Qi Zheng Suggested-by: Peter Zijlstra (Intel) Cc: linux-s390@vger.kernel.org --- arch/s390/include/asm/tlb.h | 3 --- arch/s390/mm/pgalloc.c | 14 ++++---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h index 74b6fba4c2ee3..79df7c0932c56 100644 --- a/arch/s390/include/asm/tlb.h +++ b/arch/s390/include/asm/tlb.h @@ -102,7 +102,6 @@ static inline void pmd_free_tlb(struct mmu_gather *tlb,= pmd_t *pmd, { if (mm_pmd_folded(tlb->mm)) return; - pagetable_dtor(virt_to_ptdesc(pmd)); __tlb_adjust_range(tlb, address, PAGE_SIZE); tlb->mm->context.flush_mm =3D 1; tlb->freed_tables =3D 1; @@ -122,7 +121,6 @@ static inline void pud_free_tlb(struct mmu_gather *tlb,= pud_t *pud, { if (mm_pud_folded(tlb->mm)) return; - pagetable_dtor(virt_to_ptdesc(pud)); tlb->mm->context.flush_mm =3D 1; tlb->freed_tables =3D 1; tlb->cleared_p4ds =3D 1; @@ -141,7 +139,6 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb,= p4d_t *p4d, { if (mm_p4d_folded(tlb->mm)) return; - pagetable_dtor(virt_to_ptdesc(p4d)); __tlb_adjust_range(tlb, address, PAGE_SIZE); tlb->mm->context.flush_mm =3D 1; tlb->freed_tables =3D 1; diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 569de24d33761..c73b89811a264 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -180,7 +180,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm) return table; } =20 -static void pagetable_pte_dtor_free(struct ptdesc *ptdesc) +static void pagetable_dtor_free(struct ptdesc *ptdesc) { pagetable_dtor(ptdesc); pagetable_free(ptdesc); @@ -190,20 +190,14 @@ void page_table_free(struct mm_struct *mm, unsigned l= ong *table) { struct ptdesc *ptdesc =3D virt_to_ptdesc(table); =20 - pagetable_pte_dtor_free(ptdesc); + pagetable_dtor_free(ptdesc); } =20 void __tlb_remove_table(void *table) { struct ptdesc *ptdesc =3D virt_to_ptdesc(table); - struct page *page =3D ptdesc_page(ptdesc); =20 - if (compound_order(page) =3D=3D CRST_ALLOC_ORDER) { - /* pmd, pud, or p4d */ - pagetable_free(ptdesc); - return; - } - pagetable_pte_dtor_free(ptdesc); + pagetable_dtor_free(ptdesc); } =20 #ifdef CONFIG_TRANSPARENT_HUGEPAGE @@ -211,7 +205,7 @@ static void pte_free_now(struct rcu_head *head) { struct ptdesc *ptdesc =3D container_of(head, struct ptdesc, pt_rcu_head); =20 - pagetable_pte_dtor_free(ptdesc); + pagetable_dtor_free(ptdesc); } =20 void pte_free_defer(struct mm_struct *mm, pgtable_t pgtable) --=20 2.20.1