mm/mmap: rename __vma_unlink_common() to __vma_unlink()
Subsystems (2)
PATCH 1/2 mm/mmap: rename __vma_unlink_common() to __vma_unlink()
__vma_unlink_common() and __vma_unlink() are counterparts. Since there is not function named __vma_unlink(), let's rename it to __vma_unlink() to make the code more self-explain and easy for audience to understand.
Otherwise we may expect there are several variants of vma_unlink and __vma_unlink_common() is used by them.
--- mm/mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/mmap.c +3 -3
@@ -677,7 +677,7 @@ static void __insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma) mm->map_count++; } -static __always_inline void __vma_unlink_common(struct mm_struct *mm, +static __always_inline void __vma_unlink(struct mm_struct *mm,struct vm_area_struct *vma,struct vm_area_struct *ignore) {
@@ -859,7 +859,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,* us to remove next before dropping the locks. */ if (remove_next !=3 ) -__vma_unlink_common (mm, next, next); +__vma_unlink (mm, next, next);else /* * vma is not before next if they've been
@@ -870,7 +870,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned long start,* "next" (which is stored in post-swap() * "vma"). */ -__vma_unlink_common (mm, next, vma); +__vma_unlink (mm, next, vma);if (file)__remove_shared_vm_struct (next, file, mapping); }else if (insert) {
Signature · 1 line
2.20.1 (Apple Git-117)
PATCH 2/2 mm/mmap: leverage vma_rb_erase_ignore() to implement vma_rb_erase()
These two functions share the same logic except ignore a different vma.
Let's reuse the code.
--- mm/mmap.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
mm/mmap.c +7 -9
@@ -474,8 +474,12 @@ static __always_inline void vma_rb_erase_ignore(struct vm_area_struct *vma, {/* * All rb_subtree_gap values must be consistent prior to erase, -* with the possible exception of the "next" vma being erased if -* next->vm_start was reduced. +* with the possible exception of +* +* a. the "next" vma being erased if next->vm_start was reduced in +* __vma_adjust() -> __vma_unlink() +* b. the vma being erased in detach_vmas_to_be_unmapped() -> +* vma_rb_erase() */ validate_mm_rb (root, ignore);
@@ -485,13 +489,7 @@ static __always_inline void vma_rb_erase_ignore(struct vm_area_struct *vma, static __always_inline void vma_rb_erase(struct vm_area_struct *vma,struct rb_root *root) { -/* -* All rb_subtree_gap values must be consistent prior to erase, -* with the possible exception of the vma being erased. -*/ -validate_mm_rb (root, vma); - -__vma_rb_erase (vma, root); +vma_rb_erase_ignore (vma, root, vma); }/*
Signature · 1 line
2.20.1 (Apple Git-117)
Andrew Morton
maintainerQuoted 1 line · On Mon, 10 Aug 2020 07:20:56 +0800 Wei Yang…
__vma_unlink_common()and__vma_unlink()are counterparts. Since there is
I assume you meant "__vma_link()" here?
Quoted 5 lines
not function named
__vma_unlink(), let's rename it to__vma_unlink()to make the code more self-explain and easy for audience to understand.Otherwise we may expect there are several variants of
vma_unlinkand__vma_unlink_common()is used by them.
Quoted 6 lines · Andrew Morton
Quoted 1 line · On Mon, 10 Aug 2020 07:20:56 +0800 Wei Yang…
__vma_unlink_common()and__vma_unlink()are counterparts. Since there isI assume you meant "
__vma_link()" here?
Oops, my fault. You are right.
Do you prefer a v2, or you would like to fix it online?
Quoted 5 lines
Quoted 5 lines
not function named
__vma_unlink(), let's rename it to__vma_unlink()to make the code more self-explain and easy for audience to understand.Otherwise we may expect there are several variants of
vma_unlinkand__vma_unlink_common()is used by them.
Signature · 2 lines
Wei Yang Help you, Help me