Skip to contentSkip to conversation

mm/mmap: introduce vma_range_init()

PATCH Superseded Yajun Deng 3 participants 8 messages Jan 11, 2024 – Jan 23, 2024

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Yajun Deng

author
#0 lore raw

PATCH 1/1 mm/mmap: introduce vma_range_init()

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
 include/linux/mm.h |  9 +++++++++
 mm/mmap.c          | 29 +++++++----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)
include/linux/mm.h +9 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
 	return (vma && vma->vm_start <= start && end <= vma->vm_end);
 }
 
+static inline void vma_range_init(struct vm_area_struct *vma,
+				  unsigned long start, unsigned long end,
+				  pgoff_t pgoff)
+{
+	vma->vm_start = start;
+	vma->vm_end = end;
+	vma->vm_pgoff = pgoff;
+}
+
 #ifdef CONFIG_MMU
 pgprot_t vm_get_page_prot(unsigned long vm_flags);
 void vma_set_page_prot(struct vm_area_struct *vma);
mm/mmap.c +7 -22
index 06f1f3e88598..0d3f4612d001 100644
@@ -663,9 +663,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
 
 	vma_prepare(&vp);
 	vma_adjust_trans_huge(vma, start, end, 0);
-	vma->vm_start = start;
-	vma->vm_end = end;
-	vma->vm_pgoff = pgoff;
+	vma_range_init(vma, start, end, pgoff);
 	vma_iter_store(vmi, vma);
 
 	vma_complete(&vp, vmi, vma->vm_mm);
@@ -708,9 +706,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	vma_adjust_trans_huge(vma, start, end, 0);
 
 	vma_iter_clear(vmi);
-	vma->vm_start = start;
-	vma->vm_end = end;
-	vma->vm_pgoff = pgoff;
+	vma_range_init(vma, start, end, pgoff);
 	vma_complete(&vp, vmi, vma->vm_mm);
 	return 0;
 }
@@ -1015,10 +1011,7 @@ static struct vm_area_struct
 
 	vma_prepare(&vp);
 	vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start);
-
-	vma->vm_start = vma_start;
-	vma->vm_end = vma_end;
-	vma->vm_pgoff = vma_pgoff;
+	vma_range_init(vma, vma_start, vma_end, vma_pgoff);
 
 	if (vma_expanded)
 		vma_iter_store(vmi, vma);
@@ -2811,11 +2804,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	}
 
 	vma_iter_config(&vmi, addr, end);
-	vma->vm_start = addr;
-	vma->vm_end = end;
+	vma_range_init(vma, addr, end, pgoff);
 	vm_flags_init(vma, vm_flags);
 	vma->vm_page_prot = vm_get_page_prot(vm_flags);
-	vma->vm_pgoff = pgoff;
 
 	if (file) {
 		vma->vm_file = get_file(file);
@@ -3165,9 +3156,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		goto unacct_fail;
 
 	vma_set_anonymous(vma);
-	vma->vm_start = addr;
-	vma->vm_end = addr + len;
-	vma->vm_pgoff = addr >> PAGE_SHIFT;
+	vma_range_init(vma, addr, addr + len, addr >> PAGE_SHIFT);
 	vm_flags_init(vma, flags);
 	vma->vm_page_prot = vm_get_page_prot(flags);
 	vma_start_write(vma);
@@ -3404,9 +3393,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
 		new_vma = vm_area_dup(vma);
 		if (!new_vma)
 			goto out;
-		new_vma->vm_start = addr;
-		new_vma->vm_end = addr + len;
-		new_vma->vm_pgoff = pgoff;
+		vma_range_init(new_vma, addr, addr + len, pgoff);
 		if (vma_dup_policy(vma, new_vma))
 			goto out_free_vma;
 		if (anon_vma_clone(new_vma, vma))
@@ -3574,9 +3561,7 @@ static struct vm_area_struct *__install_special_mapping(
 	if (unlikely(vma == NULL))
 		return ERR_PTR(-ENOMEM);
 
-	vma->vm_start = addr;
-	vma->vm_end = addr + len;
-
+	vma_range_init(vma, addr, addr + len, 0);
 	vm_flags_init(vma, (vm_flags | mm->def_flags |
 		      VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK);
 	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 8 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
 include/linux/mm.h |  9 +++++++++
 mm/mmap.c          | 29 +++++++----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3519

Quoted 10 lines
include/linux/mm.h +1 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
 	return (vma && vma->vm_start <= start && end <= vma->vm_end);
 }
 
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

Quoted 99 lines
include/linux/mm.h +8 -0
+				  unsigned long start, unsigned long end,
+				  pgoff_t pgoff)
+{
+	vma->vm_start = start;
+	vma->vm_end = end;
+	vma->vm_pgoff = pgoff;
+}
+
 #ifdef CONFIG_MMU
 pgprot_t vm_get_page_prot(unsigned long vm_flags);
 void vma_set_page_prot(struct vm_area_struct *vma);
mm/mmap.c +7 -22
index 06f1f3e88598..0d3f4612d001 100644
@@ -663,9 +663,7 @@ int vma_expand(struct vma_iterator *vmi, struct vm_area_struct *vma,
 
 	vma_prepare(&vp);
 	vma_adjust_trans_huge(vma, start, end, 0);
-	vma->vm_start = start;
-	vma->vm_end = end;
-	vma->vm_pgoff = pgoff;
+	vma_range_init(vma, start, end, pgoff);
 	vma_iter_store(vmi, vma);
 
 	vma_complete(&vp, vmi, vma->vm_mm);
@@ -708,9 +706,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_area_struct *vma,
 	vma_adjust_trans_huge(vma, start, end, 0);
 
 	vma_iter_clear(vmi);
-	vma->vm_start = start;
-	vma->vm_end = end;
-	vma->vm_pgoff = pgoff;
+	vma_range_init(vma, start, end, pgoff);
 	vma_complete(&vp, vmi, vma->vm_mm);
 	return 0;
 }
@@ -1015,10 +1011,7 @@ static struct vm_area_struct
 
 	vma_prepare(&vp);
 	vma_adjust_trans_huge(vma, vma_start, vma_end, adj_start);
-
-	vma->vm_start = vma_start;
-	vma->vm_end = vma_end;
-	vma->vm_pgoff = vma_pgoff;
+	vma_range_init(vma, vma_start, vma_end, vma_pgoff);
 
 	if (vma_expanded)
 		vma_iter_store(vmi, vma);
@@ -2811,11 +2804,9 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
 	}
 
 	vma_iter_config(&vmi, addr, end);
