lkml.org 
[lkml]   [2021]   [Dec]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 03/11] mm: Add len and flags parameters to arch_get_mmap_end()
    Date
    Powerpc needs flags and len to make decision on arch_get_mmap_end().

    So add them as parameters to arch_get_mmap_end().

    Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
    Cc: Catalin Marinas <catalin.marinas@arm.com>
    Cc: Will Deacon <will@kernel.org>
    ---
    arch/arm64/include/asm/processor.h | 4 ++--
    mm/mmap.c | 6 +++---
    2 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h
    index 6f41b65f9962..88c696350ace 100644
    --- a/arch/arm64/include/asm/processor.h
    +++ b/arch/arm64/include/asm/processor.h
    @@ -91,8 +91,8 @@
    #endif /* CONFIG_COMPAT */

    #ifndef CONFIG_ARM64_FORCE_52BIT
    -#define arch_get_mmap_end(addr) ((addr > DEFAULT_MAP_WINDOW) ? TASK_SIZE :\
    - DEFAULT_MAP_WINDOW)
    +#define arch_get_mmap_end(addr, len, flags) ((addr > DEFAULT_MAP_WINDOW) ? TASK_SIZE :\
    + DEFAULT_MAP_WINDOW)

    #define arch_get_mmap_base(addr, base) ((addr > DEFAULT_MAP_WINDOW) ? \
    base + TASK_SIZE - DEFAULT_MAP_WINDOW :\
    diff --git a/mm/mmap.c b/mm/mmap.c
    index 7ac6a07ff382..ad48f7af7511 100644
    --- a/mm/mmap.c
    +++ b/mm/mmap.c
    @@ -2113,7 +2113,7 @@ unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info)
    }

    #ifndef arch_get_mmap_end
    -#define arch_get_mmap_end(addr) (TASK_SIZE)
    +#define arch_get_mmap_end(addr, len, flags) (TASK_SIZE)
    #endif

    #ifndef arch_get_mmap_base
    @@ -2139,7 +2139,7 @@ generic_get_unmapped_area(struct file *filp, unsigned long addr,
    struct mm_struct *mm = current->mm;
    struct vm_area_struct *vma, *prev;
    struct vm_unmapped_area_info info;
    - const unsigned long mmap_end = arch_get_mmap_end(addr);
    + const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);

    if (len > mmap_end - mmap_min_addr)
    return -ENOMEM;
    @@ -2187,7 +2187,7 @@ generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
    struct vm_area_struct *vma, *prev;
    struct mm_struct *mm = current->mm;
    struct vm_unmapped_area_info info;
    - const unsigned long mmap_end = arch_get_mmap_end(addr);
    + const unsigned long mmap_end = arch_get_mmap_end(addr, len, flags);

    /* requested length too big for entire address space */
    if (len > mmap_end - mmap_min_addr)
    --
    2.33.1
    \
     
     \ /
      Last update: 2021-12-15 07:46    [W:4.449 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site