The patch titled
Subject: mm/mmap.c: prev could be retrieved from vma->vm_prev
has been added to the -mm tree. Its filename is
mm-mmapc-prev-could-be-retrieved-from-vma-vm_prev.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-mmapc-prev-could-be-retrieved-from-vma-vm_prev.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-mmapc-prev-could-be-retrieved-from-vma-vm_prev.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Wei Yang <richardw.yang@xxxxxxxxxxxxxxx>
Subject: mm/mmap.c: prev could be retrieved from vma->vm_prev
Currently __vma_unlink_common handles two cases:
* has_prev
* or not
When has_prev is false, it is obvious prev is calculated from vma->vm_prev
in __vma_unlink_common.
When has_prev is true, the prev is passed through from __vma_unlink_prev
in __vma_adjust for non-case 8. And at the beginning next is calculated
from vma->vm_next, which implies vma is next->vm_prev.
The above statement sounds a little complicated, while to think in another
point of view, no matter whether vma and next is swapped, the mmap link
list still preserves its property. It is proper to access vma->vm_prev.
Link: http://lkml.kernel.org/r/20191006012636.31521-1-richardw.yang@xxxxxxxxxxxxxxx
Signed-off-by: Wei Yang <richardw.yang@xxxxxxxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Oscar Salvador <osalvador@xxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mmap.c | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
--- a/mm/mmap.c~mm-mmapc-prev-could-be-retrieved-from-vma-vm_prev
+++ a/mm/mmap.c
@@ -684,23 +684,17 @@ static void __insert_vm_struct(struct mm
static __always_inline void __vma_unlink_common(struct mm_struct *mm,
struct vm_area_struct *vma,
- struct vm_area_struct *prev,
- bool has_prev,
struct vm_area_struct *ignore)
{
- struct vm_area_struct *next;
+ struct vm_area_struct *prev, *next;
vma_rb_erase_ignore(vma, &mm->mm_rb, ignore);
next = vma->vm_next;
- if (has_prev)
+ prev = vma->vm_prev;
+ if (prev)
prev->vm_next = next;
- else {
- prev = vma->vm_prev;
- if (prev)
- prev->vm_next = next;
- else
- mm->mmap = next;
- }
+ else
+ mm->mmap = next;
if (next)
next->vm_prev = prev;
@@ -712,7 +706,7 @@ static inline void __vma_unlink_prev(str
struct vm_area_struct *vma,
struct vm_area_struct *prev)
{
- __vma_unlink_common(mm, vma, prev, true, vma);
+ __vma_unlink_common(mm, vma, vma);
}
/*
@@ -898,7 +892,7 @@ again:
* "next" (which is stored in post-swap()
* "vma").
*/
- __vma_unlink_common(mm, next, NULL, false, vma);
+ __vma_unlink_common(mm, next, vma);
if (file)
__remove_shared_vm_struct(next, file, mapping);
} else if (insert) {
_
Patches currently in -mm which might be from richardw.yang@xxxxxxxxxxxxxxx are
mm-mmapc-remove-a-never-trigger-warning-in-__vma_adjust.patch
mm-rmapc-reuse-mergeable-anon_vma-as-parent-when-fork.patch
mm-mmapc-prev-could-be-retrieved-from-vma-vm_prev.patch
mm-mmapc-__vma_unlink_prev-is-not-necessary-now.patch
mm-mmapc-extract-__vma_unlink_list-as-counter-part-for-__vma_link_list.patch
hugetlb-remove-unused-hstate-in-hugetlb_fault_mutex_hash.patch
userfaultfd-use-vma_pagesize-for-all-huge-page-size-calculation.patch
userfaultfd-remove-unnecessary-warn_on-in-__mcopy_atomic_hugetlb.patch
userfaultfd-wrap-the-common-dst_vma-check-into-an-inlined-function.patch
mm-fix-typo-in-the-comment-when-calling-function-__setpageuptodate.patch
