* [PATCH v2 0/4] mm: fixes for THP migration, swap-in and device-private smaps
@ 2026-11-16 6:34 Usama Arif
2026-11-16 6:34 ` [PATCH v2 1/4] mm/migrate_device: avoid leaking folio references during THP splitting Usama Arif
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Usama Arif @ 2026-11-16 6:34 UTC (permalink / raw)
To: Andrew Morton, apopple, byungchul, david, gourry, jannh,
joshua.hahnjy, liam, linux-fsdevel, linux-kernel, linux-mm, ljs,
matthew.brost, mhocko, pfalcato, rppt, surenb, vbabka, ying.huang,
ziy, kas, hannes, riel, shakeel.butt, kernel-team, baolin.wang,
Nico Pache, ryan.roberts, dev.jain, baohua, lance.yang
Cc: Usama Arif
This series contains fixes for existing THP migration, PTE swap-in
and smaps paths. They were extracted from the work on PMD swap entries
for anonymous THPs [1] and can be merged independently.
1. Avoid a folio reference leak when concurrent MADV_DONTNEED clears
or splits a migration PMD before the device migration split helper
acquires the PMD lock.
2. Prevent PTE swap-in batching from mapping a hardware-poisoned page
of a large anon swap-cache folio.
3. Stop reading the accessed and dirty bits out of a non-present PMD
in smaps, where they encode the softleaf entry rather than
accessed/dirty state.
4. Account device-private PMDs using mapcounts in smaps, matching the
PTE path. Shared mappings get proportional PSS, and exclusive
mappings are counted as private.
This applies on top of mm-new (0bce4c3c7589).
v1 -> v2: https://lore.kernel.org/r/20261111113904.650722-1-usama.arif@linux.dev/
- Patch 2: use the existing folio_contain_hwpoisoned_page()
rather than adding a helper that scans every page of the folio
(Lorenzo, David). Only skip batching for anon folios, since
falling back for a freshly read folio frees it with the poisoned
page in it, and the retried fault can get the same block back.
- Collect the Reviewed-by and Acked-by tags from v1.
[1] PMD-level swap entries for anonymous THPs:
https://lore.kernel.org/r/20261002095503.3585565-1-usama.arif@linux.dev/
Usama Arif (4):
mm/migrate_device: avoid leaking folio references during THP splitting
mm: don't PTE-batch a swap-in of a folio with a hardware-poisoned page
fs/proc/task_mmu: don't read young/dirty from a non-present PMD in
smaps
fs/proc/task_mmu: account device-private PMDs as present in smaps
fs/proc/task_mmu.c | 12 ++++++++----
mm/memory.c | 5 +++++
mm/migrate_device.c | 7 +------
3 files changed, 14 insertions(+), 10 deletions(-)
--
2.53.1-Meta
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 1/4] mm/migrate_device: avoid leaking folio references during THP splitting
2026-11-16 6:34 [PATCH v2 0/4] mm: fixes for THP migration, swap-in and device-private smaps Usama Arif
@ 2026-11-16 6:34 ` Usama Arif
2026-11-16 6:34 ` [PATCH v2 2/4] mm: don't PTE-batch a swap-in of a folio with a hardware-poisoned page Usama Arif
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Usama Arif @ 2026-11-16 6:34 UTC (permalink / raw)
To: Andrew Morton, apopple, byungchul, david, gourry, jannh,
joshua.hahnjy, liam, linux-fsdevel, linux-kernel, linux-mm, ljs,
matthew.brost, mhocko, pfalcato, rppt, surenb, vbabka, ying.huang,
ziy, kas, hannes, riel, shakeel.butt, kernel-team, baolin.wang,
Nico Pache, ryan.roberts, dev.jain, baohua, lance.yang
Cc: Usama Arif, stable
migrate_vma_split_unmapped_folio() takes an extra folio reference because
split_huge_pmd_address(..., true) drops one when it splits a PMD.
However, migrate_vma only holds mmap_lock for reading. A concurrent
MADV_DONTNEED can clear the migration PMD, or split it into PTE migration
entries, before the split helper takes the PMD lock. The helper then does
nothing and leaves the extra reference behind. folio_split_unmapped()
fails with -EAGAIN due to the unexpected reference, and the reference is
never dropped, so the source THP is leaked.
If a THP is faulted in at the same address inside that window it is
worse: freeze = true replaces the new folio's mappings with migration
entries that nothing will ever remove, and drops a reference the caller
never took.
An existing migration PMD is expanded into PTE migration entries even
with freeze = false. Use that mode and remove the extra folio_get(). The
reference already held by migration keeps the source folio alive whether
or not its PMD migration entry still exists.
Reported-by: Zi Yan <ziy@nvidia.com>
Closes: https://lore.kernel.org/all/DLZ48KMS7YG8.3BTM0UUU8CTU2@nvidia.com/
Fixes: 4265d67e405a ("mm/migrate_device: add THP splitting during migration")
Cc: stable@vger.kernel.org
Signed-off-by: Usama Arif <usama.arif@linux.dev>
---
mm/migrate_device.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/mm/migrate_device.c b/mm/migrate_device.c
index 9e19fadfa65c6..3286bb8a4b73e 100644
--- a/mm/migrate_device.c
+++ b/mm/migrate_device.c
@@ -920,12 +920,7 @@ static int migrate_vma_split_unmapped_folio(struct migrate_vma *migrate,
unsigned long flags;
int ret = 0;
- /*
- * take a reference, since split_huge_pmd_address() with freeze = true
- * drops a reference at the end.
- */
- folio_get(folio);
- split_huge_pmd_address(migrate->vma, addr, true);
+ split_huge_pmd_address(migrate->vma, addr, false);
ret = folio_split_unmapped(folio, 0);
if (ret)
return ret;
--
2.53.1-Meta
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/4] mm: don't PTE-batch a swap-in of a folio with a hardware-poisoned page
2026-11-16 6:34 [PATCH v2 0/4] mm: fixes for THP migration, swap-in and device-private smaps Usama Arif
2026-11-16 6:34 ` [PATCH v2 1/4] mm/migrate_device: avoid leaking folio references during THP splitting Usama Arif
@ 2026-11-16 6:34 ` Usama Arif
2026-11-16 6:34 ` [PATCH v2 3/4] fs/proc/task_mmu: don't read young/dirty from a non-present PMD in smaps Usama Arif
2026-11-16 6:34 ` [PATCH v2 4/4] fs/proc/task_mmu: account device-private PMDs as present " Usama Arif
3 siblings, 0 replies; 5+ messages in thread
From: Usama Arif @ 2026-11-16 6:34 UTC (permalink / raw)
To: Andrew Morton, apopple, byungchul, david, gourry, jannh,
joshua.hahnjy, liam, linux-fsdevel, linux-kernel, linux-mm, ljs,
matthew.brost, mhocko, pfalcato, rppt, surenb, vbabka, ying.huang,
ziy, kas, hannes, riel, shakeel.butt, kernel-team, baolin.wang,
Nico Pache, ryan.roberts, dev.jain, baohua, lance.yang
Cc: Usama Arif, stable
do_swap_page() checks PageHWPoison() on the faulting page, but the
large-folio batching path then maps the rest of the folio without
looking at its other pages. A poisoned page that is not the one being
faulted gets mapped anyway, and the fault that would have reported it
never happens.
Skip batching for such an anon folio and let each page take its own
fault, where the existing check catches it. do_set_pmd() already backs
off the same way.
Leave a freshly read folio alone: it is not anon yet and can only be
mapped as a whole, and falling back would free it with the poisoned
page still in it, which the retried fault can then get back from the
page allocator.
Fixes: 508758960b8d ("mm: swap: entirely map large folios found in swapcache")
Cc: stable@vger.kernel.org
Signed-off-by: Usama Arif <usama.arif@linux.dev>
---
mm/memory.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/mm/memory.c b/mm/memory.c
index d477a4f986bc8..51e72fb40655f 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5158,6 +5158,11 @@ vm_fault_t do_swap_page(struct vm_fault *vmf)
swap_pte_batch(folio_ptep, nr, folio_pte) != nr)
goto check_folio;
+ /* A poisoned page in the folio must take its own fault. */
+ if (folio_test_anon(folio) &&
+ folio_contain_hwpoisoned_page(folio))
+ goto check_folio;
+
page_idx = idx;
address = folio_start;
ptep = folio_ptep;
--
2.53.1-Meta
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 3/4] fs/proc/task_mmu: don't read young/dirty from a non-present PMD in smaps
2026-11-16 6:34 [PATCH v2 0/4] mm: fixes for THP migration, swap-in and device-private smaps Usama Arif
2026-11-16 6:34 ` [PATCH v2 1/4] mm/migrate_device: avoid leaking folio references during THP splitting Usama Arif
2026-11-16 6:34 ` [PATCH v2 2/4] mm: don't PTE-batch a swap-in of a folio with a hardware-poisoned page Usama Arif
@ 2026-11-16 6:34 ` Usama Arif
2026-11-16 6:34 ` [PATCH v2 4/4] fs/proc/task_mmu: account device-private PMDs as present " Usama Arif
3 siblings, 0 replies; 5+ messages in thread
From: Usama Arif @ 2026-11-16 6:34 UTC (permalink / raw)
To: Andrew Morton, apopple, byungchul, david, gourry, jannh,
joshua.hahnjy, liam, linux-fsdevel, linux-kernel, linux-mm, ljs,
matthew.brost, mhocko, pfalcato, rppt, surenb, vbabka, ying.huang,
ziy, kas, hannes, riel, shakeel.butt, kernel-team, baolin.wang,
Nico Pache, ryan.roberts, dev.jain, baohua, lance.yang
Cc: Usama Arif, stable
smaps_pmd_entry() passes pmd_young(*pmd) and pmd_dirty(*pmd) to
smaps_account() for every PMD, including softleaf entries (migration and
device-private), where those bits encode the entry rather than
accessed/dirty state. smaps_pte_entry() only reads them when the entry
is present.
On x86_64 the entry's offset is stored inverted across bits 9-58, which
overlap _PAGE_SAVED_DIRTY, so pmd_dirty() returns garbage: a clean 2MB
device-private mapping is accounted as 2048 kB dirty, and lazyfree
accounting is suppressed. pgtable_64.h also warns that the hardware can
set the accessed and dirty bits on non-present entries by mistake.
Only read the bits when the PMD is present.
Fixes: c94b6923fa0a ("/proc/PID/smaps: Add PMD migration entry parsing")
Cc: stable@vger.kernel.org
Signed-off-by: Usama Arif <usama.arif@linux.dev>
Reviewed-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
Reviewed-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Reviewed-by: Zi Yan <ziy@nvidia.com>
---
fs/proc/task_mmu.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 164b4efc5e093..ad9fdcdaa2c40 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1029,13 +1029,15 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,
struct vm_area_struct *vma = walk->vma;
bool locked = !!(vma->vm_flags & VM_LOCKED);
struct page *page = NULL;
- bool present = false;
+ bool present = false, young = false, dirty = false;
struct folio *folio;
if (pmd_none(*pmd))
return;
if (pmd_present(*pmd)) {
page = vm_normal_page_pmd(vma, addr, *pmd);
+ young = pmd_young(*pmd);
+ dirty = pmd_dirty(*pmd);
present = true;
} else if (unlikely(thp_migration_supported())) {
const softleaf_t entry = softleaf_from_pmd(*pmd);
@@ -1055,8 +1057,7 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,
else
mss->file_thp += HPAGE_PMD_SIZE;
- smaps_account(mss, page, true, pmd_young(*pmd), pmd_dirty(*pmd),
- locked, present);
+ smaps_account(mss, page, true, young, dirty, locked, present);
}
#else
static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,
--
2.53.1-Meta
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 4/4] fs/proc/task_mmu: account device-private PMDs as present in smaps
2026-11-16 6:34 [PATCH v2 0/4] mm: fixes for THP migration, swap-in and device-private smaps Usama Arif
` (2 preceding siblings ...)
2026-11-16 6:34 ` [PATCH v2 3/4] fs/proc/task_mmu: don't read young/dirty from a non-present PMD in smaps Usama Arif
@ 2026-11-16 6:34 ` Usama Arif
3 siblings, 0 replies; 5+ messages in thread
From: Usama Arif @ 2026-11-16 6:34 UTC (permalink / raw)
To: Andrew Morton, apopple, byungchul, david, gourry, jannh,
joshua.hahnjy, liam, linux-fsdevel, linux-kernel, linux-mm, ljs,
matthew.brost, mhocko, pfalcato, rppt, surenb, vbabka, ying.huang,
ziy, kas, hannes, riel, shakeel.butt, kernel-team, baolin.wang,
Nico Pache, ryan.roberts, dev.jain, baohua, lance.yang
Cc: Usama Arif, stable
Device-private PMDs represent mapped pages, but smaps_pmd_entry()
passes present=false to smaps_account(). That treats them like migration
entries: mapcounts are ignored, PSS is charged in full, and exclusive
mappings are accounted as shared.
Match smaps_pte_entry() and mark device-private PMDs as present so
smaps_account() uses mapcounts for PSS and private/shared accounting.
Fixes: a30b48bf1b24 ("mm/migrate_device: implement THP migration of zone device pages")
Cc: stable@vger.kernel.org
Signed-off-by: Usama Arif <usama.arif@linux.dev>
Acked-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
Acked-by: David Hildenbrand (Arm) <david@kernel.org>
Reviewed-by: Zi Yan <ziy@nvidia.com>
---
fs/proc/task_mmu.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index ad9fdcdaa2c40..6345bb143f200 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -1042,8 +1042,11 @@ static void smaps_pmd_entry(pmd_t *pmd, unsigned long addr,
} else if (unlikely(thp_migration_supported())) {
const softleaf_t entry = softleaf_from_pmd(*pmd);
- if (softleaf_has_pfn(entry))
+ if (softleaf_has_pfn(entry)) {
+ if (softleaf_is_device_private(entry))
+ present = true;
page = softleaf_to_page(entry);
+ }
}
if (IS_ERR_OR_NULL(page))
return;
--
2.53.1-Meta
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-11-16 6:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-16 6:34 [PATCH v2 0/4] mm: fixes for THP migration, swap-in and device-private smaps Usama Arif
2026-11-16 6:34 ` [PATCH v2 1/4] mm/migrate_device: avoid leaking folio references during THP splitting Usama Arif
2026-11-16 6:34 ` [PATCH v2 2/4] mm: don't PTE-batch a swap-in of a folio with a hardware-poisoned page Usama Arif
2026-11-16 6:34 ` [PATCH v2 3/4] fs/proc/task_mmu: don't read young/dirty from a non-present PMD in smaps Usama Arif
2026-11-16 6:34 ` [PATCH v2 4/4] fs/proc/task_mmu: account device-private PMDs as present " Usama Arif
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox