Re: [PATCH 11/13] mm/mlock: convert mlock code to use vma_flags_t

[PATCH 00/13] convert more vm_flags_t users to vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
[PATCH 01/13] mm: introduce vma_flags_can_grow() and vma_can_grow() · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 01/13] mm: introduce vma_flags_can_grow() and vma_can_grow() · "Zi Yan" <ziy@nvidia.com> · 2026-06-29
Re: [PATCH 01/13] mm: introduce vma_flags_can_grow() and vma_can_grow() · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-30
Re: [PATCH 01/13] mm: introduce vma_flags_can_grow() and vma_can_grow() · "Zi Yan" <ziy@nvidia.com> · 2026-06-30
Re: [PATCH 01/13] mm: introduce vma_flags_can_grow() and vma_can_grow() · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 01/13] mm: introduce vma_flags_can_grow() and vma_can_grow() · "Zi Yan" <ziy@nvidia.com> · 2026-07-03
[PATCH 02/13] mm/vma: update do_mmap() to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 02/13] mm/vma: update do_mmap() to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 02/13] mm/vma: update do_mmap() to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
Re: [PATCH 02/13] mm/vma: update do_mmap() to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
[PATCH 03/13] mm: convert __get_unmapped_area() to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 03/13] mm: convert __get_unmapped_area() to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
[PATCH 07/13] mm/vma: rename vma_get_page_prot to vma_flags_to_page_prot · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 07/13] mm/vma: rename vma_get_page_prot to vma_flags_to_page_prot · Lance Yang <lance.yang@linux.dev> · 2026-07-02
[PATCH 04/13] mm: update generic_get_unmapped_area[_topdown]() to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 04/13] mm: update generic_get_unmapped_area[_topdown]() to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
[PATCH 05/13] mm: prefer mm->def_vma_flags in mm logic · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 05/13] mm: prefer mm->def_vma_flags in mm logic · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 05/13] mm: prefer mm->def_vma_flags in mm logic · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
[PATCH 06/13] mm/vma: convert vm_pgprot_modify() to use vma_flags_t and rename · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 06/13] mm/vma: convert vm_pgprot_modify() to use vma_flags_t and rename · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 06/13] mm/vma: convert vm_pgprot_modify() to use vma_flags_t and rename · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
[PATCH 08/13] mm: introduce vma_get_page_prot() and use it · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 08/13] mm: introduce vma_get_page_prot() and use it · Thomas Zimmermann <tzimmermann@suse.de> · 2026-06-30
Re: [PATCH 08/13] mm: introduce vma_get_page_prot() and use it · Jani Nikula <jani.nikula@linux.intel.com> · 2026-06-30
Re: [PATCH 08/13] mm: introduce vma_get_page_prot() and use it · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 08/13] mm: introduce vma_get_page_prot() and use it · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
[PATCH 10/13] mm/vma: convert miscellaneous uses of VMA flags in core mm · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 10/13] mm/vma: convert miscellaneous uses of VMA flags in core mm · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 10/13] mm/vma: convert miscellaneous uses of VMA flags in core mm · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
[PATCH 09/13] mm/vma: update create_init_stack_vma() to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 09/13] mm/vma: update create_init_stack_vma() to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
[PATCH 11/13] mm/mlock: convert mlock code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 11/13] mm/mlock: convert mlock code to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 11/13] mm/mlock: convert mlock code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
[PATCH 12/13] mm/mprotect: convert mprotect code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 12/13] mm/mprotect: convert mprotect code to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-01
Re: [PATCH 12/13] mm/mprotect: convert mprotect code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
[PATCH 13/13] mm/mremap: convert mremap code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-06-29
Re: [PATCH 13/13] mm/mremap: convert mremap code to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 13/13] mm/mremap: convert mremap code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02
Re: [PATCH 13/13] mm/mremap: convert mremap code to use vma_flags_t · Lance Yang <lance.yang@linux.dev> · 2026-07-02
Re: [PATCH 13/13] mm/mremap: convert mremap code to use vma_flags_t · Lorenzo Stoakes <ljs@kernel.org> · 2026-07-02

From: Lance Yang <lance.yang@linux.dev>
Date: 2026-07-02 13:21:54
Also in: dri-devel, intel-gfx, intel-xe, linux-arm-msm, linux-fbdev, linux-fsdevel, linux-mips, linux-samsung-soc, linux-sound, linux-tegra, lkml, nouveau, virtualization, xen-devel

On Mon, Jun 29, 2026 at 08:25:34PM +0100, Lorenzo Stoakes wrote:

Replace use of the legacy vm_flags_t flags with vma_flags_t values
throughout the mlock logic.

Additionally update comments to reflect the changes to be consistent.

No functional change intended.

Signed-off-by: Lorenzo Stoakes <ljs@kernel.org>
---

Nothing scary jumped out at me. Just one tiny nit below ;)

[...]

quoted hunk ↗ jump to hunk

@@ -466,24 +466,23 @@ static void mlock_vma_pages_range(struct vm_area_struct *vma,
 */

static int mlock_fixup(struct vma_iterator *vmi, struct vm_area_struct *vma,
	       struct vm_area_struct **prev, unsigned long start,
-	       unsigned long end, vm_flags_t newflags)
+	       unsigned long end, vma_flags_t *new_vma_flags)
{
-	vma_flags_t new_vma_flags = legacy_to_vma_flags(newflags);
	const vma_flags_t old_vma_flags = vma->flags;
	struct mm_struct *mm = vma->vm_mm;
	int nr_pages;
	int ret = 0;

-	if (vma_flags_same_pair(&old_vma_flags, &new_vma_flags) ||
+	if (vma_flags_same_pair(&old_vma_flags, new_vma_flags) ||
	    vma_is_secretmem(vma) || !vma_supports_mlock(vma)) {
		/*
-		 * Don't set VM_LOCKED or VM_LOCKONFAULT and don't count.
+		 * Don't set VMA_LOCKED_BIT or VM_LOCKONFAULT and don't count.

s/VM_LOCKONFAULT/VMA_LOCKONFAULT_BIT/

Otherwise LGTM. Feel free to add:

Reviewed-by: Lance Yang <lance.yang@linux.dev>

		 * For secretmem, don't allow the memory to be unlocked.
		 */
		goto out;
	}

-	vma = vma_modify_flags(vmi, *prev, vma, start, end, &new_vma_flags);
+	vma = vma_modify_flags(vmi, *prev, vma, start, end, new_vma_flags);
	if (IS_ERR(vma)) {
		ret = PTR_ERR(vma);
		goto out;

[...]

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help