-	vma->vm_start = addr;
-	vma->vm_end = end;
+	vma_range_init(vma, addr, end, pgoff);
 	vm_flags_init(vma, vm_flags);
 	vma->vm_page_prot = vm_get_page_prot(vm_flags);
-	vma->vm_pgoff = pgoff;
 
 	if (file) {
 		vma->vm_file = get_file(file);
@@ -3165,9 +3156,7 @@ static int do_brk_flags(struct vma_iterator *vmi, struct vm_area_struct *vma,
 		goto unacct_fail;
 
 	vma_set_anonymous(vma);
-	vma->vm_start = addr;
-	vma->vm_end = addr + len;
-	vma->vm_pgoff = addr >> PAGE_SHIFT;
+	vma_range_init(vma, addr, addr + len, addr >> PAGE_SHIFT);
 	vm_flags_init(vma, flags);
 	vma->vm_page_prot = vm_get_page_prot(flags);
 	vma_start_write(vma);
@@ -3404,9 +3393,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
 		new_vma = vm_area_dup(vma);
 		if (!new_vma)
 			goto out;
-		new_vma->vm_start = addr;
-		new_vma->vm_end = addr + len;
-		new_vma->vm_pgoff = pgoff;
+		vma_range_init(new_vma, addr, addr + len, pgoff);
 		if (vma_dup_policy(vma, new_vma))
 			goto out_free_vma;
 		if (anon_vma_clone(new_vma, vma))
@@ -3574,9 +3561,7 @@ static struct vm_area_struct *__install_special_mapping(
 	if (unlikely(vma == NULL))
 		return ERR_PTR(-ENOMEM);
 
-	vma->vm_start = addr;
-	vma->vm_end = addr + len;
-
+	vma_range_init(vma, addr, addr + len, 0);
 	vm_flags_init(vma, (vm_flags | mm->def_flags |
 		      VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK);
 	vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
Signature · 1 line
2.25.1
maintainer
#2 lore raw
Quoted 4 lines · On Mon, 22 Jan 2024 17:00:31 -0500 "Liam R. Howlett" <[email protected]>…
Quoted 3 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

Quoted 9 lines
Quoted 5 lines
---
 include/linux/mm.h |  9 +++++++++
 mm/mmap.c          | 29 +++++++----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

Oh. I thought it was a nice cleanup which made things more clear.

Quoted 11 lines

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3519

Quoted 9 lines
include/linux/mm.h +1 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
 	return (vma && vma->vm_start <= start && end <= vma->vm_end);
 }
 
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

That would be good.

Quoted 3 lines

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

I'd vote for vma_set_range().

#3 lore raw
Quoted 12 lines · Andrew Morton
Quoted 10 lines · On Mon, 22 Jan 2024 17:00:31 -0500 "Liam R. Howlett" <[email protected]>…
Quoted 8 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
 include/linux/mm.h |  9 +++++++++
 mm/mmap.c          | 29 +++++++----------------------
 2 files changed, 16 insertions(+), 22 deletions(-)
Quoted 5 lines
Quoted 3 lines

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

Oh. I thought it was a nice cleanup which made things more clear.

I'm not totally against it; that's why I suggested the changes below. I think a name change would go a long way for clarity. It's not as much as I though it would be though.

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
include/linux/mm.h +0 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
 	return (vma && vma->vm_start <= start && end <= vma->vm_end);
 }
 
Quoted 5 lines
Quoted 3 lines

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3519

Quoted 1 line
include/linux/mm.h +1 -0
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

That would be good.

One other thing, do we trust this to be inlined correctly by the compiler or should this be __always_inline? I'd expect it to be okay as it is, but I've been proven wrong in a perf trace before..

Quoted 7 lines
Quoted 4 lines

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

I'd vote for vma_set_range().

Using vma_set_range() leaves vma_range() or vma_size(), which could be added for the calculations of vma->vm_end - vma->vm_start. Davidlohr suggested such a beast a few years ago, but that one would need to live in the include/linux/mm.h as it occurs a lot more.

$ git grep "vma->vm_end - vma->vm_start" | wc -l
198

.. for just those named vma.

author
#4 lore raw
Quoted 28 lines · Liam R. Howlett
Quoted 11 lines · Andrew Morton
Quoted 9 lines · On Mon, 22 Jan 2024 17:00:31 -0500 "Liam R. Howlett" <[email protected]>…
Quoted 8 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
  include/linux/mm.h |  9 +++++++++
  mm/mmap.c          | 29 +++++++----------------------
  2 files changed, 16 insertions(+), 22 deletions(-)
Quoted 4 lines
Quoted 3 lines

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

Oh. I thought it was a nice cleanup which made things more clear.

I'm not totally against it; that's why I suggested the changes below. I think a name change would go a long way for clarity. It's not as much as I though it would be though.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
include/linux/mm.h +0 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
  	return (vma && vma->vm_start <= start && end <= vma->vm_end);
  }
 
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3519

Quoted 1 line
include/linux/mm.h +1 -0
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

That would be good.

One other thing, do we trust this to be inlined correctly by the compiler or should this be __always_inline? I'd expect it to be okay as it is, but I've been proven wrong in a perf trace before..

Okay, I would take __always_inline and put it in mm/internal.h in v2.

Quoted 15 lines
Quoted 5 lines
Quoted 3 lines

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

I'd vote for vma_set_range().

Using vma_set_range() leaves vma_range() or vma_size(), which could be added for the calculations of vma->vm_end - vma->vm_start. Davidlohr suggested such a beast a few years ago, but that one would need to live in the include/linux/mm.h as it occurs a lot more.

$ git grep "vma->vm_end - vma->vm_start" | wc -l
198

.. for just those named vma.

#5 lore raw
Quoted 31 lines · Yajun Deng
Quoted 29 lines · Liam R. Howlett
Quoted 11 lines · Andrew Morton
Quoted 9 lines · On Mon, 22 Jan 2024 17:00:31 -0500 "Liam R. Howlett" <[email protected]>…
Quoted 8 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
  include/linux/mm.h |  9 +++++++++
  mm/mmap.c          | 29 +++++++----------------------
  2 files changed, 16 insertions(+), 22 deletions(-)
Quoted 4 lines
Quoted 3 lines

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

Oh. I thought it was a nice cleanup which made things more clear.

I'm not totally against it; that's why I suggested the changes below. I think a name change would go a long way for clarity. It's not as much as I though it would be though.

Quoted 9 lines
Quoted 9 lines

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3518

Quoted 8 lines
include/linux/mm.h +1 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
  	return (vma && vma->vm_start <= start && end <= vma->vm_end);
  }
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

