| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <21ba6b8e-b9c7-41ae-8815-46525557c687@csgroup.eu>
Date: Wed, 13 Mar 2024 07:19:21 +0000
From: Christophe Leroy <christophe.leroy@...roup.eu>
To: Rick Edgecombe <rick.p.edgecombe@...el.com>, "Liam.Howlett@...cle.com"
<Liam.Howlett@...cle.com>, "akpm@...ux-foundation.org"
<akpm@...ux-foundation.org>, "bp@...en8.de" <bp@...en8.de>,
"broonie@...nel.org" <broonie@...nel.org>, "dave.hansen@...ux.intel.com"
<dave.hansen@...ux.intel.com>, "debug@...osinc.com" <debug@...osinc.com>,
"hpa@...or.com" <hpa@...or.com>, "keescook@...omium.org"
<keescook@...omium.org>, "kirill.shutemov@...ux.intel.com"
<kirill.shutemov@...ux.intel.com>, "luto@...nel.org" <luto@...nel.org>,
"mingo@...hat.com" <mingo@...hat.com>, "peterz@...radead.org"
<peterz@...radead.org>, "tglx@...utronix.de" <tglx@...utronix.de>,
"x86@...nel.org" <x86@...nel.org>
CC: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-mm@...ck.org" <linux-mm@...ck.org>
Subject: Re: [PATCH v3 01/12] mm: Switch mm->get_unmapped_area() to a flag
Le 12/03/2024 à 23:28, Rick Edgecombe a écrit :
> The mm_struct contains a function pointer *get_unmapped_area(), which
> is set to either arch_get_unmapped_area() or
> arch_get_unmapped_area_topdown() during the initialization of the mm.
>
> Since the function pointer only ever points to two functions that are named
> the same across all arch's, a function pointer is not really required. In
> addition future changes will want to add versions of the functions that
> take additional arguments. So to save a pointers worth of bytes in
> mm_struct, and prevent adding additional function pointers to mm_struct in
> future changes, remove it and keep the information about which
> get_unmapped_area() to use in a flag.
>
> Add the new flag to MMF_INIT_MASK so it doesn't get clobbered on fork by
> mmf_init_flags(). Most MM flags get clobbered on fork. In the pre-existing
> behavior mm->get_unmapped_area() would get copied to the new mm in
> dup_mm(), so not clobbering the flag preserves the existing behavior
> around inheriting the topdown-ness.
>
> Introduce a helper, mm_get_unmapped_area(), to easily convert code that
> refers to the old function pointer to instead select and call either
> arch_get_unmapped_area() or arch_get_unmapped_area_topdown() based on the
> flag. Then drop the mm->get_unmapped_area() function pointer. Leave the
> get_unmapped_area() pointer in struct file_operations alone. The main
> purpose of this change is to reorganize in preparation for future changes,
> but it also converts the calls of mm->get_unmapped_area() from indirect
> branches into a direct ones.
>
> The stress-ng bigheap benchmark calls realloc a lot, which calls through
> get_unmapped_area() in the kernel. On x86, the change yielded a ~1%
> improvement there on a retpoline config.
>
> In testing a few x86 configs, removing the pointer unfortunately didn't
> result in any actual size reductions in the compiled layout of mm_struct.
> But depending on compiler or arch alignment requirements, the change could
> shrink the size of mm_struct.
This patch is quite big and un-easy to follow. Would be worth splitting
in several patches if possible. Some of the changes seem to go further
than just switching mm->get_unmapped_area() to a flag.
First patch could add the new flag and necessary helpers, then following
patches could convert sub-systems one by one then last patch would
remove mm->get_unmapped_area() once all users are converted.
>
> Signed-off-by: Rick Edgecombe <rick.p.edgecombe@...el.com>
> Acked-by: Dave Hansen <dave.hansen@...ux.intel.com>
> Acked-by: Liam R. Howlett <Liam.Howlett@...cle.com>
> Reviewed-by: Kirill A. Shutemov <kirill.shutemov@...ux.intel.com>
> ---
> v3:
> - Fix comment that still referred to mm->get_unmapped_area()
> - Resolve trivial rebase conflicts with "mm: thp_get_unmapped_area must
> honour topdown preference"
> - Spelling fix in log
>
> v2:
> - Fix comment on MMF_TOPDOWN (Kirill, rppt)
> - Move MMF_TOPDOWN to actually unused bit
> - Add MMF_TOPDOWN to MMF_INIT_MASK so it doesn't get clobbered on fork,
> and result in the children using the search up path.
> - New lower performance results after above bug fix
> - Add Reviews and Acks
> ---
> arch/s390/mm/hugetlbpage.c | 2 +-
> arch/s390/mm/mmap.c | 4 ++--
> arch/sparc/kernel/sys_sparc_64.c | 15 ++++++---------
> arch/sparc/mm/hugetlbpage.c | 2 +-
> arch/x86/kernel/cpu/sgx/driver.c | 2 +-
> arch/x86/mm/hugetlbpage.c | 2 +-
> arch/x86/mm/mmap.c | 4 ++--
> drivers/char/mem.c | 2 +-
> drivers/dax/device.c | 6 +++---
> fs/hugetlbfs/inode.c | 4 ++--
> fs/proc/inode.c | 15 ++++++++-------
> fs/ramfs/file-mmu.c | 2 +-
> include/linux/mm_types.h | 6 +-----
> include/linux/sched/coredump.h | 5 ++++-
> include/linux/sched/mm.h | 5 +++++
> io_uring/io_uring.c | 2 +-
> mm/debug.c | 6 ------
> mm/huge_memory.c | 9 ++++-----
> mm/mmap.c | 21 ++++++++++++++++++---
> mm/shmem.c | 11 +++++------
> mm/util.c | 6 +++---
> 21 files changed, 70 insertions(+), 61 deletions(-)
>
> diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
> index 297a6d897d5a..c2d2850ec8d5 100644
> --- a/arch/s390/mm/hugetlbpage.c
> +++ b/arch/s390/mm/hugetlbpage.c
> @@ -328,7 +328,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
> goto check_asce_limit;
> }
>
> - if (mm->get_unmapped_area == arch_get_unmapped_area)
> + if (!test_bit(MMF_TOPDOWN, &mm->flags))
> addr = hugetlb_get_unmapped_area_bottomup(file, addr, len,
> pgoff, flags);
> else
> diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c
> index fc9a7dc26c5e..cd52d72b59cf 100644
> --- a/arch/s390/mm/mmap.c
> +++ b/arch/s390/mm/mmap.c
> @@ -182,10 +182,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
> */
> if (mmap_is_legacy(rlim_stack)) {
> mm->mmap_base = mmap_base_legacy(random_factor);
> - mm->get_unmapped_area = arch_get_unmapped_area;
> + clear_bit(MMF_TOPDOWN, &mm->flags);
> } else {
> mm->mmap_base = mmap_base(random_factor, rlim_stack);
> - mm->get_unmapped_area = arch_get_unmapped_area_topdown;
> + set_bit(MMF_TOPDOWN, &mm->flags);
> }
> }
>
> diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
> index 1e9a9e016237..1dbf7211666e 100644
> --- a/arch/sparc/kernel/sys_sparc_64.c
> +++ b/arch/sparc/kernel/sys_sparc_64.c
> @@ -218,14 +218,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
> unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, unsigned long len, unsigned long pgoff, unsigned long flags)
> {
> unsigned long align_goal, addr = -ENOMEM;
> - unsigned long (*get_area)(struct file *, unsigned long,
> - unsigned long, unsigned long, unsigned long);
> -
> - get_area = current->mm->get_unmapped_area;
>
> if (flags & MAP_FIXED) {
> /* Ok, don't mess with it. */
> - return get_area(NULL, orig_addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, NULL, orig_addr, len, pgoff, flags);
> }
> flags &= ~MAP_SHARED;
>
> @@ -238,7 +234,8 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
> align_goal = (64UL * 1024);
>
> do {
> - addr = get_area(NULL, orig_addr, len + (align_goal - PAGE_SIZE), pgoff, flags);
> + addr = mm_get_unmapped_area(current->mm, NULL, orig_addr,
> + len + (align_goal - PAGE_SIZE), pgoff, flags);
> if (!(addr & ~PAGE_MASK)) {
> addr = (addr + (align_goal - 1UL)) & ~(align_goal - 1UL);
> break;
> @@ -256,7 +253,7 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
> * be obtained.
> */
> if (addr & ~PAGE_MASK)
> - addr = get_area(NULL, orig_addr, len, pgoff, flags);
> + addr = mm_get_unmapped_area(current->mm, NULL, orig_addr, len, pgoff, flags);
>
> return addr;
> }
> @@ -292,7 +289,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
> gap == RLIM_INFINITY ||
> sysctl_legacy_va_layout) {
> mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
> - mm->get_unmapped_area = arch_get_unmapped_area;
> + clear_bit(MMF_TOPDOWN, &mm->flags);
> } else {
> /* We know it's 32-bit */
> unsigned long task_size = STACK_TOP32;
> @@ -303,7 +300,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
> gap = (task_size / 6 * 5);
>
> mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
> - mm->get_unmapped_area = arch_get_unmapped_area_topdown;
> + set_bit(MMF_TOPDOWN, &mm->flags);
> }
> }
>
> diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
> index b432500c13a5..38a1bef47efb 100644
> --- a/arch/sparc/mm/hugetlbpage.c
> +++ b/arch/sparc/mm/hugetlbpage.c
> @@ -123,7 +123,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
> (!vma || addr + len <= vm_start_gap(vma)))
> return addr;
> }
> - if (mm->get_unmapped_area == arch_get_unmapped_area)
> + if (!test_bit(MMF_TOPDOWN, &mm->flags))
> return hugetlb_get_unmapped_area_bottomup(file, addr, len,
> pgoff, flags);
> else
> diff --git a/arch/x86/kernel/cpu/sgx/driver.c b/arch/x86/kernel/cpu/sgx/driver.c
> index 262f5fb18d74..22b65a5f5ec6 100644
> --- a/arch/x86/kernel/cpu/sgx/driver.c
> +++ b/arch/x86/kernel/cpu/sgx/driver.c
> @@ -113,7 +113,7 @@ static unsigned long sgx_get_unmapped_area(struct file *file,
> if (flags & MAP_FIXED)
> return addr;
>
> - return current->mm->get_unmapped_area(file, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, file, addr, len, pgoff, flags);
> }
>
> #ifdef CONFIG_COMPAT
> diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
> index 5804bbae4f01..6d77c0039617 100644
> --- a/arch/x86/mm/hugetlbpage.c
> +++ b/arch/x86/mm/hugetlbpage.c
> @@ -141,7 +141,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
> }
>
> get_unmapped_area:
> - if (mm->get_unmapped_area == arch_get_unmapped_area)
> + if (!test_bit(MMF_TOPDOWN, &mm->flags))
> return hugetlb_get_unmapped_area_bottomup(file, addr, len,
> pgoff, flags);
> else
> diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
> index c90c20904a60..a2cabb1c81e1 100644
> --- a/arch/x86/mm/mmap.c
> +++ b/arch/x86/mm/mmap.c
> @@ -129,9 +129,9 @@ static void arch_pick_mmap_base(unsigned long *base, unsigned long *legacy_base,
> void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
> {
> if (mmap_is_legacy())
> - mm->get_unmapped_area = arch_get_unmapped_area;
> + clear_bit(MMF_TOPDOWN, &mm->flags);
> else
> - mm->get_unmapped_area = arch_get_unmapped_area_topdown;
> + set_bit(MMF_TOPDOWN, &mm->flags);
>
> arch_pick_mmap_base(&mm->mmap_base, &mm->mmap_legacy_base,
> arch_rnd(mmap64_rnd_bits), task_size_64bit(0),
> diff --git a/drivers/char/mem.c b/drivers/char/mem.c
> index 3c6670cf905f..9b80e622ae80 100644
> --- a/drivers/char/mem.c
> +++ b/drivers/char/mem.c
> @@ -544,7 +544,7 @@ static unsigned long get_unmapped_area_zero(struct file *file,
> }
>
> /* Otherwise flags & MAP_PRIVATE: with no shmem object beneath it */
> - return current->mm->get_unmapped_area(file, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, file, addr, len, pgoff, flags);
> #else
> return -ENOSYS;
> #endif
> diff --git a/drivers/dax/device.c b/drivers/dax/device.c
> index 93ebedc5ec8c..47c126d37b59 100644
> --- a/drivers/dax/device.c
> +++ b/drivers/dax/device.c
> @@ -329,14 +329,14 @@ static unsigned long dax_get_unmapped_area(struct file *filp,
> if ((off + len_align) < off)
> goto out;
>
> - addr_align = current->mm->get_unmapped_area(filp, addr, len_align,
> - pgoff, flags);
> + addr_align = mm_get_unmapped_area(current->mm, filp, addr, len_align,
> + pgoff, flags);
> if (!IS_ERR_VALUE(addr_align)) {
> addr_align += (off - addr_align) & (align - 1);
> return addr_align;
> }
> out:
> - return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, flags);
> }
>
> static const struct address_space_operations dev_dax_aops = {
> diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
> index d746866ae3b6..cd87ea5944a1 100644
> --- a/fs/hugetlbfs/inode.c
> +++ b/fs/hugetlbfs/inode.c
> @@ -249,11 +249,11 @@ generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
> }
>
> /*
> - * Use mm->get_unmapped_area value as a hint to use topdown routine.
> + * Use MMF_TOPDOWN flag as a hint to use topdown routine.
> * If architectures have special needs, they should define their own
> * version of hugetlb_get_unmapped_area.
> */
> - if (mm->get_unmapped_area == arch_get_unmapped_area_topdown)
> + if (test_bit(MMF_TOPDOWN, &mm->flags))
> return hugetlb_get_unmapped_area_topdown(file, addr, len,
> pgoff, flags);
> return hugetlb_get_unmapped_area_bottomup(file, addr, len,
> diff --git a/fs/proc/inode.c b/fs/proc/inode.c
> index 05350f3c2812..017144a8516c 100644
> --- a/fs/proc/inode.c
> +++ b/fs/proc/inode.c
> @@ -451,15 +451,16 @@ pde_get_unmapped_area(struct proc_dir_entry *pde, struct file *file, unsigned lo
> unsigned long len, unsigned long pgoff,
> unsigned long flags)
> {
> - typeof_member(struct proc_ops, proc_get_unmapped_area) get_area;
> -
> - get_area = pde->proc_ops->proc_get_unmapped_area;
> + if (pde->proc_ops->proc_get_unmapped_area)
> + return pde->proc_ops->proc_get_unmapped_area(file, orig_addr,
> + len, pgoff,
> + flags);
> #ifdef CONFIG_MMU
> - if (!get_area)
> - get_area = current->mm->get_unmapped_area;
> + else
> + return mm_get_unmapped_area(current->mm, file, orig_addr,
> + len, pgoff, flags);
> #endif
> - if (get_area)
> - return get_area(file, orig_addr, len, pgoff, flags);
> +
> return orig_addr;
> }
The change looks unclear at first look. Ok after looking a second time
it seems to simplify things, but would be better as a separate patch.
Don't know.
>
> diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
> index c7a1aa3c882b..b45c7edc3225 100644
> --- a/fs/ramfs/file-mmu.c
> +++ b/fs/ramfs/file-mmu.c
> @@ -35,7 +35,7 @@ static unsigned long ramfs_mmu_get_unmapped_area(struct file *file,
> unsigned long addr, unsigned long len, unsigned long pgoff,
> unsigned long flags)
> {
> - return current->mm->get_unmapped_area(file, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, file, addr, len, pgoff, flags);
> }
>
> const struct file_operations ramfs_file_operations = {
> diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
> index 8b611e13153e..d20869881214 100644
> --- a/include/linux/mm_types.h
> +++ b/include/linux/mm_types.h
> @@ -749,11 +749,7 @@ struct mm_struct {
> } ____cacheline_aligned_in_smp;
>
> struct maple_tree mm_mt;
> -#ifdef CONFIG_MMU
> - unsigned long (*get_unmapped_area) (struct file *filp,
> - unsigned long addr, unsigned long len,
> - unsigned long pgoff, unsigned long flags);
> -#endif
> +
> unsigned long mmap_base; /* base of mmap area */
> unsigned long mmap_legacy_base; /* base of mmap area in bottom-up allocations */
> #ifdef CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES
> diff --git a/include/linux/sched/coredump.h b/include/linux/sched/coredump.h
> index 02f5090ffea2..e62ff805cfc9 100644
> --- a/include/linux/sched/coredump.h
> +++ b/include/linux/sched/coredump.h
> @@ -92,9 +92,12 @@ static inline int get_dumpable(struct mm_struct *mm)
> #define MMF_VM_MERGE_ANY 30
> #define MMF_VM_MERGE_ANY_MASK (1 << MMF_VM_MERGE_ANY)
>
> +#define MMF_TOPDOWN 31 /* mm searches top down by default */
> +#define MMF_TOPDOWN_MASK (1 << MMF_TOPDOWN)
> +
> #define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK |\
> MMF_DISABLE_THP_MASK | MMF_HAS_MDWE_MASK |\
> - MMF_VM_MERGE_ANY_MASK)
> + MMF_VM_MERGE_ANY_MASK | MMF_TOPDOWN_MASK)
>
> static inline unsigned long mmf_init_flags(unsigned long flags)
> {
> diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
> index 9a19f1b42f64..cde946e926d8 100644
> --- a/include/linux/sched/mm.h
> +++ b/include/linux/sched/mm.h
> @@ -8,6 +8,7 @@
> #include <linux/mm_types.h>
> #include <linux/gfp.h>
> #include <linux/sync_core.h>
> +#include <linux/sched/coredump.h>
>
> /*
> * Routines for handling mm_structs
> @@ -186,6 +187,10 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
> unsigned long len, unsigned long pgoff,
> unsigned long flags);
>
> +unsigned long mm_get_unmapped_area(struct mm_struct *mm, struct file *filp,
> + unsigned long addr, unsigned long len,
> + unsigned long pgoff, unsigned long flags);
> +
> unsigned long
> generic_get_unmapped_area(struct file *filp, unsigned long addr,
> unsigned long len, unsigned long pgoff,
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index cd9a137ad6ce..9eb3b2587031 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -3513,7 +3513,7 @@ static unsigned long io_uring_mmu_get_unmapped_area(struct file *filp,
> #else
> addr = 0UL;
> #endif
> - return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, flags);
> }
>
> #else /* !CONFIG_MMU */
> diff --git a/mm/debug.c b/mm/debug.c
> index ee533a5ceb79..32db5de8e1e7 100644
> --- a/mm/debug.c
> +++ b/mm/debug.c
> @@ -162,9 +162,6 @@ EXPORT_SYMBOL(dump_vma);
> void dump_mm(const struct mm_struct *mm)
> {
> pr_emerg("mm %px task_size %lu\n"
> -#ifdef CONFIG_MMU
> - "get_unmapped_area %px\n"
> -#endif
> "mmap_base %lu mmap_legacy_base %lu\n"
> "pgd %px mm_users %d mm_count %d pgtables_bytes %lu map_count %d\n"
> "hiwater_rss %lx hiwater_vm %lx total_vm %lx locked_vm %lx\n"
> @@ -190,9 +187,6 @@ void dump_mm(const struct mm_struct *mm)
> "def_flags: %#lx(%pGv)\n",
>
> mm, mm->task_size,
> -#ifdef CONFIG_MMU
> - mm->get_unmapped_area,
> -#endif
> mm->mmap_base, mm->mmap_legacy_base,
> mm->pgd, atomic_read(&mm->mm_users),
> atomic_read(&mm->mm_count),
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 94c958f7ebb5..bc3bf441e768 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -822,8 +822,8 @@ static unsigned long __thp_get_unmapped_area(struct file *filp,
> if (len_pad < len || (off + len_pad) < off)
> return 0;
>
> - ret = current->mm->get_unmapped_area(filp, addr, len_pad,
> - off >> PAGE_SHIFT, flags);
> + ret = mm_get_unmapped_area(current->mm, filp, addr, len_pad,
> + off >> PAGE_SHIFT, flags);
>
> /*
> * The failure might be due to length padding. The caller will retry
> @@ -841,8 +841,7 @@ static unsigned long __thp_get_unmapped_area(struct file *filp,
>
> off_sub = (off - ret) & (size - 1);
>
> - if (current->mm->get_unmapped_area == arch_get_unmapped_area_topdown &&
> - !off_sub)
> + if (test_bit(MMF_TOPDOWN, ¤t->mm->flags) && !off_sub)
> return ret + size;
>
> ret += off_sub;
> @@ -859,7 +858,7 @@ unsigned long thp_get_unmapped_area(struct file *filp, unsigned long addr,
> if (ret)
> return ret;
>
> - return current->mm->get_unmapped_area(filp, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, filp, addr, len, pgoff, flags);
> }
> EXPORT_SYMBOL_GPL(thp_get_unmapped_area);
>
> diff --git a/mm/mmap.c b/mm/mmap.c
> index 3281287771c9..39e9a3ae3ca5 100644
> --- a/mm/mmap.c
> +++ b/mm/mmap.c
> @@ -1815,7 +1815,8 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
> unsigned long pgoff, unsigned long flags)
> {
> unsigned long (*get_area)(struct file *, unsigned long,
> - unsigned long, unsigned long, unsigned long);
> + unsigned long, unsigned long, unsigned long)
> + = NULL;
>
> unsigned long error = arch_mmap_check(addr, len, flags);
> if (error)
> @@ -1825,7 +1826,6 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
> if (len > TASK_SIZE)
> return -ENOMEM;
>
> - get_area = current->mm->get_unmapped_area;
> if (file) {
> if (file->f_op->get_unmapped_area)
> get_area = file->f_op->get_unmapped_area;
> @@ -1844,7 +1844,11 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
> if (!file)
> pgoff = 0;
>
> - addr = get_area(file, addr, len, pgoff, flags);
> + if (get_area)
> + addr = get_area(file, addr, len, pgoff, flags);
> + else
> + addr = mm_get_unmapped_area(current->mm, file, addr, len,
> + pgoff, flags);
> if (IS_ERR_VALUE(addr))
> return addr;
>
> @@ -1859,6 +1863,17 @@ get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
>
> EXPORT_SYMBOL(get_unmapped_area);
>
> +unsigned long
> +mm_get_unmapped_area(struct mm_struct *mm, struct file *file,
> + unsigned long addr, unsigned long len,
> + unsigned long pgoff, unsigned long flags)
> +{
> + if (test_bit(MMF_TOPDOWN, &mm->flags))
> + return arch_get_unmapped_area_topdown(file, addr, len, pgoff, flags);
> + return arch_get_unmapped_area(file, addr, len, pgoff, flags);
> +}
This function seems quite simple, wouldn't it be better to make it a
static inline ?
> +EXPORT_SYMBOL(mm_get_unmapped_area);
> +
> /**
> * find_vma_intersection() - Look up the first VMA which intersects the interval
> * @mm: The process address space.
> diff --git a/mm/shmem.c b/mm/shmem.c
> index d7c84ff62186..5452065faa46 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -2240,8 +2240,6 @@ unsigned long shmem_get_unmapped_area(struct file *file,
> unsigned long uaddr, unsigned long len,
> unsigned long pgoff, unsigned long flags)
> {
> - unsigned long (*get_area)(struct file *,
> - unsigned long, unsigned long, unsigned long, unsigned long);
> unsigned long addr;
> unsigned long offset;
> unsigned long inflated_len;
> @@ -2251,8 +2249,8 @@ unsigned long shmem_get_unmapped_area(struct file *file,
> if (len > TASK_SIZE)
> return -ENOMEM;
>
> - get_area = current->mm->get_unmapped_area;
> - addr = get_area(file, uaddr, len, pgoff, flags);
> + addr = mm_get_unmapped_area(current->mm, file, uaddr, len, pgoff,
> + flags);
>
> if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE))
> return addr;
> @@ -2309,7 +2307,8 @@ unsigned long shmem_get_unmapped_area(struct file *file,
> if (inflated_len < len)
> return addr;
>
> - inflated_addr = get_area(NULL, uaddr, inflated_len, 0, flags);
> + inflated_addr = mm_get_unmapped_area(current->mm, NULL, uaddr,
> + inflated_len, 0, flags);
> if (IS_ERR_VALUE(inflated_addr))
> return addr;
> if (inflated_addr & ~PAGE_MASK)
> @@ -4755,7 +4754,7 @@ unsigned long shmem_get_unmapped_area(struct file *file,
> unsigned long addr, unsigned long len,
> unsigned long pgoff, unsigned long flags)
> {
> - return current->mm->get_unmapped_area(file, addr, len, pgoff, flags);
> + return mm_get_unmapped_area(current->mm, file, addr, len, pgoff, flags);
> }
> #endif
>
> diff --git a/mm/util.c b/mm/util.c
> index 5a6a9802583b..2b959553f9ce 100644
> --- a/mm/util.c
> +++ b/mm/util.c
> @@ -452,17 +452,17 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
>
> if (mmap_is_legacy(rlim_stack)) {
> mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
> - mm->get_unmapped_area = arch_get_unmapped_area;
> + clear_bit(MMF_TOPDOWN, &mm->flags);
> } else {
> mm->mmap_base = mmap_base(random_factor, rlim_stack);
> - mm->get_unmapped_area = arch_get_unmapped_area_topdown;
> + set_bit(MMF_TOPDOWN, &mm->flags);
> }
> }
> #elif defined(CONFIG_MMU) && !defined(HAVE_ARCH_PICK_MMAP_LAYOUT)
> void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)
> {
> mm->mmap_base = TASK_UNMAPPED_BASE;
> - mm->get_unmapped_area = arch_get_unmapped_area;
> + clear_bit(MMF_TOPDOWN, &mm->flags);
> }
> #endif
>
Powered by blists - more mailing lists