[PATCH v6 20/26] mm/mlock: Skip ZONE_DEVICE PMDs during mlock
From: Alistair Popple <apopple@nvidia.com>
Date: 2025-01-10 06:03:05
Also in:
linux-cxl, linux-doc, linux-ext4, linux-fsdevel, linux-mm, linux-xfs, linuxppc-dev, lkml, loongarch, nvdimm
Subsystem:
memory management, memory mapping, the rest · Maintainers:
Andrew Morton, Liam R. Howlett, Lorenzo Stoakes, Linus Torvalds
At present mlock skips ptes mapping ZONE_DEVICE pages. A future change to remove pmd_devmap will allow pmd_trans_huge_lock() to return ZONE_DEVICE folios so make sure we continue to skip those. Signed-off-by: Alistair Popple <apopple@nvidia.com> Acked-by: David Hildenbrand <redacted> --- mm/mlock.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/mm/mlock.c b/mm/mlock.c
index cde076f..3cb72b5 100644
--- a/mm/mlock.c
+++ b/mm/mlock.c@@ -368,6 +368,8 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long addr, if (is_huge_zero_pmd(*pmd)) goto out; folio = pmd_folio(*pmd); + if (folio_is_zone_device(folio)) + goto out; if (vma->vm_flags & VM_LOCKED) mlock_folio(folio); else
--
git-series 0.9.1