That would be good.

One other thing, do we trust this to be inlined correctly by the compiler or should this be __always_inline? I'd expect it to be okay as it is, but I've been proven wrong in a perf trace before..

Okay, I would take __always_inline and put it in mm/internal.h in v2.

I'm not confident in this suggestion as the rest.
Please rename the function when you move it.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

I'd vote for vma_set_range().

^ This part, use vma_set_range() please.

Quoted 11 lines
Quoted 10 lines

Using vma_set_range() leaves vma_range() or vma_size(), which could be added for the calculations of vma->vm_end - vma->vm_start. Davidlohr suggested such a beast a few years ago, but that one would need to live in the include/linux/mm.h as it occurs a lot more.

$ git grep "vma->vm_end - vma->vm_start" | wc -l
198

.. for just those named vma.

author
#6 lore raw
Quoted 31 lines · Liam R. Howlett
Quoted 30 lines · Yajun Deng
Quoted 29 lines · Liam R. Howlett
Quoted 11 lines · Andrew Morton
Quoted 9 lines · On Mon, 22 Jan 2024 17:00:31 -0500 "Liam R. Howlett" <[email protected]>…
Quoted 8 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
   include/linux/mm.h |  9 +++++++++
   mm/mmap.c          | 29 +++++++----------------------
   2 files changed, 16 insertions(+), 22 deletions(-)
