lkml.org 
[lkml]   [2022]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v12 59/69] mm/mremap: use vma_find_intersection() instead of vma linked list
    Date
    From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

    Link: https://lkml.kernel.org/r/20220504011345.662299-44-Liam.Howlett@oracle.com
    Link: https://lkml.kernel.org/r/20220621204632.3370049-60-Liam.Howlett@oracle.com
    Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
    Acked-by: Vlastimil Babka <vbabka@suse.cz>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: David Howells <dhowells@redhat.com>
    Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
    Cc: SeongJae Park <sj@kernel.org>
    Cc: Will Deacon <will@kernel.org>
    Cc: Davidlohr Bueso <dave@stgolabs.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    ---
    mm/mremap.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/mm/mremap.c b/mm/mremap.c
    index e0fba9004246..8644ff278f02 100644
    --- a/mm/mremap.c
    +++ b/mm/mremap.c
    @@ -716,7 +716,7 @@ static unsigned long move_vma(struct vm_area_struct *vma,
    if (excess) {
    vma->vm_flags |= VM_ACCOUNT;
    if (split)
    - vma->vm_next->vm_flags |= VM_ACCOUNT;
    + find_vma(mm, vma->vm_end)->vm_flags |= VM_ACCOUNT;
    }

    return new_addr;
    @@ -866,9 +866,10 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
    static int vma_expandable(struct vm_area_struct *vma, unsigned long delta)
    {
    unsigned long end = vma->vm_end + delta;
    +
    if (end < vma->vm_end) /* overflow */
    return 0;
    - if (vma->vm_next && vma->vm_next->vm_start < end) /* intersection */
    + if (find_vma_intersection(vma->vm_mm, vma->vm_end, end))
    return 0;
    if (get_unmapped_area(NULL, vma->vm_start, end - vma->vm_start,
    0, MAP_FIXED) & ~PAGE_MASK)
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-07-20 04:24    [W:4.365 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site