mm-mremap-clean-up-mlock-populate-behaviour.patch removed from -mm tree
The quilt patch titled
Subject: mm/mremap: clean up mlock populate behaviour
has been removed from the -mm tree. Its filename was
mm-mremap-clean-up-mlock-populate-behaviour.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Lorenzo Stoakes <[email protected]>
Subject: mm/mremap: clean up mlock populate behaviour
Date: Thu, 17 Jul 2025 17:55:58 +0100
When an mlock()'d VMA is expanded, we need to populate the expanded region to maintain the contract that all mlock()'d memory is present (albeit - with some period after mmap unlock where the expanded part of the mapping remains unfaulted).
The current implementation is very unclear, so make it absolutely explicit under what circumstances we do this.
---
mm/mremap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
mm/mremap.c renamed from mm/mremap.c~mm-mremap-clean-up-mlock-populate-behaviour +8 -5
@@ -65,7 +65,7 @@ struct vma_remap_struct {/* Internal state, determined in do_mremap(). */ unsigned long delta;/* Absolute delta of old_len,new_len. */ -bool mlocked;/* Was the VMA mlock()'d? */ +bool populate_expand;/* mlock()'d expanded, must populate. */ enum mremap_type remap_type;/* expand, shrink, etc. */ bool mmap_locked;/* Is mm currently write-locked? */ unsigned long charged;/* If VM_ACCOUNT, # pages to account. */
@@ -1010,10 +1010,8 @@ static void vrm_stat_account(struct vma_struct vm_area_struct *vma = vrm->vma;vm_stat_account (mm, vma->vm_flags, pages); -if (vma->vm_flags &VM_LOCKED ) { +if (vma->vm_flags &VM_LOCKED ) mm->locked_vm += pages; - vrm->mlocked = true; - } }/*
@@ -1660,6 +1658,10 @@ static int check_prep_vma(struct vma_remif (new_len == old_len)return 0 ; +/* We are expanding and the VMA is mlock()'d so we need to populate. */ +if (vma->vm_flags &VM_LOCKED ) + vrm->populate_expand = true; +/* Need to be careful about a growing mapping */ pgoff = (addr - vma->vm_start) >>PAGE_SHIFT ; pgoff += vma->vm_pgoff;
@@ -1780,7 +1782,8 @@ out:if (vrm->mmap_locked)mmap_write_unlock (mm); -if (!failed && vrm->mlocked && vrm->new_len > vrm->old_len) +/* VMA mlock'd + was expanded, so populated expanded region. */ +if (!failed && vrm->populate_expand)mm_populate (vrm->new_addr + vrm->old_len, vrm->delta);notify_uffd (vrm, failed);
_
Patches currently in -mm which might be from [email protected] are
mm-mseal-always-define-vm_sealed.patch mm-mseal-update-madvise-logic.patch mm-mseal-small-cleanups.patch mm-mseal-simplify-and-rename-vma-gap-check.patch mm-mseal-rework-mseal-apply-logic.patch maintainers-add-missing-percpu-internalh-file-to-per-cpu-section.patch maintainers-add-missing-interval_treec-to-memory-mapping-section.patch maintainers-add-missing-mm_sloth-file-thp-section.patch maintainers-add-missing-mm_sloth-file-thp-section-fix.patch maintainers-move-memremap-to-hotplug-section.patch maintainers-add-missing-shrinker-files.patch maintainers-add-missing-files-to-page-alloc-section.patch maintainers-add-missing-zsmalloc-file.patch maintainers-add-mm-misc-section-add-missing-files-to-misc-and-core.patch maintainers-add-missing-file-to-cgroup-section.patch