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=1794590611; b=Stx0ywgF764XiCGlw82hm5+H0jJvcUA5A82/CXPaxYzgL89hNV5sZiazA6K/Vjd5+V1m enT9z2pM55BLlSBRteYpcLz7iDWoLVgkBtu97pQyM0uU25r5c1VS8dfhClS1lomTd5m11 JHasxJNQqWMvOYMsIq2dXc8BdEIrDbVTKTADPaOxgVVsoobARINCr02dxcz8gIkZe1cQE N9df/pFC3i+3eLpUK5ubThzEJMGiaCXLZ37BZPHsi6sdIckBy7NZCxFPJZPq48zmd3/s9 5yq4uJld7Fgqm814zi+dYoGOZCZV7XkdrSFDs1sjN3fZcwkODfu36TeN7IbpkVLZ4yA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794590611; 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=/djKdE+YIKsDt64F41oGfV1ewx+tOfrGrBC3bUyXIEo=; b=CWYBx7KnGrCPvo+iDMdk1GkXQ2BzP1cZ4rmeGR1S0yJEtGKuK0kpRNQqSENkckvu+/td OOMxDzPOxmgjBJYJ8xQQQ9EiB8oNUkLOOOzqeDvDn+m7FGqLO3km2DkgZpp1QNFWS3u+/ MIE5wKUXAt2CqTl3cEmLERNXbOQi5Zke2uP7sngsIoY9HZpuc/9sIIgTn4PwnN4krdqZc pEXRaE4mlfz32zXoMF1ARGO3EIScPiPgNay/dB7OOury1DQ/05M5Kaj4Z0TAUHqWhrzEf /wZmbw8OtRRxOkIc+vnZrE2SySL7XIav2P/ULuFDK33QuAG6dAJogShmduKuzXyed6g== 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=HcJguH7L; 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 5C074607585C; Fri, 13 Nov 2026 17:23:31 +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=HcJguH7L Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C8191F000C6; Fri, 13 Nov 2026 17:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794590611; bh=/djKdE+YIKsDt64F41oGfV1ewx+tOfrGrBC3bUyXIEo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HcJguH7LYUTSqQ2+JJNXxygMFmuMM+agdQ1K6+/0FHhbj09EI/gcJmDzKwAKpU/+L u/wgMnuyASHuq6m6BQM8oCSaEhpTwrnHIVFE3iKPTS8XNCM9sMXKNTt4OLEAJxIPGi t4Bn4GjIJjvyTgizRSSqXrndst4MDloU00bk+C6g= 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 6.18 537/686] mm/page_vma_mapped: continue past nonmatching huge PMDs Date: Fri, 13 Nov 2026 10:51:10 -0500 Message-ID: <20261113153839.442571727@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261113153820.902362109@linuxfoundation.org> References: <20261113153820.902362109@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-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 PMD handling to older migration-entry APIs and inline locking without device-private huge-PMD support. ] 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 41cf3192a8f62..dfbbbf5e3f53d 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -260,18 +260,18 @@ 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) || !check_pmd(swp_offset_pfn(entry), pvmw)) - return not_found(pvmw); + goto next_pmd; return true; } if (likely(pmd_trans_huge(pmde))) { if (pvmw->flags & PVMW_MIGRATION) - return not_found(pvmw); + goto next_pmd; if (!check_pmd(pmd_pfn(pmde), pvmw)) - return not_found(pvmw); + goto next_pmd; return true; } /* THP pmd was split under us: handle on pte level */ @@ -291,8 +291,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, &pmde, &ptl)) { if (!pvmw->pte) @@ -331,6 +330,17 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) pvmw->ptl = 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