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=1795059461; b=jpOu0hKU+5+mzAetQUjdPz5GFJvEoi4805/90bp64EbQLLI5pKF+nnPfFxwSOOAOxhxL 8YMQ5f7R42SZxlixVFSAjSKvP3WVQDfr+EYMPhw8iuwzzevVqaByS6JevP516GA5gdtEO tnNKR4Nk9KMH85ExuWzjrjCY+1CWCzEHFdZnPANCYCupIf0tJM3oUhRwXX3ZMcT9/Ixs+ NgOaCRloXl6QPxCuNW3RwPWqrUq8CNhHhNAwk/IHJIx4R6vYlBpcSkl1jk3S5OMK/1lZw efdS/0q5lVuP+lqqc50dbfpcLr+D8Lh1cHf2GFX+/ZDxwx42xftoaMjBdajj87gnaRg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795059461; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=J7BEZOT9tK+4Qv1bTA0WWc68MRWWmg/mVY34XP0AZBs=; b=gmLoYMVQ8UR2CGLLXVHU+ZdHWl+Fa+6Fg6Pwc/L9B5UKyVkNAVAZ1dRXw6nA+rMFNU/K zTnoSiX5E85b3loo8SwZxzZBp0CFmaKa7Ijkrmx1ml6JswgH3Hn3LFwTZJDSckRsDIpki KROaUdSGQbws6b1ZEZaSss2jTsMAXLBMop24cIw2e0Nk5KUNyoiSs9XPj+4HfP4TC1JUp MN+NhT2iT6RB/TCmBjlbSDpylNKN9Zaj0dASPZ/Xt0guI03puSwoEPx7QK6Y0IgRL0ZJt cf26QS91S+0Q8CY4t2mMKSsOZCZKKkv3Tm1jdJBvQtxu0Sh5azy2Z2UvhFSzJYgM+Ig== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=mFwieeq7; 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 94756606A320; Thu, 19 Nov 2026 03:37:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=mFwieeq7 Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECC071F000C4; Thu, 19 Nov 2026 03:37:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795059461; bh=J7BEZOT9tK+4Qv1bTA0WWc68MRWWmg/mVY34XP0AZBs=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mFwieeq7JwLTeKsMl3BcmhsasWuR1OmorycQkllHDHlVQf71aac4y5BmR04jQLO8E HPyz4z+v1Pg2/92eXVVY42La3bIlinXkIcUPGhby6d8cU3YK7SDBzP68knsg5ZKDsv eCHOJ/fSizdXK5Dzu9QLYvXbiALZifzIcWmHnx78= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kyle Zeng , Andrew Morton , "David Hildenbrand (Arm)" , Lorenzo Stoakes , Rik van Riel , "Liam R. Howlett" , Vlastimil Babka , Harry Yoo , Jann Horn , Lance Yang , Sasha Levin Subject: [PATCH 5.10 0851/1848] mm/page_vma_mapped: continue past nonmatching huge PMDs Date: Wed, 18 Nov 2026 15:48:09 +0100 Message-ID: <20261118145952.197827724@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore 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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kyle Zeng [ Upstream commit 1a2993227e8a27fc4cdea305bbdae82d290bc885 ] A PTE-mapped large folio can straddle PMD boundaries after an unaligned mremap(). If the first part is discarded and replaced with an unrelated huge PMD, page_vma_mapped_walk() stops instead of looking for the rest of the folio in subsequent PMDs. This also affects migration entries. A walk that stops at an unrelated huge PMD can leave migration PTEs behind when migration or an anonymous folio split restores the mappings. Those entries do not hold mapping references and can outlive the source folio. This issue can lead to memory corruption and I have a reproducer for it. Skip the current PMD rather than ending the walk on a flag or PFN mismatch. Do the same if the PMD became nonpresent before the locked recheck. Release the PMD lock, clear the per-PMD state and advance with step_forward(), so the existing range limit controls termination. This covers present, migration and device-private huge PMDs while preserving the matching-PMD and split-to-PTE paths. Link: https://lore.kernel.org/20261016011549.61146-1-kylebot@openai.com Fixes: ace71a19cec5 ("mm: introduce page_vma_mapped_walk()") Signed-off-by: Kyle Zeng Signed-off-by: Andrew Morton Acked-by: David Hildenbrand (Arm) Assisted-by: LLM Cc: Lorenzo Stoakes Cc: Rik van Riel Cc: Liam R. Howlett Cc: Vlastimil Babka Cc: Harry Yoo Cc: Jann Horn Cc: Lance Yang Cc: [ sashal: Adapted the changes to the page-based PMD walker with combined nonpresent and migration checks. ] Signed-off-by: Sasha Levin --- mm/page_vma_mapped.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index 610ebbee787cc..5130e2ae2f576 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -219,9 +219,9 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) pmde = *pvmw->pmd; if (likely(pmd_trans_huge(pmde))) { if (pvmw->flags & PVMW_MIGRATION) - return not_found(pvmw); + goto next_pmd; if (pmd_page(pmde) != page) - return not_found(pvmw); + goto next_pmd; return true; } if (!pmd_present(pmde)) { @@ -229,11 +229,11 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) if (!thp_migration_supported() || !(pvmw->flags & PVMW_MIGRATION)) - return not_found(pvmw); + goto next_pmd; entry = pmd_to_swp_entry(pmde); if (!is_migration_entry(entry) || migration_entry_to_page(entry) != page) - return not_found(pvmw); + goto next_pmd; return true; } /* THP pmd was split under us: handle on pte level */ @@ -251,8 +251,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) spin_unlock(ptl); } - step_forward(pvmw, PMD_SIZE); - continue; + goto next_pmd; } if (!map_pte(pvmw)) goto next_pte; @@ -286,6 +285,17 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) spin_lock(pvmw->ptl); } goto this_pte; +next_pmd: + /* + * A large folio can be PTE-mapped across PMDs, so a + * nonmatching PMD does not end the walk. + */ + if (pvmw->ptl) { + spin_unlock(pvmw->ptl); + pvmw->ptl = NULL; + } + pvmw->pmd = NULL; + step_forward(pvmw, PMD_SIZE); } while (pvmw->address < end); return false; -- 2.53.0