From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794273515; b=RkDYukJH7LG0ARn/UGnGX4gbManqtxordBgkqouGFAyb18ezIijQGSXx09P5WswyOqQl jKBwtWBre1wYplzxAyzGAujvY+1WhOCUUy8n0y814PIyOHSADVNs9YcHKteBn+087IHqn sf62CqLJ6N9YIXtdX9UEiDLfVWAUaGO4S4T6syt7a52P+IUH85oI0DV6jxCJbl+Y40Cqo yt4JGPVY3SngO1XVJpFVzkILPrqI3/oleGRRg4LoV6WwomnRzxZPjlT3g4/kVP9/M4y3W xQLMI3Ykq7AoqQoF1Hoij+L+wiDK4dwwG+nXvN72OvSST2MOYipwDWnDo5nDBbQdQsw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794273515; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=jokP+sJOX985RVWnqqyP7677R1S5WkEjrJtHXW7enUg=; b=LyjBi8rr1IgKp7C0ZU6pogbKWKZKfjaW9qLGWl8axol9Ds1FmtK0JhpgfwKXVeDVnqV0 Es4thvFyywdkG1z+9jpAhRmmO6QP4Yozf13W8vEmDkpoBatmt9lKMrkHuuXu6Ra9s+XrJ mStAVgS7t0e5XyIKBGukmrYu556UBz/zS2TkUQE9FANRS+5vj/PZt90zR5ptyGiLe4xdI MuFogT2YZLNZC+3FoivsxOMaP+1TeKmv8IUzx/dy9o3S9pqwIimvAVb40o25GtzIzkgVc KQfQbkZ+cuDqooTYrJcVCSVzyswQTIK7E6ruxF3ua9q/DlR14pCu6iH+frNSU7WXZVQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=BISI8Jek; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86A25606A31C for ; Tue, 10 Nov 2026 01:18:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=BISI8Jek Received: by smtp.kernel.org (Postfix) with ESMTPSA id A08701F0089F; Tue, 10 Nov 2026 01:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794273515; bh=jokP+sJOX985RVWnqqyP7677R1S5WkEjrJtHXW7enUg=; h=From:To:Cc:Subject:Date; b=BISI8JeknNqyvRvyte+VEDVoTKJyomDjCOSigLPIc7EdRpRb5zTD/wv43BnMrhIca toPRIBznU/fsYAtheq1fu/X408kK3VrlWzhSjoPSLKDMg44bWR6moUfZcUdVNz1DL3 LTKaKM5sAZrIxwUxcNmz+3wGI3X7wqpyQlp6OnfUP58wXAqX7VqvHB8AHcl932u2S3 RYeiQBLHYwQv98s16DBQ3888GNuO2JSJTPVpHFgdeIIrQ+e6CXCT9E7k9ZaS5iACya 0X3zouBgrkUdHQVb52DDIe5OVS7cuIsEx8Lz7GPKoqvwwLRC9DtOuFYrPw1uS3h4gi ROsDDf/SPV0jA== From: Sasha Levin To: david@kernel.org, ljs@kernel.org, pfalcato@suse.de, usama.anjum@arm.com, lance.yang@linux.dev Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] mm/mremap: recheck PUDs under the page table lock" failed to apply to 6.1-stable tree Date: Mon, 9 Nov 2026 20:18:33 -0500 Message-ID: <20261109201833-failed-6.1-402882943dfa@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 402882943dfa8bab5c2bcc66189f9fb2828f248e # git commit -s git send-email --to '' --in-reply-to '20261109201833-failed-6.1-402882943dfa@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 402882943dfa8bab5c2bcc66189f9fb2828f248e Mon Sep 17 00:00:00 2001 From: "David Hildenbrand (Arm)" Date: Sat, 31 Oct 2026 10:40:00 +0100 Subject: [PATCH] mm/mremap: recheck PUDs under the page table lock Once get_old_pud() is fixed to accept PUD leaves, unmap_mapping_range() can clear a leaf between the lookup and the move. Holding mmap_lock in write mode does not prevent this. If the zap happens before move_page_tables() tests the entry, an empty PUD can reach move_normal_pud(), where pud_populate() turns it into a present page table entry. If it happens after the test, move_huge_pud() can instead try to move an empty entry, triggering CONFIG_DEBUG_VM warnings on powerpc. Recheck the source under the page table lock in both helpers. Treat an empty source in move_normal_pud() as a completed move, and use __pud_trans_huge_lock() in move_huge_pud(). In the future we should likely have the code lookup a PUD/PMD lockless once, instead of multiple times, because one of the problematic bits here is the: pud_trans_huge(*old_pud) Fixes: 0881ace292b6 ("mm/mremap: use pmd/pud_poplulate to update page table entries") Cc: stable@vger.kernel.org Reviewed-by: Lorenzo Stoakes (ARM) Reviewed-by: Pedro Falcato Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-31-d6437171ecc3@kernel.org Reviewed-by: Lance Yang Signed-off-by: David Hildenbrand (Arm) --- mm/mremap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 16e736c72d9cb..91f0865f6aeea 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -461,14 +461,18 @@ static bool move_normal_pud(struct pagetable_move_control *pmc, if (new_ptl != old_ptl) spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING); - /* Clear the pud */ pud = *old_pud; + if (unlikely(pud_none(pud))) + goto out_unlock; + + /* Clear the pud */ pud_clear(old_pud); VM_BUG_ON(!pud_none(*new_pud)); pud_populate(mm, new_pud, pud_pgtable(pud)); flush_tlb_range(vma, pmc->old_addr, pmc->old_addr + PUD_SIZE); +out_unlock: if (new_ptl != old_ptl) spin_unlock(new_ptl); spin_unlock(old_ptl); @@ -503,7 +507,9 @@ static bool move_huge_pud(struct pagetable_move_control *pmc, * We don't have to worry about the ordering of src and dst * ptlocks because exclusive mmap_lock prevents deadlock. */ - old_ptl = pud_lock(mm, old_pud); + old_ptl = __pud_trans_huge_lock(old_pud, vma); + if (unlikely(!old_ptl)) + return false; new_ptl = pud_lockptr(mm, new_pud); if (new_ptl != old_ptl) spin_lock_nested(new_ptl, SINGLE_DEPTH_NESTING); -- 2.53.0