convert more vm_flags_t users to vma_flags_t

These test whether the VMA has stack sematics, i.e. is able to grow upwards or downwards depending on the architecture.

In order to account for arches which do not support upward-growing stacks, introduce VMA_GROWSUP whose definition depends on the architecture supporting it, and use vma_flags_test_single_mask() in vma_flags_can_grow() to account for this.

Update the VMA userland tests to reflect the changes

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 include/linux/mm.h              | 21 ++++++++++++++++++---
 tools/testing/vma/include/dup.h |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

include/linux/mm.h +5 -2

index 868b2334bff3..cf7df1569052 100644
@@ -472,6 +472,7 @@ enum {
 #define VM_SAO		INIT_VM_FLAG(SAO)
 #elif defined(CONFIG_PARISC)
 #define VM_GROWSUP	INIT_VM_FLAG(GROWSUP)
+#define VMA_GROWSUP	mk_vma_flags(VMA_GROWSUP_BIT)
 #elif defined(CONFIG_SPARC64)
 #define VM_SPARC_ADI	INIT_VM_FLAG(SPARC_ADI)
 #define VM_ARCH_CLEAR	INIT_VM_FLAG(ARCH_CLEAR)

@@ -483,6 +484,7 @@ enum {
 #endif
 #ifndef VM_GROWSUP
 #define VM_GROWSUP	VM_NONE
+#define VMA_GROWSUP	EMPTY_VMA_FLAGS
 #endif
 #ifdef CONFIG_ARM64_MTE
 #define VM_MTE		INIT_VM_FLAG(MTE)

@@ -1563,11 +1565,24 @@ static inline bool vma_is_initial_stack(const struct vm_area_struct *vma)
 		vma->vm_end >= vma->vm_mm->start_stack;
 }
 
-static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)
+static inline bool vma_flags_can_grow(const vma_flags_t *flags)
 {
-	int maybe_stack = vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP);
+	if (vma_flags_test_single_mask(flags, VMA_GROWSUP))
+		return true;

include/linux/mm.h +5 -0