Quoted 4 lines
Quoted 3 lines

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

Oh. I thought it was a nice cleanup which made things more clear.

I'm not totally against it; that's why I suggested the changes below. I think a name change would go a long way for clarity. It's not as much as I though it would be though.

Quoted 9 lines
Quoted 9 lines

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3518

Quoted 8 lines
include/linux/mm.h +1 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
   	return (vma && vma->vm_start <= start && end <= vma->vm_end);
   }
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line

That would be good.

One other thing, do we trust this to be inlined correctly by the compiler or should this be __always_inline? I'd expect it to be okay as it is, but I've been proven wrong in a perf trace before..

Okay, I would take __always_inline and put it in mm/internal.h in v2.

I'm not confident in this suggestion as the rest.
Please rename the function when you move it.

inline is a suggestion, __always_inline is mandatory. I think __always_inline is better if we're demanding.

Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

I'd vote for vma_set_range().

^ This part, use vma_set_range() please.

Okay.

By the way, I sent another patch with ("mm/mmap: simplify vma_merge()") subject a few days ago.

Please comment if you would like.

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines

Using vma_set_range() leaves vma_range() or vma_size(), which could be added for the calculations of vma->vm_end - vma->vm_start. Davidlohr suggested such a beast a few years ago, but that one would need to live in the include/linux/mm.h as it occurs a lot more.

$ git grep "vma->vm_end - vma->vm_start" | wc -l
198

.. for just those named vma.

#7 lore raw
Quoted 51 lines · Yajun Deng
Quoted 31 lines · Liam R. Howlett
Quoted 30 lines · Yajun Deng
Quoted 29 lines · Liam R. Howlett
Quoted 11 lines · Andrew Morton
Quoted 9 lines · On Mon, 22 Jan 2024 17:00:31 -0500 "Liam R. Howlett" <[email protected]>…
Quoted 8 lines · Yajun Deng

There is a lot of code needs to set the range of vma, introduce vma_range_init() to initialize the range of vma.

---
   include/linux/mm.h |  9 +++++++++
   mm/mmap.c          | 29 +++++++----------------------
   2 files changed, 16 insertions(+), 22 deletions(-)
Quoted 4 lines
Quoted 3 lines

This isn't a whole lot of code, are there others? We're losing code clarity in favour of saving 6 lines?

Oh. I thought it was a nice cleanup which made things more clear.

I'm not totally against it; that's why I suggested the changes below. I think a name change would go a long way for clarity. It's not as much as I though it would be though.

Quoted 9 lines
Quoted 9 lines

include/linux/mm.h static inline bool range_in_vma(struct vm_area_struct *vma, · line 3518

Quoted 8 lines
include/linux/mm.h +1 -0
index f5a97dec5169..abb4534be3cc 100644
@@ -3516,6 +3516,15 @@ static inline bool range_in_vma(struct vm_area_struct *vma,
   	return (vma && vma->vm_start <= start && end <= vma->vm_end);
   }
+static inline void vma_range_init(struct vm_area_struct *vma,

Any reason this can't be in mm/internal.h ?

Quoted 8 lines
Quoted 6 lines
Quoted 5 lines
Quoted 1 line

That would be good.

One other thing, do we trust this to be inlined correctly by the compiler or should this be __always_inline? I'd expect it to be okay as it is, but I've been proven wrong in a perf trace before..

Okay, I would take __always_inline and put it in mm/internal.h in v2.

I'm not confident in this suggestion as the rest.
Please rename the function when you move it.

inline is a suggestion, __always_inline is mandatory. I think __always_inline is better if we're demanding.

Quoted 5 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines

vma_range_set(), vma_set_range(), or just vma_range() might be a better name? My thinking is that some of these are actually modifying the vma and not just initializing it, right?

I'd vote for vma_set_range().

^ This part, use vma_set_range() please.

Quoted 7 lines

Okay.

By the way, I sent another patch with ("mm/mmap: simplify vma_merge()") subject a few days ago.

Please comment if you would like.

Oh, okay.

Can you please Cc people on these? I almost missed this one and I know several other people will be interested in the vma_merge() patch changes.