From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DE833E51EF for ; Thu, 28 May 2026 11:41:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779968499; cv=none; b=PPo26KU2CRxOEJ0fqrQzZQC99D944Q8dXfq51stYe9+pyjr7CVfpPmansMjN09TwpjuL3s+oxAXHDLM7tSwLLcpGa/qo1kP7PnxcJZYaOZuueq7UeOjlxsNocOyC5AdQebEh9pOoWKFH9M2pjV11y3Oag/8CCG1R1HiKoMeYOIM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779968499; c=relaxed/simple; bh=ydN12VSQqqT0OLJCjPiqAb7mFOdr1Mj6ulo6Zsmpn24=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Chx1bRrtLcFgWhNdv4g74Vtq5fVTv/RoBu2OM7NgLj6fChgk1b38q9lMl45RrHZ5JFbtoxRJqxi0Da7GUzGtB5GQxDG2fmNdxqkdr11m3yLZHvdJisLaMnI4LFTCO7jv96QTL3mWplz7sOWkC8CQ8h7Rnur6Fgg9gdpPLsyhvxw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UD7qlwM9; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="UD7qlwM9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0EF31F000E9; Thu, 28 May 2026 11:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779968498; bh=MORsqyUn9VicOp/rgI8iMezWmeuHOt19/vY4lHkonJQ=; h=Subject:To:Cc:From:Date; b=UD7qlwM9JfrlLCfzqloCiRzeSpM1LhVD1y02CO5uRz3deKQTbZyIluAyt67kaGoRK VlaCpw+BwMM07T+fX9tdC4KRtqNila0Rai5IcTQYyqxN8gWa6lOxIo2tpCgzNAOzV7 qCKT/h9XMmOWYOO/nnFgl/VBuNnKVedV8VIZt2Bo= Subject: FAILED: patch "[PATCH] arm64: tlb: Flush walk cache when unsharing PMD tables" failed to apply to 6.1-stable tree To: zengheng4@huawei.com,catalin.marinas@arm.com,stable@vger.kernel.org Cc: From: Date: Thu, 28 May 2026 13:40:35 +0200 Message-ID: <2026052835-overpass-idealness-fdef@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x c2ff4764e03e7a8d758352f4aceb8fe1be6ac971 # git commit -s git send-email --to '' --in-reply-to '2026052835-overpass-idealness-fdef@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From c2ff4764e03e7a8d758352f4aceb8fe1be6ac971 Mon Sep 17 00:00:00 2001 From: Zeng Heng Date: Thu, 21 May 2026 15:30:11 +0800 Subject: [PATCH] arm64: tlb: Flush walk cache when unsharing PMD tables When huge_pmd_unshare() is called to unshare a PMD table, the tlb_unshare_pmd_ptdesc() function sets tlb->unshared_tables=true but the aarch64 tlb_flush() only checked tlb->freed_tables to determine whether to use TLBF_NONE (vae1is, invalidates walk cache) or TLBF_NOWALKCACHE (vale1is, leaf-only). This caused the stale PMD page table entry to remain in the walk cache after unshare, potentially leading to incorrect page table walks. Fix by including unshared_tables in the check, so that when unsharing tables, TLBF_NONE is used and the walk cache is properly invalidated. Here is the detailed distinction between vae1is and vale1is: | Instruction Combination | Actual Invalidation Scope | | ------------------------ | --------------------------------------------------| | `VAE1IS` + TTL=`0` | All entries at all levels (full invalidation) | | `VAE1IS` + TTL=`2` (L2) | Non-leaf at Level 0/1 + leaf at Level 2 | | `VALE1IS` + TTL=`0` | Leaf entries at all levels (non-leaf not cleared) | | `VALE1IS` + TTL=`2` (L2) | Leaf entry at Level 2 only | Signed-off-by: Zeng Heng Fixes: 8ce720d5bd91 ("mm/hugetlb: fix excessive IPI broadcasts when unsharing PMD tables using mmu_gather") Cc: Signed-off-by: Catalin Marinas diff --git a/arch/arm64/include/asm/tlb.h b/arch/arm64/include/asm/tlb.h index 10869d7731b8..751bd57bc3ba 100644 --- a/arch/arm64/include/asm/tlb.h +++ b/arch/arm64/include/asm/tlb.h @@ -53,7 +53,8 @@ static inline int tlb_get_level(struct mmu_gather *tlb) static inline void tlb_flush(struct mmu_gather *tlb) { struct vm_area_struct vma = TLB_FLUSH_VMA(tlb->mm, 0); - tlbf_t flags = tlb->freed_tables ? TLBF_NONE : TLBF_NOWALKCACHE; + tlbf_t flags = (tlb->freed_tables || tlb->unshared_tables) ? + TLBF_NONE : TLBF_NOWALKCACHE; unsigned long stride = tlb_get_unmap_size(tlb); int tlb_level = tlb_get_level(tlb);