+}
+
+static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)
+{
+	if (!vma_can_grow(vma))
 		return false;
 
 	if ((vma->vm_flags & VM_STACK_INCOMPLETE_SETUP) ==

tools/testing/vma/include/dup.h +2 -0

index 5d7d0afd7765..6f5bcd7fbcd8 100644
@@ -245,8 +245,10 @@ enum {
 #define VM_STACK	INIT_VM_FLAG(STACK)
 #ifdef CONFIG_STACK_GROWS_UP
 #define VM_STACK_EARLY	INIT_VM_FLAG(STACK_EARLY)
+#define VMA_STACK_EARLY mk_vma_flags(VMA_STACK_EARLY_BIT)
 #else
 #define VM_STACK_EARLY	VM_NONE
+#define VMA_STACK_EARLY EMPTY_VMA_FLAGS
 #endif
 #ifdef CONFIG_ARCH_HAS_PKEYS
 #define VM_PKEY_SHIFT ((__force int)VMA_HIGH_ARCH_0_BIT)

Quoted 48 lines · Lorenzo Stoakes

These test whether the VMA has stack sematics, i.e. is able to grow upwards or downwards depending on the architecture.

In order to account for arches which do not support upward-growing stacks, introduce VMA_GROWSUP whose definition depends on the architecture supporting it, and use vma_flags_test_single_mask() in vma_flags_can_grow() to account for this.

Update the VMA userland tests to reflect the changes

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 include/linux/mm.h              | 21 ++++++++++++++++++---
 tools/testing/vma/include/dup.h |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

include/linux/mm.h +5 -2

index 868b2334bff3..cf7df1569052 100644
@@ -472,6 +472,7 @@ enum {
 #define VM_SAO		INIT_VM_FLAG(SAO)
 #elif defined(CONFIG_PARISC)
 #define VM_GROWSUP	INIT_VM_FLAG(GROWSUP)
+#define VMA_GROWSUP	mk_vma_flags(VMA_GROWSUP_BIT)
 #elif defined(CONFIG_SPARC64)
 #define VM_SPARC_ADI	INIT_VM_FLAG(SPARC_ADI)
 #define VM_ARCH_CLEAR	INIT_VM_FLAG(ARCH_CLEAR)

@@ -483,6 +484,7 @@ enum {
 #endif
 #ifndef VM_GROWSUP
 #define VM_GROWSUP	VM_NONE
+#define VMA_GROWSUP	EMPTY_VMA_FLAGS
 #endif
 #ifdef CONFIG_ARM64_MTE
 #define VM_MTE		INIT_VM_FLAG(MTE)

@@ -1563,11 +1565,24 @@ static inline bool vma_is_initial_stack(const struct vm_area_struct *vma)
 		vma->vm_end >= vma->vm_mm->start_stack;
 }
 
-static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)
+static inline bool vma_flags_can_grow(const vma_flags_t *flags)
 {
-	int maybe_stack = vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP);
+	if (vma_flags_test_single_mask(flags, VMA_GROWSUP))
+		return true;

include/linux/mm.h static inline bool vma_is_initial_stack(const struct vm_area_struct *vma) · line 1580

Quoted 10 lines

include/linux/mm.h +8 -1

+	if (vma_flags_test(flags, VMA_GROWSDOWN_BIT))
+		return true;
+
+	return false;
+}
 
-	if (!maybe_stack)
+static inline bool vma_can_grow(const struct vm_area_struct *vma)
+{
+	return vma_flags_can_grow(&vma->flags);

Would it save vma_flags_can_grow() if we do below?

return vma_test(vma, VMA_GROWSDOWN_BIT) || vma_test_single_mask(vma, VMA_GROWSUP);

I find these two functions when I am reading mm.h.

Quoted 31 lines

include/linux/mm.h +5 -0

+}
+
+static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)
+{
+	if (!vma_can_grow(vma))
 		return false;
 
 	if ((vma->vm_flags & VM_STACK_INCOMPLETE_SETUP) ==

tools/testing/vma/include/dup.h +4 -0

index 5d7d0afd7765..6f5bcd7fbcd8 100644
@@ -245,8 +245,10 @@ enum {
 #define VM_STACK	INIT_VM_FLAG(STACK)
 #ifdef CONFIG_STACK_GROWS_UP
 #define VM_STACK_EARLY	INIT_VM_FLAG(STACK_EARLY)
+#define VMA_STACK_EARLY mk_vma_flags(VMA_STACK_EARLY_BIT)
 #else
 #define VM_STACK_EARLY	VM_NONE
+#define VMA_STACK_EARLY EMPTY_VMA_FLAGS
 #endif
 #ifdef CONFIG_ARCH_HAS_PKEYS
 #define VM_PKEY_SHIFT ((__force int)VMA_HIGH_ARCH_0_BIT)

@@ -315,6 +317,8 @@ enum {
 
 /* Bits set in the VMA until the stack is in its final location */
 #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)
+#define VMA_STACK_INCOMPLETE_SETUP append_vma_flags(		\
+	VMA_STACK_EARLY, VMA_RAND_READ_BIT, VMA_SEQ_READ_BIT)
 

tools/testing/vma/include/dup.h enum { · line 324

Quoted 2 lines

tools/testing/vma/include/dup.h +0 -0

 #define TASK_EXEC_BIT ((current->personality & READ_IMPLIES_EXEC) ? \
 		       VM_EXEC_BIT : VM_READ_BIT)

Why are VMA_STACK_EARLY and VMA_STACK_INCOMPLETE_SETUP added here but not in mm.h?

--
Best Regards,
Yan, Zi

Quoted 62 lines · Zi Yan

Quoted 48 lines · Lorenzo Stoakes

These test whether the VMA has stack sematics, i.e. is able to grow upwards or downwards depending on the architecture.

In order to account for arches which do not support upward-growing stacks, introduce VMA_GROWSUP whose definition depends on the architecture supporting it, and use vma_flags_test_single_mask() in vma_flags_can_grow() to account for this.

Update the VMA userland tests to reflect the changes

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 include/linux/mm.h              | 21 ++++++++++++++++++---
 tools/testing/vma/include/dup.h |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

include/linux/mm.h +5 -2

index 868b2334bff3..cf7df1569052 100644
@@ -472,6 +472,7 @@ enum {
 #define VM_SAO		INIT_VM_FLAG(SAO)
 #elif defined(CONFIG_PARISC)
 #define VM_GROWSUP	INIT_VM_FLAG(GROWSUP)
+#define VMA_GROWSUP	mk_vma_flags(VMA_GROWSUP_BIT)
 #elif defined(CONFIG_SPARC64)
 #define VM_SPARC_ADI	INIT_VM_FLAG(SPARC_ADI)
 #define VM_ARCH_CLEAR	INIT_VM_FLAG(ARCH_CLEAR)

@@ -483,6 +484,7 @@ enum {
 #endif
 #ifndef VM_GROWSUP
 #define VM_GROWSUP	VM_NONE
+#define VMA_GROWSUP	EMPTY_VMA_FLAGS
 #endif
 #ifdef CONFIG_ARM64_MTE
 #define VM_MTE		INIT_VM_FLAG(MTE)

@@ -1563,11 +1565,24 @@ static inline bool vma_is_initial_stack(const struct vm_area_struct *vma)
 		vma->vm_end >= vma->vm_mm->start_stack;
 }
 
-static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)
+static inline bool vma_flags_can_grow(const vma_flags_t *flags)
 {
-	int maybe_stack = vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP);
+	if (vma_flags_test_single_mask(flags, VMA_GROWSUP))
+		return true;

include/linux/mm.h static inline bool vma_is_initial_stack(const struct vm_area_struct *vma) · line 1580

Quoted 10 lines

include/linux/mm.h +8 -1

+	if (vma_flags_test(flags, VMA_GROWSDOWN_BIT))
+		return true;
+
+	return false;
+}
 
-	if (!maybe_stack)
+static inline bool vma_can_grow(const struct vm_area_struct *vma)
+{
+	return vma_flags_can_grow(&vma->flags);

Would it save vma_flags_can_grow() if we do below?

Quoted 3 lines

return vma_test(vma, VMA_GROWSDOWN_BIT) || vma_test_single_mask(vma, VMA_GROWSUP);

I find these two functions when I am reading mm.h.

Yeah but we require vma_flags_can_grow() for code in mmap.c, the majority of checks of this have only vma_flags_t to work with not a VMA :)

Quoted 31 lines

Quoted 31 lines

include/linux/mm.h +5 -0

+}
+
+static inline bool vma_is_temporary_stack(const struct vm_area_struct *vma)
+{
+	if (!vma_can_grow(vma))
 		return false;
 
 	if ((vma->vm_flags & VM_STACK_INCOMPLETE_SETUP) ==

tools/testing/vma/include/dup.h +4 -0

index 5d7d0afd7765..6f5bcd7fbcd8 100644
@@ -245,8 +245,10 @@ enum {
 #define VM_STACK	INIT_VM_FLAG(STACK)
 #ifdef CONFIG_STACK_GROWS_UP
 #define VM_STACK_EARLY	INIT_VM_FLAG(STACK_EARLY)
+#define VMA_STACK_EARLY mk_vma_flags(VMA_STACK_EARLY_BIT)
 #else
 #define VM_STACK_EARLY	VM_NONE
+#define VMA_STACK_EARLY EMPTY_VMA_FLAGS
 #endif
 #ifdef CONFIG_ARCH_HAS_PKEYS
 #define VM_PKEY_SHIFT ((__force int)VMA_HIGH_ARCH_0_BIT)

@@ -315,6 +317,8 @@ enum {
 
 /* Bits set in the VMA until the stack is in its final location */
 #define VM_STACK_INCOMPLETE_SETUP (VM_RAND_READ | VM_SEQ_READ | VM_STACK_EARLY)
+#define VMA_STACK_INCOMPLETE_SETUP append_vma_flags(		\
+	VMA_STACK_EARLY, VMA_RAND_READ_BIT, VMA_SEQ_READ_BIT)
 

Quoted 5 lines

tools/testing/vma/include/dup.h enum { · line 324

Quoted 2 lines

tools/testing/vma/include/dup.h +0 -0

 #define TASK_EXEC_BIT ((current->personality & READ_IMPLIES_EXEC) ? \
 		       VM_EXEC_BIT : VM_READ_BIT)

Why are VMA_STACK_EARLY and VMA_STACK_INCOMPLETE_SETUP added here but not in mm.h?

Yeah urgh oops my bad. It doesn't really break anything but I'll fix it if a respin is needed...

These test whether the VMA has stack sematics, i.e. is able to grow upwards or downwards depending on the architecture.

In order to account for arches which do not support upward-growing stacks, introduce VMA_GROWSUP whose definition depends on the architecture supporting it, and use vma_flags_test_single_mask() in vma_flags_can_grow() to account for this.

Update the VMA userland tests to reflect the changes

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

These test whether the VMA has stack sematics, i.e. is able to grow upwards or downwards depending on the architecture.

In order to account for arches which do not support upward-growing stacks, introduce VMA_GROWSUP whose definition depends on the architecture supporting it, and use vma_flags_test_single_mask() in vma_flags_can_grow() to account for this.

Update the VMA userland tests to reflect the changes

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 include/linux/mm.h              | 21 ++++++++++++++++++---
 tools/testing/vma/include/dup.h |  4 ++++
 2 files changed, 22 insertions(+), 3 deletions(-)

The core do_mmap() function accepts a vm_flags_t parameter which it then manipulates before passing to mmap_region() to do the heavy lifting of the memory mapping.

Update do_mmap() to instead accept a vma_flags_t parameter, and adjust all the logic within do_mmap() to manipulate this instead.

This is as part of the ongoing effort to convert VMA flags from a system word size to a bitmap type which allows us to unrestrict the number of VMA flags, as well as gain control over how VMA flag manipulation occurs.

We do not cascade these changes to all functions which accept vm_flags_t, but rather use vma_flags_to_legacy() where necessary, specifically deferring converting calc_vm_prot_bits(), calc_vm_flag_bits() and __get_unmapped_area() to vma_flags_t.

Also utilise the new vma_flags_can_grow() predicate which correctly handles the case of architectures without upward growing stacks.

As part of this change, introduce VMA_SHADOW_STACK so we can correctly handle the case of the shadow stack not being defined.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

mm/mmap.c +0 -0

index 46174e706bbe..547352183214 100644

mm/mmap.c +9 -5

@@ -488,23 +496,27 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 		 * Check to see if we are violating any seals and update VMA
 		 * flags if necessary to avoid future seal violations.
 		 */
-		err = memfd_check_seals_mmap(file, &vm_flags);
+		err = memfd_check_seals_mmap(file, &vma_flags);
 		if (err)
 			return (unsigned long)err;
 	} else {
 		switch (flags & MAP_TYPE) {
 		case MAP_SHARED:
-			if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
+			if (vma_flags_can_grow(&vma_flags))
 				return -EINVAL;
 			/*
 			 * Ignore pgoff.
 			 */
 			pgoff = 0;
-			vm_flags |= VM_SHARED | VM_MAYSHARE;
+			vma_flags_set(&vma_flags, VMA_SHARED_BIT, VMA_MAYSHARE_BIT);
 			break;
-		case MAP_DROPPABLE:
-			if (VM_DROPPABLE == VM_NONE)
+		case MAP_DROPPABLE: {
+			vma_flags_t droppable = VMA_DROPPABLE;
+
+			if (vma_flags_empty(&droppable))
 				return -EOPNOTSUPP;
+			vma_flags_set_mask(&vma_flags, droppable);
+
 			/*
 			 * A locked or stack area makes no sense to be droppable.
 			 *

mm/mmap.c +5 -3

-
 			/*
 			 * If the pages can be dropped, then it doesn't make
 			 * sense to reserve them.
 			 */
-			vm_flags |= VM_NORESERVE;
+			vma_flags_set(&vma_flags, VMA_NORESERVE_BIT);
 
 			/*
 			 * Likewise, they're volatile enough that they
 			 * shouldn't survive forks or coredumps.
 			 */
-			vm_flags |= VM_WIPEONFORK | VM_DONTDUMP;
+			vma_flags_set(&vma_flags, VMA_WIPEONFORK_BIT,
+				      VMA_DONTDUMP_BIT);
+
 			fallthrough;
+		}
 		case MAP_PRIVATE:
 			/*
 			 * Set pgoff according to addr for anon_vma.

Quoted 22 lines · Lorenzo Stoakes

The core do_mmap() function accepts a vm_flags_t parameter which it then manipulates before passing to mmap_region() to do the heavy lifting of the memory mapping.

Update do_mmap() to instead accept a vma_flags_t parameter, and adjust all the logic within do_mmap() to manipulate this instead.

This is as part of the ongoing effort to convert VMA flags from a system word size to a bitmap type which allows us to unrestrict the number of VMA flags, as well as gain control over how VMA flag manipulation occurs.

We do not cascade these changes to all functions which accept vm_flags_t, but rather use vma_flags_to_legacy() where necessary, specifically deferring converting calc_vm_prot_bits(), calc_vm_flag_bits() and __get_unmapped_area() to vma_flags_t.

Also utilise the new vma_flags_can_grow() predicate which correctly handles the case of architectures without upward growing stacks.

As part of this change, introduce VMA_SHADOW_STACK so we can correctly handle the case of the shadow stack not being defined.

Quoted 4 lines

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

Not exactly a small one :) I stared at this patch for a while, hopefully don't miss anythig ...

Just one tiny nit below. Overall, LGTM, feel free to add:

Reviewed-by Lance Yang <[email protected]>

[...]

Quoted 4 lines

mm/mmap.c +0 -0

index 46174e706bbe..547352183214 100644

[...]

Quoted 41 lines

mm/mmap.c +10 -6

@@ -488,23 +496,27 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 		 * Check to see if we are violating any seals and update VMA
 		 * flags if necessary to avoid future seal violations.
 		 */
-		err = memfd_check_seals_mmap(file, &vm_flags);
+		err = memfd_check_seals_mmap(file, &vma_flags);
 		if (err)
 			return (unsigned long)err;
 	} else {
 		switch (flags & MAP_TYPE) {
 		case MAP_SHARED:
-			if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
+			if (vma_flags_can_grow(&vma_flags))
 				return -EINVAL;
 			/*
 			 * Ignore pgoff.
 			 */
 			pgoff = 0;
-			vm_flags |= VM_SHARED | VM_MAYSHARE;
+			vma_flags_set(&vma_flags, VMA_SHARED_BIT, VMA_MAYSHARE_BIT);
 			break;
-		case MAP_DROPPABLE:
-			if (VM_DROPPABLE == VM_NONE)
+		case MAP_DROPPABLE: {
+			vma_flags_t droppable = VMA_DROPPABLE;
+
+			if (vma_flags_empty(&droppable))
 				return -EOPNOTSUPP;
+			vma_flags_set_mask(&vma_flags, droppable);
+
 			/*
 			 * A locked or stack area makes no sense to be droppable.
 			 *

@@ -515,23 +527,24 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 			 */
 			if (flags & (MAP_LOCKED | MAP_HUGETLB))
 			        return -EINVAL;
-			if (vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
+			if (vma_flags_can_grow(&vma_flags))
 			        return -EINVAL;
 

mm/mmap.c unsigned long do_mmap(struct file *file, unsigned long addr, · line 521

Quoted 1 line

mm/mmap.c +0 -1

-			vm_flags |= VM_DROPPABLE;

Old code checked VM_GROWSDOWN|VM_GROWSUP before seting VM_DROPPABLE. New code flips that around. Hmm, shouldn't master, just made me look twice ;)

Maybe keep old order?

Cheers, Lance

Quoted 8 lines

mm/mmap.c +1 -2

-
 			/*
 			 * If the pages can be dropped, then it doesn't make
 			 * sense to reserve them.
 			 */
-			vm_flags |= VM_NORESERVE;
+			vma_flags_set(&vma_flags, VMA_NORESERVE_BIT);
 

Quoted 13 lines

mm/mmap.c +4 -1

 			/*
 			 * Likewise, they're volatile enough that they
 			 * shouldn't survive forks or coredumps.
 			 */
-			vm_flags |= VM_WIPEONFORK | VM_DONTDUMP;
+			vma_flags_set(&vma_flags, VMA_WIPEONFORK_BIT,
+				      VMA_DONTDUMP_BIT);
+
 			fallthrough;
+		}
 		case MAP_PRIVATE:
 			/*
 			 * Set pgoff according to addr for anon_vma.

[...]

On Thu, Jul 02, 2026 at 07:15:31PM +0800, Lance Yang wrote:

Quoted 53 lines

[...]

Quoted 4 lines

mm/mmap.c +0 -0

index 46174e706bbe..547352183214 100644

[...]

Quoted 34 lines

mm/mmap.c +9 -5

@@ -488,23 +496,27 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 		 * Check to see if we are violating any seals and update VMA
 		 * flags if necessary to avoid future seal violations.
 		 */
-		err = memfd_check_seals_mmap(file, &vm_flags);
+		err = memfd_check_seals_mmap(file, &vma_flags);
 		if (err)
 			return (unsigned long)err;
 	} else {
 		switch (flags & MAP_TYPE) {
 		case MAP_SHARED:
-			if (vm_flags & (VM_GROWSDOWN|VM_GROWSUP))
+			if (vma_flags_can_grow(&vma_flags))
 				return -EINVAL;
 			/*
 			 * Ignore pgoff.
 			 */
 			pgoff = 0;
-			vm_flags |= VM_SHARED | VM_MAYSHARE;
+			vma_flags_set(&vma_flags, VMA_SHARED_BIT, VMA_MAYSHARE_BIT);
 			break;
-		case MAP_DROPPABLE:
-			if (VM_DROPPABLE == VM_NONE)
+		case MAP_DROPPABLE: {
+			vma_flags_t droppable = VMA_DROPPABLE;
+
+			if (vma_flags_empty(&droppable))
 				return -EOPNOTSUPP;
+			vma_flags_set_mask(&vma_flags, droppable);
+
 			/*
 			 * A locked or stack area makes no sense to be droppable.
 			 *

mm/mmap.c unsigned long do_mmap(struct file *file, unsigned long addr, · line 521

Quoted 8 lines

mm/mmap.c +1 -2

@@ -515,23 +527,24 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 			 */
 			if (flags & (MAP_LOCKED | MAP_HUGETLB))
 			        return -EINVAL;
-			if (vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
+			if (vma_flags_can_grow(&vma_flags))
 			        return -EINVAL;
 
-			vm_flags |= VM_DROPPABLE;

Old code checked VM_GROWSDOWN|VM_GROWSUP before seting VM_DROPPABLE. New code flips that around. Hmm, shouldn't master, just made me look twice ;)

Quoted 1 line

Maybe keep old order?

I guess I feared that defining droppable above then referencing it below would be less clear?

Can move if you feel strongly about it, and sorry for making the move at the same time as the general vm_flags_t -> vma_flags_t refactor as it does make that less clear...

The core do_mmap() function accepts a vm_flags_t parameter which it then manipulates before passing to mmap_region() to do the heavy lifting of the memory mapping.

Update do_mmap() to instead accept a vma_flags_t parameter, and adjust all the logic within do_mmap() to manipulate this instead.

This is as part of the ongoing effort to convert VMA flags from a system word size to a bitmap type which allows us to unrestrict the number of VMA flags, as well as gain control over how VMA flag manipulation occurs.

We do not cascade these changes to all functions which accept vm_flags_t, but rather use vma_flags_to_legacy() where necessary, specifically deferring converting calc_vm_prot_bits(), calc_vm_flag_bits() and __get_unmapped_area() to vma_flags_t.

Also utilise the new vma_flags_can_grow() predicate which correctly handles the case of architectures without upward growing stacks.

As part of this change, introduce VMA_SHADOW_STACK so we can correctly handle the case of the shadow stack not being defined.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 arch/mips/kernel/vdso.c |  4 +--
 fs/aio.c                |  2 +-
 include/linux/memfd.h   |  6 ++--
 include/linux/mm.h      |  6 ++--
 ipc/shm.c               |  3 +-
 mm/memfd.c              | 15 ++++-----
 mm/mmap.c               | 67 ++++++++++++++++++++++++-----------------
 mm/nommu.c              |  3 +-
 mm/util.c               | 10 +++---
 mm/vma.c                |  7 ++---
 mm/vma.h                |  2 +-
 11 files changed, 69 insertions(+), 56 deletions(-)

mm/memfd.c +3 -6

-static int check_write_seal(vm_flags_t *vm_flags_ptr)
+static int check_write_seal(vma_flags_t *vma_flags_ptr)
 {
-	vm_flags_t vm_flags = *vm_flags_ptr;
-	vm_flags_t mask = vm_flags & (VM_SHARED | VM_WRITE);
-
 	/* If a private mapping then writability is irrelevant. */
-	if (!(mask & VM_SHARED))
+	if (!vma_flags_test(vma_flags_ptr, VMA_SHARED_BIT))
 		return 0;
 
 	/*
 	 * New PROT_WRITE and MAP_SHARED mmaps are not allowed when
 	 * write seals are active.
 	 */
-	if (mask & VM_WRITE)
+	if (vma_flags_test(vma_flags_ptr, VMA_WRITE_BIT))
 		return -EPERM;

mm/mmap.c +6 -0

+		case MAP_DROPPABLE: {
+			vma_flags_t droppable = VMA_DROPPABLE;
+
+			if (vma_flags_empty(&droppable))
 				return -EOPNOTSUPP;
+			vma_flags_set_mask(&vma_flags, droppable);
+
 			/*
 			 * A locked or stack area makes no sense to be droppable.
 			 *

Quoted 39 lines · Lorenzo Stoakes

The core do_mmap() function accepts a vm_flags_t parameter which it then manipulates before passing to mmap_region() to do the heavy lifting of the memory mapping.

Update do_mmap() to instead accept a vma_flags_t parameter, and adjust all the logic within do_mmap() to manipulate this instead.

This is as part of the ongoing effort to convert VMA flags from a system word size to a bitmap type which allows us to unrestrict the number of VMA flags, as well as gain control over how VMA flag manipulation occurs.

We do not cascade these changes to all functions which accept vm_flags_t, but rather use vma_flags_to_legacy() where necessary, specifically deferring converting calc_vm_prot_bits(), calc_vm_flag_bits() and __get_unmapped_area() to vma_flags_t.

Also utilise the new vma_flags_can_grow() predicate which correctly handles the case of architectures without upward growing stacks.

As part of this change, introduce VMA_SHADOW_STACK so we can correctly handle the case of the shadow stack not being defined.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 arch/mips/kernel/vdso.c |  4 +--
 fs/aio.c                |  2 +-
 include/linux/memfd.h   |  6 ++--
 include/linux/mm.h      |  6 ++--
 ipc/shm.c               |  3 +-
 mm/memfd.c              | 15 ++++-----
 mm/mmap.c               | 67 ++++++++++++++++++++++++-----------------
 mm/nommu.c              |  3 +-
 mm/util.c               | 10 +++---
 mm/vma.c                |  7 ++---
 mm/vma.h                |  2 +-
 11 files changed, 69 insertions(+), 56 deletions(-)

<snip>

Quoted 27 lines

mm/memfd.c +4 -7

-static int check_write_seal(vm_flags_t *vm_flags_ptr)
+static int check_write_seal(vma_flags_t *vma_flags_ptr)
 {
-	vm_flags_t vm_flags = *vm_flags_ptr;
-	vm_flags_t mask = vm_flags & (VM_SHARED | VM_WRITE);
-
 	/* If a private mapping then writability is irrelevant. */
-	if (!(mask & VM_SHARED))
+	if (!vma_flags_test(vma_flags_ptr, VMA_SHARED_BIT))
 		return 0;
 
 	/*
 	 * New PROT_WRITE and MAP_SHARED mmaps are not allowed when
 	 * write seals are active.
 	 */
-	if (mask & VM_WRITE)
+	if (vma_flags_test(vma_flags_ptr, VMA_WRITE_BIT))
 		return -EPERM;
 
 	/*
 	 * This is a read-only mapping, disallow mprotect() from making a
 	 * write-sealed mapping writable in future.
 	 */
-	*vm_flags_ptr &= ~VM_MAYWRITE;
+	vma_flags_clear(vma_flags_ptr, VMA_MAYWRITE_BIT);

Quoted 2 lines

return 0;
}

This function alone changed its original behavior, since vm_flags is a snapshot of *vm_flags_ptr, but after the change this snapshot is gone. But its only caller memfd_check_seals_mmap() gets vm_flags_ptr from the input parameter of do_mmap(), so the overall behavior does not change.

<snip>

Quoted 18 lines

mm/mmap.c +7 -1

+		case MAP_DROPPABLE: {
+			vma_flags_t droppable = VMA_DROPPABLE;
+
+			if (vma_flags_empty(&droppable))
 				return -EOPNOTSUPP;
+			vma_flags_set_mask(&vma_flags, droppable);
+
 			/*
 			 * A locked or stack area makes no sense to be droppable.
 			 *

@@ -515,23 +527,24 @@ unsigned long do_mmap(struct file *file, unsigned long addr,
 			 */
 			if (flags & (MAP_LOCKED | MAP_HUGETLB))
 			        return -EINVAL;
-			if (vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
+			if (vma_flags_can_grow(&vma_flags))
 			        return -EINVAL;
 

mm/mmap.c unsigned long do_mmap(struct file *file, unsigned long addr, · line 522

Quoted 2 lines

mm/mmap.c +0 -2

-			vm_flags |= VM_DROPPABLE;
-

Lance pointed out the reordering of setting VMA_DROPPABLE and checking of can_grow, but these flags are not overlapped and there is no parallel writer to vma_flags. So it is still no functional change, just not mechanical changes. :)

Otherwise, LGTM.

Reviewed-by Zi Yan <[email protected]>

--
Best Regards,
Yan, Zi

Update __get_unmapped_area() to be parameterised by vma_flags_t rather than vm_flags_t as part of the effort to move VMA flags from a system word to a bitmap.

We cascade the changes up to arch_get_unmapped_area_topdown() and arch_get_unmapped_area(), where, for now, we use vma_flags_to_legacy() in order to propagate the VMA flags.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

Update __get_unmapped_area() to be parameterised by vma_flags_t rather than vm_flags_t as part of the effort to move VMA flags from a system word to a bitmap.

We cascade the changes up to arch_get_unmapped_area_topdown() and arch_get_unmapped_area(), where, for now, we use vma_flags_to_legacy() in order to propagate the VMA flags.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 fs/hugetlbfs/inode.c     |  3 ++-
 include/linux/huge_mm.h  | 10 +++++-----
 include/linux/mm.h       |  6 ++++--
 include/linux/sched/mm.h | 12 ++++++------
 mm/huge_memory.c         | 21 ++++++++++++---------
 mm/mmap.c                | 27 ++++++++++++++-------------
 6 files changed, 43 insertions(+), 36 deletions(-)

include/linux/sched/mm.h +0 -2

index 95d0040df584..b301ec90740a 100644
@@ -193,12 +193,12 @@ unsigned long mm_get_unmapped_area(struct file *filp, unsigned long addr,
 				   unsigned long len, unsigned long pgoff,
 				   unsigned long flags);
 
-unsigned long mm_get_unmapped_area_vmflags(struct file *filp,
-					   unsigned long addr,

Quoted 20 lines · Lorenzo Stoakes

Update __get_unmapped_area() to be parameterised by vma_flags_t rather than vm_flags_t as part of the effort to move VMA flags from a system word to a bitmap.

We cascade the changes up to arch_get_unmapped_area_topdown() and arch_get_unmapped_area(), where, for now, we use vma_flags_to_legacy() in order to propagate the VMA flags.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 fs/hugetlbfs/inode.c     |  3 ++-
 include/linux/huge_mm.h  | 10 +++++-----
 include/linux/mm.h       |  6 ++++--
 include/linux/sched/mm.h | 12 ++++++------
 mm/huge_memory.c         | 21 ++++++++++++---------
 mm/mmap.c                | 27 ++++++++++++++-------------
 6 files changed, 43 insertions(+), 36 deletions(-)

<snip>

Quoted 8 lines

include/linux/sched/mm.h +0 -0

index 95d0040df584..b301ec90740a 100644
@@ -193,12 +193,12 @@ unsigned long mm_get_unmapped_area(struct file *filp, unsigned long addr,
 				   unsigned long len, unsigned long pgoff,
 				   unsigned long flags);
 

include/linux/sched/mm.h unsigned long mm_get_unmapped_area(struct file *filp, unsigned long addr, · line 201

Quoted 12 lines

include/linux/sched/mm.h +6 -6

-unsigned long mm_get_unmapped_area_vmflags(struct file *filp,
-					   unsigned long addr,
-					   unsigned long len,
-					   unsigned long pgoff,
-					   unsigned long flags,
-					   vm_flags_t vm_flags);
+unsigned long mm_get_unmapped_area_vmaflags(struct file *filp,
+					    unsigned long addr,
+					    unsigned long len,
+					    unsigned long pgoff,
+					    unsigned long flags,
+					    vma_flags_t vma_flags);

Want to use two-tab indentation while at it?

<snip>

Quoted 4 lines

include/linux/sched/mm.h +0 -0

@@ -812,19 +811,20 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
 }
 #endif
 

include/linux/sched/mm.h arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr, · line 816

Quoted 6 lines

include/linux/sched/mm.h +3 -3

-unsigned long mm_get_unmapped_area_vmflags(struct file *filp, unsigned long addr,
-					   unsigned long len, unsigned long pgoff,
-					   unsigned long flags, vm_flags_t vm_flags)
+unsigned long mm_get_unmapped_area_vmaflags(struct file *filp, unsigned long addr,
+					    unsigned long len, unsigned long pgoff,
+					    unsigned long flags, vma_flags_t vma_flags)

Ditto.

LGTM.

Reviewed-by Zi Yan <[email protected]>

--
Best Regards,
Yan, Zi

As part of the changes converting VMA flags from a system word size to a bitmap, extend this change to generic_get_unmapped_area() and generic_get_unmapped_area_topdown(), which also allows us to convert stack_guard_placement() as well.

We retain arch_get_unmapped_area() and arch_get_unmapped_area_topdown() as-is for now, using legacy_to_vma_flags() as necessary to do so.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

As part of the changes converting VMA flags from a system word size to a bitmap, extend this change to generic_get_unmapped_area() and generic_get_unmapped_area_topdown(), which also allows us to convert stack_guard_placement() as well.

We retain arch_get_unmapped_area() and arch_get_unmapped_area_topdown() as-is for now, using legacy_to_vma_flags() as necessary to do so.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 arch/powerpc/mm/book3s64/slice.c |  6 ++++--
 include/linux/sched/mm.h         |  4 ++--
 mm/mmap.c                        | 16 ++++++++--------
 3 files changed, 14 insertions(+), 12 deletions(-)

Currently mm->def_flags (of type vm_flags_t) is union'd with mm->def_vma_flags (of type vma_flags_t).

As part of the effort to convert vm_flags_t usage to vma_flags_t (in order to no longer be arbitrarily limited to a system word size for VMA flags), prefer mm->def_vma_flags to mm->def_flags throughout the mm logic.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

mm/debug.c |  2 +-
mm/mlock.c | 13 +++++++------
mm/mmap.c  | 11 ++++++-----
mm/vma.c   |  4 ++--
4 files changed, 16 insertions(+), 14 deletions(-)

mm/debug.c +0 -0

index 497654b36f1a..f0a354a9496a 100644

mm/debug.c +0 -0

 }
 EXPORT_SYMBOL(dump_mm);

Quoted 17 lines · Lorenzo Stoakes

Currently mm->def_flags (of type vm_flags_t) is union'd with mm->def_vma_flags (of type vma_flags_t).

As part of the effort to convert vm_flags_t usage to vma_flags_t (in order to no longer be arbitrarily limited to a system word size for VMA flags), prefer mm->def_vma_flags to mm->def_flags throughout the mm logic.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

mm/debug.c |  2 +-
mm/mlock.c | 13 +++++++------
mm/mmap.c  | 11 ++++++-----
mm/vma.c   |  4 ++--
4 files changed, 16 insertions(+), 14 deletions(-)

mm/debug.c void dump_mm(const struct mm_struct *mm) · line 230

Quoted 11 lines

mm/debug.c +1 -1

index 497654b36f1a..f0a354a9496a 100644
@@ -226,7 +226,7 @@ void dump_mm(const struct mm_struct *mm)
 		mm->numa_next_scan, mm->numa_scan_offset, mm->numa_scan_seq,
 #endif
 		atomic_read(&mm->tlb_flush_pending),
-		mm->def_flags, &mm->def_flags
+		vma_flags_to_legacy(mm->def_vma_flags), &mm->def_vma_flags
 	);

While at it, one thing for later: dump_mm() still assumes one-world VMA flags. That works today since vma_flags_t is one word. Maybe worth a BUILD_BUG_ON() here, before that stops being true?

Not a big deal though. Feel free to add:

Reviewed-by Lance Yang <[email protected]>

Quoted 2 lines

mm/debug.c +0 -0

 }
 EXPORT_SYMBOL(dump_mm);

[...]

Currently mm->def_flags (of type vm_flags_t) is union'd with mm->def_vma_flags (of type vma_flags_t).

As part of the effort to convert vm_flags_t usage to vma_flags_t (in order to no longer be arbitrarily limited to a system word size for VMA flags), prefer mm->def_vma_flags to mm->def_flags throughout the mm logic.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 mm/debug.c |  2 +-
 mm/mlock.c | 13 +++++++------
 mm/mmap.c  | 11 ++++++-----
 mm/vma.c   |  4 ++--
 4 files changed, 16 insertions(+), 14 deletions(-)

Update vm_pgprot_modify() to use the new VMA flags type vma_flags_t, and rename to vma_pgprot_modify() accordingly.

This is part of the ongoing work to convert vm_flags_t to vma_flags_t, in order to eliminate the arbitrary limit of the number of bits in a system word on available VMA flags.

Update VMA userland tests accordingly, updating vma_set_page_prot() to no longer inline vma_pgprot_modify(), rather we can simply define vma_pgprot_modify() as a static inline function and the tests will pick it up from vma.h.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

mm/vma.h +0 -0

index bcf0c2773449..6a8abb8ae937 100644

Quoted 16 lines · Lorenzo Stoakes

Update vm_pgprot_modify() to use the new VMA flags type vma_flags_t, and rename to vma_pgprot_modify() accordingly.

This is part of the ongoing work to convert vm_flags_t to vma_flags_t, in order to eliminate the arbitrary limit of the number of bits in a system word on available VMA flags.

Update VMA userland tests accordingly, updating vma_set_page_prot() to no longer inline vma_pgprot_modify(), rather we can simply define vma_pgprot_modify() as a static inline function and the tests will pick it up from vma.h.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

[...]

Quoted 5 lines

mm/vma.h +0 -0

index bcf0c2773449..6a8abb8ae937 100644

mm/vma.h static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struct *vma · line 529

Quoted 10 lines

mm/vma.h +4 -2

@@ -522,9 +522,11 @@ static inline bool vma_wants_manual_pte_write_upgrade(struct vm_area_struct *vma
 }
 
 #ifdef CONFIG_MMU
-static inline pgprot_t vm_pgprot_modify(pgprot_t oldprot, vm_flags_t vm_flags)
+static inline pgprot_t vma_pgprot_modify(pgprot_t oldprot, vma_flags_t vma_flags)
 {
-	return pgprot_modify(oldprot, vm_get_page_prot(vm_flags));
+	const pgprot_t prot = vma_get_page_prot(vma_flags);
+
+	return pgprot_modify(oldprot, prot);

Nit: could this just stay as a single return? something like:

return pgprot_modify(oldprot, vma_get_page_prot(vma_flags));

Otherwise, LGTM, feel free to add:

Reviewed-by Lance Yang <[email protected]>

[...]

Update vm_pgprot_modify() to use the new VMA flags type vma_flags_t, and rename to vma_pgprot_modify() accordingly.

This is part of the ongoing work to convert vm_flags_t to vma_flags_t, in order to eliminate the arbitrary limit of the number of bits in a system word on available VMA flags.

Update VMA userland tests accordingly, updating vma_set_page_prot() to no longer inline vma_pgprot_modify(), rather we can simply define vma_pgprot_modify() as a static inline function and the tests will pick it up from vma.h.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 mm/mmap.c                       |  8 ++++----
 mm/vma.c                        |  2 +-
 mm/vma.h                        |  6 ++++--
 tools/testing/vma/include/dup.h | 12 +++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

Having vma_get_page_prot() refer to VMA flags and vma_set_page_prot() refer to a VMA is confusing.

Rename vma_get_page_prot() to vma_flags_to_page_prot() to resolve this confusion.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

Having vma_get_page_prot() refer to VMA flags and vma_set_page_prot() refer to a VMA is confusing.

Rename vma_get_page_prot() to vma_flags_to_page_prot() to resolve this confusion.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 include/linux/mm.h              | 4 ++--
 mm/vma.c                        | 2 +-
 mm/vma.h                        | 2 +-
 tools/testing/vma/include/dup.h | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

There's a large number of vm_get_page_prot(vma->vm_flags) invocations. Make life easier by introducing vma_get_page_prot() parameterised by the VMA.

This also makes converting vm_get_page_prot() to vma_flags_t easier.

Also update the userland VMA tests to reflect the change.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
  drivers/gpu/drm/drm_gem.c                   |  2 +-
  drivers/gpu/drm/drm_gem_dma_helper.c        |  2 +-
  drivers/gpu/drm/drm_gem_shmem_helper.c      |  2 +-
  drivers/gpu/drm/etnaviv/etnaviv_gem.c       |  2 +-
  drivers/gpu/drm/exynos/exynos_drm_gem.c     |  6 +++---
  drivers/gpu/drm/i915/gem/i915_gem_mman.c    | 12 ++++++------
  drivers/gpu/drm/msm/msm_gem.c               |  2 +-
  drivers/gpu/drm/nouveau/nouveau_gem.c       |  2 +-
  drivers/gpu/drm/omapdrm/omap_fbdev.c        |  2 +-
  drivers/gpu/drm/omapdrm/omap_gem.c          |  6 +++---
  drivers/gpu/drm/rockchip/rockchip_drm_gem.c |  2 +-
  drivers/gpu/drm/tegra/gem.c                 |  2 +-
  drivers/gpu/drm/virtio/virtgpu_vram.c       |  2 +-
  drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c  |  2 +-
  drivers/gpu/drm/xe/xe_device.c              |  2 +-
  drivers/gpu/drm/xe/xe_mmio_gem.c            |  2 +-
  drivers/gpu/drm/xen/xen_drm_front_gem.c     |  2 +-
  drivers/video/fbdev/core/fb_io_fops.c       |  2 +-
  include/linux/mm.h                          | 10 +++++++++-
  mm/vma.c                                    |  2 +-
  mm/vma_exec.c                               |  2 +-
  sound/core/memalloc.c                       |  2 +-
  tools/testing/vma/include/dup.h             |  4 ++++
  23 files changed, 43 insertions(+), 31 deletions(-)

drivers/gpu/drm/drm_gem.c +1 -1

index e3ed684ddcf2..32a05d889b9a 100644
@@ -1252,7 +1252,7 @@ int drm_gem_mmap_obj(struct drm_gem_object *obj, unsigned long obj_size,
  		}
 
  		vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP);
-		vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+		vma->vm_page_prot = pgprot_writecombine(vma_get_page_prot(vma));
  		vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
  	}
 

drivers/gpu/drm/drm_gem_dma_helper.c +1 -1

index 1c00a71ab3c9..7d9612075d31 100644
@@ -540,7 +540,7 @@ int drm_gem_dma_mmap(struct drm_gem_dma_object *dma_obj, struct vm_area_struct *
  	vm_flags_mod(vma, VM_DONTDUMP | VM_DONTEXPAND, VM_PFNMAP);
 
  	if (dma_obj->map_noncoherent) {
-		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+		vma->vm_page_prot = vma_get_page_prot(vma);
 
  		ret = dma_mmap_pages(drm_dev_dma_dev(dma_obj->base.dev),
  				     vma, vma->vm_end - vma->vm_start,

drivers/gpu/drm/drm_gem_shmem_helper.c +1 -1

index c989459eb215..06d019d51d3e 100644
@@ -764,7 +764,7 @@ int drm_gem_shmem_mmap(struct drm_gem_shmem_object *shmem, struct vm_area_struct
  		return ret;
 
  	vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP);
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
  	if (shmem->map_wc)
  		vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 

drivers/gpu/drm/etnaviv/etnaviv_gem.c +1 -1

index 2e4d6d117ee2..f9c8b7b2bfc7 100644
@@ -133,7 +133,7 @@ static int etnaviv_gem_mmap_obj(struct etnaviv_gem_object *etnaviv_obj,
 
  	vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP);
 
-	vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vm_page_prot = vma_get_page_prot(vma);
 
  	if (etnaviv_obj->flags & ETNA_BO_WC) {
  		vma->vm_page_prot = pgprot_writecombine(vm_page_prot);

drivers/gpu/drm/exynos/exynos_drm_gem.c +3 -3

index 9a6270f3dca6..0208c9259572 100644
@@ -377,13 +377,13 @@ static int exynos_drm_gem_mmap(struct drm_gem_object *obj, struct vm_area_struct
 
  	/* non-cachable as default. */
  	if (exynos_gem->flags & EXYNOS_BO_CACHABLE)
-		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+		vma->vm_page_prot = vma_get_page_prot(vma);
  	else if (exynos_gem->flags & EXYNOS_BO_WC)
  		vma->vm_page_prot =
-			pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+			pgprot_writecombine(vma_get_page_prot(vma));
  	else
  		vma->vm_page_prot =
-			pgprot_noncached(vm_get_page_prot(vma->vm_flags));
+			pgprot_noncached(vma_get_page_prot(vma));
 
  	ret = exynos_drm_gem_mmap_buffer(exynos_gem, vma);
  	if (ret)

drivers/gpu/drm/i915/gem/i915_gem_mman.c +6 -6

index 0644f85c6c8e..9ca90c1bb5b4 100644
@@ -112,7 +112,7 @@ i915_gem_mmap_ioctl(struct drm_device *dev, void *data,
  		vma = find_vma(mm, addr);
  		if (vma && __vma_matches(vma, obj->base.filp, addr, args->size))
  			vma->vm_page_prot =
-				pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+				pgprot_writecombine(vma_get_page_prot(vma));
  		else
  			addr = -ENOMEM;
  		mmap_write_unlock(mm);

@@ -1024,7 +1024,7 @@ i915_gem_object_mmap(struct drm_i915_gem_object *obj,
  	fput(anon);
 
  	if (obj->ops->mmap_ops) {
-		vma->vm_page_prot = pgprot_decrypted(vm_get_page_prot(vma->vm_flags));
+		vma->vm_page_prot = pgprot_decrypted(vma_get_page_prot(vma));
  		vma->vm_ops = obj->ops->mmap_ops;
  		vma->vm_private_data = obj->base.vma_node.driver_private;
  		return 0;

@@ -1035,7 +1035,7 @@ i915_gem_object_mmap(struct drm_i915_gem_object *obj,
  	switch (mmo->mmap_type) {
  	case I915_MMAP_TYPE_WC:
  		vma->vm_page_prot =
-			pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+			pgprot_writecombine(vma_get_page_prot(vma));
  		vma->vm_ops = &vm_ops_cpu;
  		break;
 

@@ -1043,19 +1043,19 @@ i915_gem_object_mmap(struct drm_i915_gem_object *obj,
  		GEM_WARN_ON(1);
  		fallthrough;
  	case I915_MMAP_TYPE_WB:
-		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+		vma->vm_page_prot = vma_get_page_prot(vma);
  		vma->vm_ops = &vm_ops_cpu;
  		break;
 
  	case I915_MMAP_TYPE_UC:
  		vma->vm_page_prot =
-			pgprot_noncached(vm_get_page_prot(vma->vm_flags));
+			pgprot_noncached(vma_get_page_prot(vma));
  		vma->vm_ops = &vm_ops_cpu;
  		break;
 
  	case I915_MMAP_TYPE_GTT:
  		vma->vm_page_prot =
-			pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+			pgprot_writecombine(vma_get_page_prot(vma));
  		vma->vm_ops = &vm_ops_gtt;
  		break;
  	}

drivers/gpu/drm/msm/msm_gem.c +1 -1

index cbf723a5d86f..6a78e242de7c 100644
@@ -1125,7 +1125,7 @@ static int msm_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struct
  	struct msm_gem_object *msm_obj = to_msm_bo(obj);
 
  	vm_flags_set(vma, VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP);
-	vma->vm_page_prot = msm_gem_pgprot(msm_obj, vm_get_page_prot(vma->vm_flags));
+	vma->vm_page_prot = msm_gem_pgprot(msm_obj, vma_get_page_prot(vma));
 
  	return 0;
  }

drivers/gpu/drm/nouveau/nouveau_gem.c +1 -1

index 20dba02d6175..9a6ee2e880c0 100644
@@ -55,7 +55,7 @@ static vm_fault_t nouveau_ttm_fault(struct vm_fault *vmf)
  		goto error_unlock;
 
  	nouveau_bo_del_io_reserve_lru(bo);
-	prot = vm_get_page_prot(vma->vm_flags);
+	prot = vma_get_page_prot(vma);
  	ret = ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT);
  	nouveau_bo_add_io_reserve_lru(bo);
  	if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))

drivers/gpu/drm/omapdrm/omap_fbdev.c +1 -1

index ca3fb186bf19..4881777642d2 100644
@@ -84,7 +84,7 @@ static int omap_fbdev_pan_display(struct fb_var_screeninfo *var, struct fb_info
 
  static int omap_fbdev_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
  {
-	vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+	vma->vm_page_prot = pgprot_writecombine(vma_get_page_prot(vma));
 
  	return fb_deferred_io_mmap(info, vma);
  }

drivers/gpu/drm/omapdrm/omap_gem.c +3 -3

index 00404fb6c29a..fb0e6f556b31 100644
@@ -538,9 +538,9 @@ static int omap_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struc
  	vm_flags_set(vma, VM_DONTEXPAND | VM_DONTDUMP | VM_IO | VM_MIXEDMAP);
 
  	if (omap_obj->flags & OMAP_BO_WC) {
-		vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+		vma->vm_page_prot = pgprot_writecombine(vma_get_page_prot(vma));
  	} else if (omap_obj->flags & OMAP_BO_UNCACHED) {
-		vma->vm_page_prot = pgprot_noncached(vm_get_page_prot(vma->vm_flags));
+		vma->vm_page_prot = pgprot_noncached(vma_get_page_prot(vma));
  	} else {
  		/*
  		 * We do have some private objects, at least for scanout buffers

@@ -558,7 +558,7 @@ static int omap_gem_object_mmap(struct drm_gem_object *obj, struct vm_area_struc
  		vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node);
  		vma_set_file(vma, obj->filp);
 
-		vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+		vma->vm_page_prot = vma_get_page_prot(vma);
  	}
 
  	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);

drivers/gpu/drm/rockchip/rockchip_drm_gem.c +1 -1

index b188539dca0b..9a1dc9f12072 100644
@@ -255,7 +255,7 @@ static int rockchip_drm_gem_object_mmap(struct drm_gem_object *obj,
  	 */
  	vm_flags_mod(vma, VM_IO | VM_DONTEXPAND | VM_DONTDUMP, VM_PFNMAP);
 
-	vma->vm_page_prot = pgprot_writecombine(vm_get_page_prot(vma->vm_flags));
+	vma->vm_page_prot = pgprot_writecombine(vma_get_page_prot(vma));
  	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
 
  	if (rk_obj->pages)

drivers/gpu/drm/tegra/gem.c +1 -1

index 1d8d27a5ea89..f76af733ea79 100644
@@ -602,7 +602,7 @@ int __tegra_gem_mmap(struct drm_gem_object *gem, struct vm_area_struct *vma)
 
  		vma->vm_pgoff = vm_pgoff;
  	} else {
-		pgprot_t prot = vm_get_page_prot(vma->vm_flags);
+		pgprot_t prot = vma_get_page_prot(vma);
 
  		vm_flags_mod(vma, VM_MIXEDMAP, VM_PFNMAP);
 

drivers/gpu/drm/virtio/virtgpu_vram.c +1 -1

index 4ae3cbc35dd3..544a6abddbc8 100644
@@ -55,7 +55,7 @@ static int virtio_gpu_vram_mmap(struct drm_gem_object *obj,
 
  	vma->vm_pgoff -= drm_vma_node_start(&obj->vma_node);
  	vm_flags_set(vma, VM_MIXEDMAP | VM_DONTEXPAND);
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
  	vma->vm_page_prot = pgprot_decrypted(vma->vm_page_prot);
  	vma->vm_ops = &virtio_gpu_vram_vm_ops;
 

drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c +1 -1

index 45561bc1c9ef..a9fd4015a0ca 100644
@@ -481,7 +481,7 @@ vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf)
  	if (vbo->dirty && vbo->dirty->method == VMW_BO_DIRTY_MKWRITE)
  		prot = vm_get_page_prot(vma->vm_flags & ~VM_SHARED);
  	else
-		prot = vm_get_page_prot(vma->vm_flags);
+		prot = vma_get_page_prot(vma);
 
  	ret = ttm_bo_vm_fault_reserved(vmf, prot, num_prefault);
  	if (ret == VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT))

drivers/gpu/drm/xe/xe_device.c +1 -1

index d224861b6f6f..758acaae85d3 100644
@@ -281,7 +281,7 @@ static vm_fault_t barrier_fault(struct vm_fault *vmf)
  	pgprot_t prot;
  	int idx;
 
-	prot = vm_get_page_prot(vma->vm_flags);
+	prot = vma_get_page_prot(vma);
 
  	if (drm_dev_enter(dev, &idx)) {
  		unsigned long pfn;

drivers/gpu/drm/xe/xe_mmio_gem.c +1 -1

index 8c803ef233cc..3741ae60f532 100644
@@ -149,7 +149,7 @@ static int xe_mmio_gem_mmap(struct drm_gem_object *base, struct vm_area_struct *
 
  	/* Set vm_pgoff (used as a fake buffer offset by DRM) to 0 */
  	vma->vm_pgoff = 0;
-	vma->vm_page_prot = pgprot_noncached(vm_get_page_prot(vma->vm_flags));
+	vma->vm_page_prot = pgprot_noncached(vma_get_page_prot(vma));
  	vm_flags_set(vma, VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |
  		     VM_DONTCOPY | VM_NORESERVE);
 

drivers/gpu/drm/xen/xen_drm_front_gem.c +1 -1

index eec4c1da3f9e..dd158443f55f 100644
@@ -80,7 +80,7 @@ static int xen_drm_front_gem_object_mmap(struct drm_gem_object *gem_obj,
  	 * which is mapped as Normal Inner Write-Back Outer Write-Back
  	 * Inner-Shareable.
  	 */
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
 
  	/*
  	 * vm_operations_struct.fault handler will be called if CPU access

drivers/video/fbdev/core/fb_io_fops.c +1 -1

index 6ab60fcd0050..6d0a8c8e141a 100644
@@ -161,7 +161,7 @@ int fb_io_mmap(struct fb_info *info, struct vm_area_struct *vma)
  		len = info->fix.mmio_len;
  	}
 
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
  	vma->vm_page_prot = pgprot_framebuffer(vma->vm_page_prot, vma->vm_start,
  					       vma->vm_end, start);
 

include/linux/mm.h +9 -1

index c8336f68d7bb..b55790c75038 100644
@@ -4575,6 +4575,10 @@ static inline pgprot_t vma_flags_to_page_prot(vma_flags_t vma_flags)
  	return vm_get_page_prot(vm_flags);
  }
 
+static inline pgprot_t vma_get_page_prot(const struct vm_area_struct *vma)
+{
+	return vma_flags_to_page_prot(vma->flags);
+}
  void vma_set_page_prot(struct vm_area_struct *vma);
  #else
  static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)

@@ -4585,9 +4589,13 @@ static inline pgprot_t vma_flags_to_page_prot(vma_flags_t vma_flags)
  {
  	return __pgprot(0);
  }
+static inline pgprot_t vma_get_page_prot(const struct vm_area_struct *vma)
+{
+	return __pgprot(0);
+}
  static inline void vma_set_page_prot(struct vm_area_struct *vma)
  {
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
  }
  #endif
 

mm/vma.c +1 -1

index fcdd2ac3ac68..b81c05e67a61 100644
@@ -3429,7 +3429,7 @@ struct vm_area_struct *__install_special_mapping(
  	if (pgtable_supports_soft_dirty())
  		vm_flags |= VM_SOFTDIRTY;
  	vm_flags_init(vma, vm_flags & ~VM_LOCKED_MASK);
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
 
  	vma->vm_ops = ops;
  	vma->vm_private_data = priv;

mm/vma_exec.c +1 -1

index c0f7ba2cfb27..b01c4964f2c9 100644
@@ -146,7 +146,7 @@ int create_init_stack_vma(struct mm_struct *mm, struct vm_area_struct **vmap,
  	if (pgtable_supports_soft_dirty())
  		flags |= VM_SOFTDIRTY;
  	vm_flags_init(vma, flags);
-	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
+	vma->vm_page_prot = vma_get_page_prot(vma);
 
  	err = insert_vm_struct(mm, vma);
  	if (err)

sound/core/memalloc.c +1 -1

index 9320671dfcc8..5bc7e586b430 100644
@@ -851,7 +851,7 @@ static void snd_dma_noncoherent_free(struct snd_dma_buffer *dmab)
  static int snd_dma_noncoherent_mmap(struct snd_dma_buffer *dmab,
  				    struct vm_area_struct *area)
  {
-	area->vm_page_prot = vm_get_page_prot(area->vm_flags);
+	area->vm_page_prot = vma_get_page_prot(area);
  	return dma_mmap_pages(dmab->dev.dev, area,
  			      area->vm_end - area->vm_start,
  			      virt_to_page(dmab->area));

tools/testing/vma/include/dup.h +4 -0

index 1ffac38a5377..d86bef8cb37f 100644
@@ -1577,3 +1577,7 @@ static inline pgoff_t linear_page_index(const struct vm_area_struct *vma,
  	pgoff += vma_start_pgoff(vma);
  	return pgoff;
  }
+static inline pgprot_t vma_get_page_prot(const struct vm_area_struct *vma)
+{
+	return vma_flags_to_page_prot(vma->flags);
+}

 drivers/gpu/drm/i915/gem/i915_gem_mman.c    | 12 ++++++------

There's a large number of vm_get_page_prot(vma->vm_flags) invocations. Make life easier by introducing vma_get_page_prot() parameterised by the VMA.

This also makes converting vm_get_page_prot() to vma_flags_t easier.

Also update the userland VMA tests to reflect the change.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

drivers/gpu/drm/drm_gem.c                   |  2 +-
drivers/gpu/drm/drm_gem_dma_helper.c        |  2 +-
drivers/gpu/drm/drm_gem_shmem_helper.c      |  2 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c       |  2 +-
drivers/gpu/drm/exynos/exynos_drm_gem.c     |  6 +++---
drivers/gpu/drm/i915/gem/i915_gem_mman.c    | 12 ++++++------
drivers/gpu/drm/msm/msm_gem.c               |  2 +-
drivers/gpu/drm/nouveau/nouveau_gem.c       |  2 +-
drivers/gpu/drm/omapdrm/omap_fbdev.c        |  2 +-
drivers/gpu/drm/omapdrm/omap_gem.c          |  6 +++---

drivers/gpu/drm/rockchip/rockchip_drm_gem.c |  2 +-
drivers/gpu/drm/tegra/gem.c                 |  2 +-
drivers/gpu/drm/virtio/virtgpu_vram.c       |  2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c  |  2 +-
drivers/gpu/drm/xe/xe_device.c              |  2 +-
drivers/gpu/drm/xe/xe_mmio_gem.c            |  2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c     |  2 +-
drivers/video/fbdev/core/fb_io_fops.c       |  2 +-

Quoted 21 lines · Lorenzo Stoakes

There's a large number of vm_get_page_prot(vma->vm_flags) invocations. Make life easier by introducing vma_get_page_prot() parameterised by the VMA.

This also makes converting vm_get_page_prot() to vma_flags_t easier.

Also update the userland VMA tests to reflect the change.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

drivers/gpu/drm/drm_gem.c                   |  2 +-
drivers/gpu/drm/drm_gem_dma_helper.c        |  2 +-
drivers/gpu/drm/drm_gem_shmem_helper.c      |  2 +-
drivers/gpu/drm/etnaviv/etnaviv_gem.c       |  2 +-
drivers/gpu/drm/exynos/exynos_drm_gem.c     |  6 +++---
drivers/gpu/drm/i915/gem/i915_gem_mman.c    | 12 ++++++------
drivers/gpu/drm/msm/msm_gem.c               |  2 +-
drivers/gpu/drm/nouveau/nouveau_gem.c       |  2 +-
drivers/gpu/drm/omapdrm/omap_fbdev.c        |  2 +-
drivers/gpu/drm/omapdrm/omap_gem.c          |  6 +++---

Quoted 8 lines

drivers/gpu/drm/rockchip/rockchip_drm_gem.c |  2 +-
drivers/gpu/drm/tegra/gem.c                 |  2 +-
drivers/gpu/drm/virtio/virtgpu_vram.c       |  2 +-
drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c  |  2 +-
drivers/gpu/drm/xe/xe_device.c              |  2 +-
drivers/gpu/drm/xe/xe_mmio_gem.c            |  2 +-
drivers/gpu/drm/xen/xen_drm_front_gem.c     |  2 +-
drivers/video/fbdev/core/fb_io_fops.c       |  2 +-

One missed?

drivers/gpu/drm/panthor/panthor_gem.c still has:

	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);

Can use vma_get_page_prot(vma) too.

[...]

There's a large number of vm_get_page_prot(vma->vm_flags) invocations. Make life easier by introducing vma_get_page_prot() parameterised by the VMA.

This also makes converting vm_get_page_prot() to vma_flags_t easier.

Also update the userland VMA tests to reflect the change.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 drivers/gpu/drm/drm_gem.c                   |  2 +-
 drivers/gpu/drm/drm_gem_dma_helper.c        |  2 +-
 drivers/gpu/drm/drm_gem_shmem_helper.c      |  2 +-
 drivers/gpu/drm/etnaviv/etnaviv_gem.c       |  2 +-
 drivers/gpu/drm/exynos/exynos_drm_gem.c     |  6 +++---
 drivers/gpu/drm/i915/gem/i915_gem_mman.c    | 12 ++++++------
 drivers/gpu/drm/msm/msm_gem.c               |  2 +-
 drivers/gpu/drm/nouveau/nouveau_gem.c       |  2 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c        |  2 +-
 drivers/gpu/drm/omapdrm/omap_gem.c          |  6 +++---
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c |  2 +-
 drivers/gpu/drm/tegra/gem.c                 |  2 +-
 drivers/gpu/drm/virtio/virtgpu_vram.c       |  2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_page_dirty.c  |  2 +-
 drivers/gpu/drm/xe/xe_device.c              |  2 +-
 drivers/gpu/drm/xe/xe_mmio_gem.c            |  2 +-

 drivers/gpu/drm/xen/xen_drm_front_gem.c     |  2 +-
 drivers/video/fbdev/core/fb_io_fops.c       |  2 +-
 include/linux/mm.h                          | 10 +++++++++-
 mm/vma.c                                    |  2 +-
 mm/vma_exec.c                               |  2 +-
 sound/core/memalloc.c                       |  2 +-
 tools/testing/vma/include/dup.h             |  4 ++++
 23 files changed, 43 insertions(+), 31 deletions(-)

Replace use of the legacy vm_flags_t flags with vma_flags_t values in create_init_stack_vma().

As part of this change we add VMA_STACK_EARLY and VMA_STACK_INCOMPLETE vma_flags_t defines, and slightly rework create_init_stack_vma() for clarity.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---

Replace use of the legacy vm_flags_t flags with vma_flags_t values in create_init_stack_vma().

As part of this change we add VMA_STACK_EARLY and VMA_STACK_INCOMPLETE vma_flags_t defines, and slightly rework create_init_stack_vma() for clarity.

No functional change intended.

Signed-off-by Lorenzo Stoakes <[email protected]>

---
 include/linux/mm.h |  4 ++++
 mm/vma_exec.c      | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)