Skip to contentSkip to conversation

mm/mmap.c: refine find_vma_prev with rb_last

PATCH In review Wei Yang 2 participants 3 messages Aug 9, 2019

Subsystems (2)
lore
Share & tools
lore

Wei Yang

author
#0 lore raw

PATCH v2 1/1 mm/mmap.c: refine find_vma_prev with rb_last

When addr is out of the range of the whole rb_tree, pprev will points to the right-most node. rb_tree facility already provides a helper function, rb_last, to do this task. We can leverage this instead of re-implement it.

This patch refines find_vma_prev with rb_last to make it a little nicer to read.

---
v2: leverage rb_last

---
 mm/mmap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
mm/mmap.c +3 -6
index 7e8c3e8ae75f..f7ed0afb994c 100644
@@ -2270,12 +2270,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
 	if (vma) {
 		*pprev = vma->vm_prev;
 	} else {
-		struct rb_node *rb_node = mm->mm_rb.rb_node;
-		*pprev = NULL;
-		while (rb_node) {
-			*pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
-			rb_node = rb_node->rb_right;
-		}
+		struct rb_node *rb_node = rb_last(&mm->mm_rb);
+		*pprev = !rb_node ? NULL :
+			 rb_entry(rb_node, struct vm_area_struct, vm_rb);
 	}
 	return vma;
 }
Signature · 1 line
2.17.1
Acked-by on v2 1/1
#1 lore raw
Quoted 9 lines · Wei Yang

When addr is out of the range of the whole rb_tree, pprev will points to the right-most node. rb_tree facility already provides a helper function, rb_last, to do this task. We can leverage this instead of re-implement it.

This patch refines find_vma_prev with rb_last to make it a little nicer to read.

Nit below:

Quoted 13 lines

---
v2: leverage rb_last

---
 mm/mmap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
mm/mmap.c +0 -0
index 7e8c3e8ae75f..f7ed0afb994c 100644
@@ -2270,12 +2270,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
 	if (vma) {
 		*pprev = vma->vm_prev;

mm/mmap.c find_vma_prev(struct mm_struct *mm, unsigned long addr, · line 2275

Quoted 10 lines
mm/mmap.c +3 -6
 	} else {
-		struct rb_node *rb_node = mm->mm_rb.rb_node;
-		*pprev = NULL;
-		while (rb_node) {
-			*pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
-			rb_node = rb_node->rb_right;
-		}
+		struct rb_node *rb_node = rb_last(&mm->mm_rb);
+		*pprev = !rb_node ? NULL :
+			 rb_entry(rb_node, struct vm_area_struct, vm_rb);

It's perhaps more common to write it like:
*pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL;

Quoted 4 lines
mm/mmap.c +0 -0
 	}
 	return vma;
 }
author
#2 lore raw
Quoted 33 lines · Vlastimil Babka
Quoted 9 lines · Wei Yang

When addr is out of the range of the whole rb_tree, pprev will points to the right-most node. rb_tree facility already provides a helper function, rb_last, to do this task. We can leverage this instead of re-implement it.

This patch refines find_vma_prev with rb_last to make it a little nicer to read.

Nit below:

Quoted 18 lines

---
v2: leverage rb_last

---
 mm/mmap.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
mm/mmap.c +0 -4
index 7e8c3e8ae75f..f7ed0afb994c 100644
@@ -2270,12 +2270,9 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
 	if (vma) {
 		*pprev = vma->vm_prev;
 	} else {
-		struct rb_node *rb_node = mm->mm_rb.rb_node;
-		*pprev = NULL;
-		while (rb_node) {
-			*pprev = rb_entry(rb_node, struct vm_area_struct, vm_rb);
Quoted 9 lines

mm/mmap.c find_vma_prev(struct mm_struct *mm, unsigned long addr, · line 2275

Quoted 5 lines
mm/mmap.c +3 -2
-			rb_node = rb_node->rb_right;
-		}
+		struct rb_node *rb_node = rb_last(&mm->mm_rb);
+		*pprev = !rb_node ? NULL :
+			 rb_entry(rb_node, struct vm_area_struct, vm_rb);

It's perhaps more common to write it like:
*pprev = rb_node ? rb_entry(rb_node, struct vm_area_struct, vm_rb) : NULL;

Do you prefer me to send v3 with this updated?

Quoted 4 lines
Quoted 4 lines
mm/mmap.c +0 -0
 	}
 	return vma;
 }
Signature · 2 lines
Wei Yang
Help you, Help me