mm-mremap-cleanup-post-processing-stage-of-mremap.patch removed from -mm tree
The quilt patch titled
Subject: mm/mremap: cleanup post-processing stage of mremap
has been removed from the -mm tree. Its filename was
mm-mremap-cleanup-post-processing-stage-of-mremap.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: cleanup post-processing stage of mremap
Date: Thu, 17 Jul 2025 17:55:54 +0100
Separate out the uffd bits so it clear's what's happening.
Don't bother setting vrm->mmap_locked after unlocking, because after this we are done anyway.
The only time we drop the mmap lock is on VMA shrink, at which point vrm->new_len will be < vrm->old_len and the operation will not be performed anyway, so move this code out of the if (vrm->mmap_locked) block.
All addresses returned by mremap() are page-aligned, so the offset_in_page() check on ret seems only to be incorrectly trying to detect whether an error occurred - explicitly check for this.
No functional change intended.
---
mm/mremap.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
mm/mremap.c renamed from mm/mremap.c~mm-mremap-cleanup-post-processing-stage-of-mremap +13 -9
@@ -1729,6 +1729,15 @@ static int check_prep_vma(struct vma_remreturn 0 ; } +static void notify_uffd (struct vma_remap_struct *vrm,unsigned long to) +{ +struct mm_struct *mm = current->mm; + +userfaultfd_unmap_complete (mm, vrm->uf_unmap_early); +mremap_userfaultfd_complete (vrm->uf, vrm->addr, to, vrm->old_len); +userfaultfd_unmap_complete (mm, vrm->uf_unmap); +} +static unsigned long do_mremap (struct vma_remap_struct *vrm) {struct mm_struct *mm = current->mm;
@@ -1754,18 +1763,13 @@ static unsigned long do_mremap(struct vm res =vrm_implies_new_addr (vrm) ?mremap_to (vrm) :mremap_at (vrm); out: -if (vrm->mmap_locked) { +if (vrm->mmap_locked)mmap_write_unlock (mm); - vrm->mmap_locked = false; - -if (!offset_in_page (res) && vrm->mlocked && vrm->new_len > vrm->old_len) -mm_populate (vrm->new_addr + vrm->old_len, vrm->delta); - } -userfaultfd_unmap_complete (mm, vrm->uf_unmap_early); -mremap_userfaultfd_complete (vrm->uf, vrm->addr, res, vrm->old_len); -userfaultfd_unmap_complete (mm, vrm->uf_unmap); +if (!IS_ERR_VALUE (res) && vrm->mlocked && vrm->new_len > vrm->old_len) +mm_populate (vrm->new_addr + vrm->old_len, vrm->delta); +notify_uffd (vrm, res);return res; }
_
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