Convert powerpc to default topdown mmap layout
Subsystems (9)
v6 cover Convert powerpc to default topdown mmap layout
Rebased on top of powerpc/next branch
This series converts powerpc to default topdown mmap layout.
powerpc requires its own arch_get_unmapped_area() only when slices are needed, which is only for book3s/64. First part of the series moves slices into book3s/64 specific directories and cleans up other subarchitectures.
Last part converts to default topdown mmap layout.
A small modification is done to core mm to allow powerpc to still provide its own arch_randomize_brk()
Another modification is done to core mm to allow powerpc to use generic versions of get_unmapped_area functions for Radix while still providing its own implementation for Hash, the selection between Radix and Hash being doing at runtime.
Last modification to core mm is to give len and flags to arch_get_mmap_end().
Changes in v6:
- New patch (patch 4) to take arch_get_mmap_base() and arch_get_mmap_end() into account in generic hugetlb_get_unmapped_area()
- Get back arch_randomize_brk() simplification as it relies on default topdown mmap layout.
- Fixed precedence between || and && in powerpc's arch_get_mmap_end() (patch 9)
Changes in v5:
- Added patch 3
- Added arch_get_mmap_base() and arch_get_mmap_end() to patch 7 to better match original powerpc behaviour
- Switched patched 10 and 11 and performed full randomisation in patch 10 just before switching to default implementation, as suggested by Nic.
Changes in v4:
- Move arch_randomize_brk() simplification out of this series
- Add a change to core mm to enable using generic implementation while providing arch specific one at the same time.
- Reworked radix get_unmapped_area to use generic implementation
- Rebase on top of Nic's series v6
Changes in v3:
- Fixed missing <linux/elf-randomize.h> in last patch
- Added a patch to move SZ_1T out of drivers/pci/controller/pci-xgene.c
Changes in v2:
- Moved patch 4 before patch 2
- Make generic arch_randomize_brk() __weak
- Added patch 9
Christophe Leroy (14):
mm: Allow arch specific arch_randomize_brk() with
CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT
mm, hugetlbfs: Allow an arch to always use generic versions of
get_unmapped_area functions
mm: Add len and flags parameters to arch_get_mmap_end() mm, hugetlbfs: Allow for "high" userspace addresses sizes.h: Add SZ_1T macro
powerpc/mm: Move vma_mmu_pagesize()
powerpc/mm: Make slice specific to book3s/64 powerpc/mm: Remove CONFIG_PPC_MM_SLICES
powerpc/mm: Use generic_get_unmapped_area() and call it from
arch_get_unmapped_area()
powerpc/mm: Use generic_hugetlb_get_unmapped_area() powerpc/mm: Move get_unmapped_area functions to slice.c powerpc/mm: Enable full randomisation of memory mappings powerpc/mm: Convert to default topdown mmap layout
powerpc: Simplify and move arch_randomize_brk()
arch/arm64/include/asm/processor.h | 4 +-
arch/powerpc/Kconfig | 2 +-
arch/powerpc/include/asm/book3s/64/hugetlb.h | 4 -
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 +
arch/powerpc/include/asm/book3s/64/mmu.h | 6 -
arch/powerpc/include/asm/book3s/64/slice.h | 24 ++
arch/powerpc/include/asm/hugetlb.h | 2 +-
arch/powerpc/include/asm/paca.h | 7 -
arch/powerpc/include/asm/page.h | 1 -
arch/powerpc/include/asm/processor.h | 2 -
arch/powerpc/include/asm/slice.h | 46 ----
arch/powerpc/include/asm/task_size_64.h | 8 +
arch/powerpc/kernel/paca.c | 5 -
arch/powerpc/kernel/process.c | 41 ---
arch/powerpc/mm/Makefile | 3 +-
arch/powerpc/mm/book3s64/Makefile | 2 +-
arch/powerpc/mm/book3s64/hash_utils.c | 33 ++-
arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 55 ----
arch/powerpc/mm/{ => book3s64}/slice.c | 71 ++++-
arch/powerpc/mm/hugetlbpage.c | 34 ---
arch/powerpc/mm/mmap.c | 256 ------------------
arch/powerpc/mm/nohash/mmu_context.c | 9 -
arch/powerpc/mm/nohash/tlb.c | 4 -
arch/powerpc/platforms/Kconfig.cputype | 4 -
drivers/pci/controller/pci-xgene.c | 1 -
fs/hugetlbfs/inode.c | 26 +-
include/linux/hugetlb.h | 5 +
include/linux/sched/mm.h | 17 ++
include/linux/sizes.h | 2 +
mm/mmap.c | 43 +--
mm/util.c | 2 +-
31 files changed, 185 insertions(+), 535 deletions(-)
delete mode 100644 arch/powerpc/include/asm/slice.h
rename arch/powerpc/mm/{ => book3s64}/slice.c (91%)
delete mode 100644 arch/powerpc/mm/mmap.cSignature · 1 line
2.33.1
PATCH v6 1/14 mm: Allow arch specific arch_randomize_brk() with CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT
Commit e7142bf5d231 ("arm64, mm: make randomization selected by generic topdown mmap layout") introduced a default version of arch_randomize_brk() provided when CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT is selected.
powerpc could select CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT but needs to provide its own arch_randomize_brk().
In order to allow that, define generic version of arch_randomize_brk() as a __weak symbol.
--- mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/util.c +1 -1
@@ -344,7 +344,7 @@ unsigned long randomize_stack_top(unsigned long stack_top) }#ifdef CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT -unsigned long arch_randomize_brk (struct mm_struct *mm) +unsigned long __weak arch_randomize_brk (struct mm_struct *mm) {/* Is the current task 32bit ? */ if (!IS_ENABLED (CONFIG_64BIT ) ||is_compat_task ())
Signature · 1 line
2.33.1
PATCH v6 2/14 mm, hugetlbfs: Allow an arch to always use generic versions of get_unmapped_area functions
In reply to Christophe LeroyUnlike most architectures, powerpc can only define at runtime if it is going to use the generic arch_get_unmapped_area() or not.
Today, powerpc has a copy of the generic arch_get_unmapped_area() because when selection HAVE_ARCH_UNMAPPED_AREA the generic arch_get_unmapped_area() is not available.
Rename it generic_get_unmapped_area() and make it independent of HAVE_ARCH_UNMAPPED_AREA.
Do the same for arch_get_unmapped_area_topdown() versus HAVE_ARCH_UNMAPPED_AREA_TOPDOWN.
Do the same for hugetlb_get_unmapped_area() versus HAVE_ARCH_HUGETLB_UNMAPPED_AREA.
--- fs/hugetlbfs/inode.c | 17 +++++++++++++---- include/linux/hugetlb.h | 5 +++++ include/linux/sched/mm.h | 9 +++++++++ mm/mmap.c | 31 ++++++++++++++++++++++++------- 4 files changed, 51 insertions(+), 11 deletions(-)
fs/hugetlbfs/inode.c +13 -4
@@ -195,7 +195,6 @@ static int hugetlbfs_file_mmap(struct file *file, struct vm_area_struct *vma)* Called under mmap_write_lock(mm). */ -#ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA static unsigned long hugetlb_get_unmapped_area_bottomup (struct file *file,unsigned long addr,unsigned long len,unsigned long pgoff,unsigned long flags)
@@ -244,9 +243,10 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr,return addr; } -static unsigned long -hugetlb_get_unmapped_area (struct file *file,unsigned long addr, -unsigned long len,unsigned long pgoff,unsigned long flags) +unsigned long +generic_hugetlb_get_unmapped_area (struct file *file,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) {struct mm_struct *mm = current->mm;struct vm_area_struct *vma;
@@ -282,6 +282,15 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,return hugetlb_get_unmapped_area_bottomup (file, addr, len, pgoff, flags); } + +#ifndef HAVE_ARCH_HUGETLB_UNMAPPED_AREA +static unsigned long +hugetlb_get_unmapped_area (struct file *file,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) +{ +return generic_hugetlb_get_unmapped_area (file, addr, len, pgoff, flags); +}#endif static size_t
include/linux/hugetlb.h +5 -0
@@ -513,6 +513,11 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long flags);#endif /* HAVE_ARCH_HUGETLB_UNMAPPED_AREA */ +unsigned long +generic_hugetlb_get_unmapped_area (struct file *file,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags); +/* * huegtlb page specific state flags. These flags are located in page.private * of the hugetlb head page. Functions created via the below macros should be
include/linux/sched/mm.h +9 -0
@@ -144,6 +144,15 @@ extern unsigned long arch_get_unmapped_area_topdown(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, +unsigned long flags); +unsigned long +generic_get_unmapped_area_topdown (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags);#else static inline void arch_pick_mmap_layout (struct mm_struct *mm,struct rlimit *rlim_stack) {}
mm/mmap.c +24 -7
@@ -2131,10 +2131,10 @@ unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info)* * This function "knows" that -ENOMEM has the bits set. */ -#ifndef HAVE_ARCH_UNMAPPED_AREA unsigned long -arch_get_unmapped_area (struct file *filp,unsigned long addr, -unsigned long len,unsigned long pgoff,unsigned long flags) +generic_get_unmapped_area (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) {struct mm_struct *mm = current->mm;struct vm_area_struct *vma, *prev;
@@ -2164,17 +2164,25 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, info.align_offset =0 ;return vm_unmapped_area (&info); } + +#ifndef HAVE_ARCH_UNMAPPED_AREA +unsigned long +arch_get_unmapped_area (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) +{ +return generic_get_unmapped_area (filp, addr, len, pgoff, flags); +}#endif /* * This mmap-allocator allocates new areas top-down from below the * stack's low limit (the base): */ -#ifndef HAVE_ARCH_UNMAPPED_AREA_TOPDOWN unsigned long -arch_get_unmapped_area_topdown (struct file *filp,unsigned long addr, -unsigned long len,unsigned long pgoff, -unsigned long flags) +generic_get_unmapped_area_topdown (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) {struct vm_area_struct *vma, *prev;struct mm_struct *mm = current->mm;
@@ -2222,6 +2230,15 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,return addr; } + +#ifndef HAVE_ARCH_UNMAPPED_AREA_TOPDOWN +unsigned long +arch_get_unmapped_area_topdown (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags) +{ +return generic_get_unmapped_area_topdown (filp, addr, len, pgoff, flags); +}#endif unsigned long
Signature · 1 line
2.33.1
PATCH v6 3/14 mm: Add len and flags parameters to arch_get_mmap_end()
In reply to Christophe LeroyPowerpc needs flags and len to make decision on arch_get_mmap_end().
So add them as parameters to arch_get_mmap_end().
--- arch/arm64/include/asm/processor.h | 4 ++-- mm/mmap.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/arm64/include/asm/processor.h +2 -2
@@ -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 :\
mm/mmap.c +3 -3
@@ -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)
Signature · 1 line
2.33.1
PATCH v6 4/14 mm, hugetlbfs: Allow for "high" userspace addresses
In reply to Christophe LeroyThis is a complement of f6795053dac8 ("mm: mmap: Allow for "high" userspace addresses") for hugetlb.
This patch adds support for "high" userspace addresses that are optionally supported on the system and have to be requested via a hint mechanism ("high" addr parameter to mmap).
Architectures such as powerpc and x86 achieve this by making changes to their architectural versions of hugetlb_get_unmapped_area() function. However, arm64 uses the generic version of that function.
So take into account arch_get_mmap_base() and arch_get_mmap_end() in hugetlb_get_unmapped_area(). To allow that, move those two macros out of mm/mmap.c into include/linux/sched/mm.h
If these macros are not defined in architectural code then they default to (TASK_SIZE) and (base) so should not introduce any behavioural changes to architectures that do not define them.
For the time being, only ARM64 is affected by this change.
--- fs/hugetlbfs/inode.c | 9 +++++---- include/linux/sched/mm.h | 8 ++++++++ mm/mmap.c | 8 -------- 3 files changed, 13 insertions(+), 12 deletions(-)
fs/hugetlbfs/inode.c +5 -4
@@ -205,7 +205,7 @@ hugetlb_get_unmapped_area_bottomup(struct file *file, unsigned long addr, info.flags =0 ; info.length = len; info.low_limit = current->mm->mmap_base; - info.high_limit =TASK_SIZE ; + info.high_limit =arch_get_mmap_end (addr, len, flags); info.align_mask =PAGE_MASK & ~huge_page_mask (h); info.align_offset =0 ;return vm_unmapped_area (&info);
@@ -221,7 +221,7 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr, info.flags =VM_UNMAPPED_AREA_TOPDOWN ; info.length = len; info.low_limit =max (PAGE_SIZE , mmap_min_addr); - info.high_limit = current->mm->mmap_base; + info.high_limit =arch_get_mmap_base (addr, current->mm->mmap_base); info.align_mask =PAGE_MASK & ~huge_page_mask (h); info.align_offset =0 ; addr =vm_unmapped_area (&info);
@@ -236,7 +236,7 @@ hugetlb_get_unmapped_area_topdown(struct file *file, unsigned long addr,VM_BUG_ON (addr != -ENOMEM ); info.flags =0 ; info.low_limit = current->mm->mmap_base; - info.high_limit =TASK_SIZE ; + info.high_limit =arch_get_mmap_end (addr, len, flags); addr =vm_unmapped_area (&info); }
@@ -251,6 +251,7 @@ generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr,struct mm_struct *mm = current->mm;struct vm_area_struct *vma;struct hstate *h =hstate_file (file); +const unsigned long mmap_end =arch_get_mmap_end (addr, len, flags);if (len & ~huge_page_mask (h))return -EINVAL ;
@@ -266,7 +267,7 @@ generic_hugetlb_get_unmapped_area(struct file *file, unsigned long addr,if (addr) { addr =ALIGN (addr,huge_page_size (h)); vma =find_vma (mm, addr); -if (TASK_SIZE - len >= addr && +if (mmap_end - len >= addr && (!vma || addr + len <=vm_start_gap (vma)))return addr; }
include/linux/sched/mm.h +8 -0
@@ -135,6 +135,14 @@ static inline void mm_update_next_owner(struct mm_struct *mm)#endif /* CONFIG_MEMCG */ #ifdef CONFIG_MMU +#ifndef arch_get_mmap_end +#define arch_get_mmap_end (addr, len, flags) (TASK_SIZE) +#endif + +#ifndef arch_get_mmap_base +#define arch_get_mmap_base (addr, base) (base) +#endif +extern void arch_pick_mmap_layout (struct mm_struct *mm,struct rlimit *rlim_stack); extern unsigned long
mm/mmap.c +0 -8
@@ -2112,14 +2112,6 @@ unsigned long vm_unmapped_area(struct vm_unmapped_area_info *info)return addr; } -#ifndef arch_get_mmap_end -#define arch_get_mmap_end (addr, len, flags) (TASK_SIZE) -#endif - -#ifndef arch_get_mmap_base -#define arch_get_mmap_base (addr, base) (base) -#endif -/* Get an address range which is currently unmapped. * For shmat() with addr=0. *
Signature · 1 line
2.33.1
PATCH v6 5/14 sizes.h: Add SZ_1T macro
In reply to Christophe LeroyToday drivers/pci/controller/pci-xgene.c defines SZ_1T
Move it into linux/sizes.h so that it can be re-used elsewhere.
--- drivers/pci/controller/pci-xgene.c | 1 - include/linux/sizes.h | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-xgene.c +0 -1
@@ -49,7 +49,6 @@#define EN_REG 0x00000001#define OB_LO_IO 0x00000002#define XGENE_PCIE_DEVICEID 0xE004 -#define SZ_1T (SZ_1G*1024ULL)#define PIPE_PHY_RATE_RD (src) ((0xc000 & (u32)(src)) >> 0xe)#define XGENE_V1_PCI_EXP_CAP 0x40
include/linux/sizes.h +2 -0
@@ -47,6 +47,8 @@#define SZ_8G _AC(0x200000000, ULL)#define SZ_16G _AC(0x400000000, ULL)#define SZ_32G _AC(0x800000000, ULL) + +#define SZ_1T _AC(0x10000000000, ULL)#define SZ_64T _AC(0x400000000000, ULL)#endif /* __LINUX_SIZES_H__ */
Signature · 1 line
2.33.1
PATCH v6 6/14 powerpc/mm: Move vma_mmu_pagesize()
In reply to Christophe Leroyvma_mmu_pagesize() is only required for slices, otherwise there is a generic weak version doing the exact same thing.
Move it to slice.c
--- arch/powerpc/mm/hugetlbpage.c | 11 ----------- arch/powerpc/mm/slice.c | 9 +++++++++ 2 files changed, 9 insertions(+), 11 deletions(-)
arch/powerpc/mm/hugetlbpage.c +0 -11
@@ -565,17 +565,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, }#endif -unsigned long vma_mmu_pagesize (struct vm_area_struct *vma) -{ -/* With radix we don't use slice, so derive it from vma*/ -if (IS_ENABLED (CONFIG_PPC_MM_SLICES ) && !radix_enabled ()) { -unsigned int psize =get_slice_psize (vma->vm_mm, vma->vm_start); - -return 1UL <<mmu_psize_to_shift (psize); - } -return vma_kernel_pagesize (vma); -} -bool __init arch_hugetlb_valid_size (unsigned long size) {int shift =__ffs (size);
arch/powerpc/mm/slice.c +9 -0
@@ -759,4 +759,13 @@ int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, return !slice_check_range_fits(mm, maskp, addr, len); } + +unsigned long vma_mmu_pagesize (struct vm_area_struct *vma) +{ +/* With radix we don't use slice, so derive it from vma*/ +if (radix_enabled ()) +return vma_kernel_pagesize (vma); + +return 1UL <<mmu_psize_to_shift (get_slice_psize (vma->vm_mm, vma->vm_start)); +}#endif
Signature · 1 line
2.33.1
PATCH v6 7/14 powerpc/mm: Make slice specific to book3s/64
In reply to Christophe LeroySince commit 555904d07eef ("powerpc/8xx: MM_SLICE is not needed anymore") only book3s/64 selects CONFIG_PPC_MM_SLICES.
Move slice.c into mm/book3s64/
Move necessary stuff in asm/book3s/64/slice.h and
remove asm/slice.h
---
arch/powerpc/include/asm/book3s/64/mmu-hash.h | 1 +
arch/powerpc/include/asm/book3s/64/slice.h | 18 ++++++++
arch/powerpc/include/asm/page.h | 1 -
arch/powerpc/include/asm/slice.h | 46 -------------------
arch/powerpc/mm/Makefile | 1 -
arch/powerpc/mm/book3s64/Makefile | 1 +
arch/powerpc/mm/{ => book3s64}/slice.c | 2 -
arch/powerpc/mm/nohash/mmu_context.c | 9 ----
arch/powerpc/mm/nohash/tlb.c | 4 --
9 files changed, 20 insertions(+), 63 deletions(-)
delete mode 100644 arch/powerpc/include/asm/slice.h
rename arch/powerpc/mm/{ => book3s64}/slice.c (99%)arch/powerpc/include/asm/book3s/64/mmu-hash.h +1 -0
@@ -18,6 +18,7 @@* complete pgtable.h but only a portion of it. */ #include <asm/book3s/64/pgtable.h> +#include <asm/book3s/64/slice.h> #include <asm/task_size_64.h> #include <asm/cpu_has_feature.h>
arch/powerpc/include/asm/book3s/64/slice.h +18 -0
@@ -2,6 +2,8 @@#ifndef _ASM_POWERPC_BOOK3S_64_SLICE_H#define _ASM_POWERPC_BOOK3S_64_SLICE_H +#ifndef __ASSEMBLY__ +#define SLICE_LOW_SHIFT 28#define SLICE_LOW_TOP (0x100000000ul)#define SLICE_NUM_LOW (SLICE_LOW_TOP >> SLICE_LOW_SHIFT)
@@ -13,4 +15,20 @@#define SLB_ADDR_LIMIT_DEFAULT DEFAULT_MAP_WINDOW_USER64 +struct mm_struct ; + +unsigned long slice_get_unmapped_area (unsigned long addr,unsigned long len, +unsigned long flags,unsigned int psize, +int topdown); + +unsigned int get_slice_psize (struct mm_struct *mm,unsigned long addr); + +void slice_set_range_psize (struct mm_struct *mm,unsigned long start, +unsigned long len,unsigned int psize); + +void slice_init_new_context_exec (struct mm_struct *mm); +void slice_setup_new_exec (void ); + +#endif /* __ASSEMBLY__ */ +#endif /* _ASM_POWERPC_BOOK3S_64_SLICE_H */
arch/powerpc/include/asm/page.h +0 -1
@@ -329,6 +329,5 @@ static inline unsigned long kaslr_offset(void)#include <asm-generic/memory_model.h> #endif /* __ASSEMBLY__ */ -#include <asm/slice.h> #endif /* _ASM_POWERPC_PAGE_H */
arch/powerpc/include/asm/slice.h deleted +0 -46
46 lines not on this page · raw message
arch/powerpc/mm/Makefile +0 -1
@@ -14,7 +14,6 @@ obj-$(CONFIG_PPC_MMU_NOHASH) += nohash/ obj-$(CONFIG_PPC_BOOK3S_32) += book3s32/ obj-$(CONFIG_PPC_BOOK3S_64) += book3s64/ obj-$(CONFIG_NUMA) += numa.o -obj-$(CONFIG_PPC_MM_SLICES) += slice.o obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-noncoherent.o obj-$(CONFIG_PPC_COPRO_BASE) += copro_fault.o
arch/powerpc/mm/book3s64/Makefile +1 -0
@@ -21,6 +21,7 @@ obj-$(CONFIG_PPC_RADIX_MMU) += radix_hugetlbpage.o endif obj-$(CONFIG_SPAPR_TCE_IOMMU) += iommu_api.o obj-$(CONFIG_PPC_PKEY) += pkeys.o +obj-$(CONFIG_PPC_MM_SLICES) += slice.o # Instrumenting the SLB fault path can lead to duplicate SLB entries KCOV_INSTRUMENT_slb.o := n
arch/powerpc/mm/book3s64/slice.c renamed from arch/powerpc/mm/slice.c +0 -2
@@ -692,7 +692,6 @@ void slice_init_new_context_exec(struct mm_struct *mm)bitmap_fill (mask->high_slices,SLICE_NUM_HIGH ); } -#ifdef CONFIG_PPC_BOOK3S_64 void slice_setup_new_exec (void ) {struct mm_struct *mm = current->mm;
@@ -704,7 +703,6 @@ void slice_setup_new_exec(void)mm_ctx_set_slb_addr_limit (&mm->context,DEFAULT_MAP_WINDOW ); } -#endif void slice_set_range_psize (struct mm_struct *mm,unsigned long start,unsigned long len,unsigned int psize)
arch/powerpc/mm/nohash/mmu_context.c +0 -9
@@ -317,15 +317,6 @@ void switch_mmu_context(struct mm_struct *prev, struct mm_struct *next,*/ int init_new_context (struct task_struct *t,struct mm_struct *mm) { -/* -* We have MMU_NO_CONTEXT set to be ~0. Hence check -* explicitly against context.id == 0. This ensures that we properly -* initialize context slice details for newly allocated mm's (which will -* have id == 0) and don't alter context slice inherited via fork (which -* will have id != 0). -*/ -if (mm->context.id ==0 ) -slice_init_new_context_exec (mm); mm->context.id =MMU_NO_CONTEXT ; mm->context.active =0 ;pte_frag_set (&mm->context,NULL );
arch/powerpc/mm/nohash/tlb.c +0 -4
@@ -773,9 +773,5 @@ void __init early_init_mmu(void)#ifdef CONFIG_PPC_47xearly_init_mmu_47x (); #endif - -#ifdef CONFIG_PPC_MM_SLICES -mm_ctx_set_slb_addr_limit (&init_mm.context,SLB_ADDR_LIMIT_DEFAULT ); -#endif }#endif /* CONFIG_PPC64 */
Signature · 1 line
2.33.1
PATCH v6 8/14 powerpc/mm: Remove CONFIG_PPC_MM_SLICES
In reply to Christophe LeroyCONFIG_PPC_MM_SLICES is always selected by hash book3s/64. CONFIG_PPC_MM_SLICES is never selected by other platforms.
Remove it.
--- arch/powerpc/include/asm/hugetlb.h | 2 +- arch/powerpc/include/asm/paca.h | 7 ------- arch/powerpc/kernel/paca.c | 5 ----- arch/powerpc/mm/book3s64/Makefile | 3 +-- arch/powerpc/mm/book3s64/hash_utils.c | 14 -------------- arch/powerpc/mm/hugetlbpage.c | 2 +- arch/powerpc/mm/mmap.c | 4 ++-- arch/powerpc/platforms/Kconfig.cputype | 4 ---- 8 files changed, 5 insertions(+), 36 deletions(-)
arch/powerpc/include/asm/hugetlb.h +1 -1
@@ -24,7 +24,7 @@ static inline int is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, unsigned long len) { - if (IS_ENABLED(CONFIG_PPC_MM_SLICES) && !radix_enabled()) + if (IS_ENABLED(CONFIG_PPC_64S_HASH_MMU) && !radix_enabled()) return slice_is_hugepage_only_range(mm, addr, len);return 0 ; }
arch/powerpc/include/asm/paca.h +0 -7
@@ -152,16 +152,9 @@ struct paca_struct {struct tlb_core_data tcd;#endif /* CONFIG_PPC_BOOK3E */ -#ifdef CONFIG_PPC_BOOK3S #ifdef CONFIG_PPC_64S_HASH_MMU -#ifdef CONFIG_PPC_MM_SLICES unsigned char mm_ctx_low_slices_psize[BITS_PER_LONG /BITS_PER_BYTE ];unsigned char mm_ctx_high_slices_psize[SLICE_ARRAY_SIZE ]; -#else -u16 mm_ctx_user_psize; -u16 mm_ctx_sllp; -#endif -#endif #endif /*
arch/powerpc/kernel/paca.c +0 -5
@@ -344,15 +344,10 @@ void copy_mm_to_paca(struct mm_struct *mm) {mm_context_t *context = &mm->context; -#ifdef CONFIG_PPC_MM_SLICES VM_BUG_ON (!mm_ctx_slb_addr_limit (context));memcpy (&get_paca ()->mm_ctx_low_slices_psize,mm_ctx_low_slices (context),LOW_SLICE_ARRAY_SZ );memcpy (&get_paca ()->mm_ctx_high_slices_psize,mm_ctx_high_slices (context),TASK_SLICE_ARRAY_SZ (context)); -#else /* CONFIG_PPC_MM_SLICES */ -get_paca ()->mm_ctx_user_psize = context->user_psize; -get_paca ()->mm_ctx_sllp = context->sllp; -#endif }#endif /* CONFIG_PPC_64S_HASH_MMU */
arch/powerpc/mm/book3s64/Makefile +1 -2
@@ -5,7 +5,7 @@ ccflags-y := $(NO_MINIMAL_TOC) obj-y += mmu_context.o pgtable.o trace.o ifdef CONFIG_PPC_64S_HASH_MMU CFLAGS_REMOVE_slb.o = $(CC_FLAGS_FTRACE) -obj-y += hash_pgtable.o hash_utils.o hash_tlb.o slb.o +obj-y += hash_pgtable.o hash_utils.o hash_tlb.o slb.o slice.o obj-$(CONFIG_PPC_HASH_MMU_NATIVE) += hash_native.o obj-$(CONFIG_PPC_4K_PAGES) += hash_4k.o obj-$(CONFIG_PPC_64K_PAGES) += hash_64k.o
@@ -21,7 +21,6 @@ obj-$(CONFIG_PPC_RADIX_MMU) += radix_hugetlbpage.o endif obj-$(CONFIG_SPAPR_TCE_IOMMU) += iommu_api.o obj-$(CONFIG_PPC_PKEY) += pkeys.o -obj-$(CONFIG_PPC_MM_SLICES) += slice.o # Instrumenting the SLB fault path can lead to duplicate SLB entries KCOV_INSTRUMENT_slb.o := n
arch/powerpc/mm/book3s64/hash_utils.c +0 -14
@@ -1264,7 +1264,6 @@ unsigned int hash_page_do_lazy_icache(unsigned int pp, pte_t pte, int trap)return pp; } -#ifdef CONFIG_PPC_MM_SLICES static unsigned int get_paca_psize (unsigned long addr) {unsigned char *psizes;
@@ -1281,12 +1280,6 @@ static unsigned int get_paca_psize(unsigned long addr)return (psizes[index >>1 ] >> (mask_index *4 )) &0xF ; } -#else -unsigned int get_paca_psize (unsigned long addr) -{ -return get_paca ()->mm_ctx_user_psize; -} -#endif /* * Demote a segment to using 4k pages.
@@ -1710,7 +1703,6 @@ DEFINE_INTERRUPT_HANDLER_RAW(do_hash_fault)return 0 ; } -#ifdef CONFIG_PPC_MM_SLICES static bool should_hash_preload (struct mm_struct *mm,unsigned long ea) {int psize =get_slice_psize (mm, ea);
@@ -1727,12 +1719,6 @@ static bool should_hash_preload(struct mm_struct *mm, unsigned long ea)return true; } -#else -static bool should_hash_preload (struct mm_struct *mm,unsigned long ea) -{ -return true; -} -#endif static void hash_preload (struct mm_struct *mm,pte_t *ptep,unsigned long ea,bool is_exec,unsigned long trap)
arch/powerpc/mm/hugetlbpage.c +1 -1
@@ -558,7 +558,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,return radix__hugetlb_get_unmapped_area (file, addr, len, pgoff, flags);#endif -#ifdef CONFIG_PPC_MM_SLICES +#ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area (addr, len, flags,file_to_psize (file),1 );#endif BUG ();
arch/powerpc/mm/mmap.c +2 -2
@@ -190,7 +190,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long pgoff, unsigned long flags) { -#ifdef CONFIG_PPC_MM_SLICES +#ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area (addr, len, flags,mm_ctx_user_psize (¤t->mm->context),0 );#else
@@ -204,7 +204,7 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp, const unsigned long pgoff, const unsigned long flags) { -#ifdef CONFIG_PPC_MM_SLICES +#ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area (addr0, len, flags,mm_ctx_user_psize (¤t->mm->context),1 );#else
arch/powerpc/platforms/Kconfig.cputype +0 -4
@@ -376,7 +376,6 @@ config SPE config PPC_64S_HASH_MMU bool "Hash MMU Support" depends on PPC_BOOK3S_64 - select PPC_MM_SLICES default y help Enable support for the Power ISA Hash style MMU. This is implemented
@@ -450,9 +449,6 @@ config PPC_BOOK3E_MMU def_bool y depends on FSL_BOOKE || PPC_BOOK3E -config PPC_MM_SLICES - bool - config PPC_HAVE_PMU_SUPPORT bool
Signature · 1 line
2.33.1
PATCH v6 9/14 powerpc/mm: Use generic_get_unmapped_area() and call it from arch_get_unmapped_area()
In reply to Christophe LeroyUse the generic version of arch_get_unmapped_area() which is now available at all time instead of its copy radix__arch_get_unmapped_area()
To allow that for PPC64, add arch_get_mmap_base() and arch_get_mmap_end() macros.
Instead of setting mm->get_unmapped_area() to either arch_get_unmapped_area() or generic_get_unmapped_area(), always set it to arch_get_unmapped_area() and call generic_get_unmapped_area() from there when radix is enabled.
Do the same with radix__arch_get_unmapped_area_topdown()
--- arch/powerpc/include/asm/task_size_64.h | 8 ++ arch/powerpc/mm/mmap.c | 127 ++---------------------- 2 files changed, 14 insertions(+), 121 deletions(-)
arch/powerpc/include/asm/task_size_64.h +8 -0
@@ -76,4 +76,12 @@#define STACK_TOP_MAX TASK_SIZE_USER64#define STACK_TOP (is_32bit_task() ? STACK_TOP_USER32 : STACK_TOP_USER64) +#define arch_get_mmap_base (addr, base) \ + (((addr) > DEFAULT_MAP_WINDOW) ? (base) + TASK_SIZE - DEFAULT_MAP_WINDOW : (base)) + +#define arch_get_mmap_end (addr, len, flags) \ + (((addr) > DEFAULT_MAP_WINDOW) || \ + (((flags) & MAP_FIXED) && ((addr) + (len) > DEFAULT_MAP_WINDOW)) ? TASK_SIZE : \ + DEFAULT_MAP_WINDOW) +#endif /* _ASM_POWERPC_TASK_SIZE_64_H */
arch/powerpc/mm/mmap.c +6 -121
157 lines not on this page · raw message
Signature · 1 line
2.33.1
PATCH v6 10/14 powerpc/mm: Use generic_hugetlb_get_unmapped_area()
In reply to Christophe LeroyUse the generic version of arch_hugetlb_get_unmapped_area() which is now available at all time.
--- arch/powerpc/include/asm/book3s/64/hugetlb.h | 4 -- arch/powerpc/mm/book3s64/radix_hugetlbpage.c | 55 -------------------- arch/powerpc/mm/hugetlbpage.c | 4 +- 3 files changed, 1 insertion(+), 62 deletions(-)
arch/powerpc/include/asm/book3s/64/hugetlb.h +0 -4
@@ -8,10 +8,6 @@*/ void radix__flush_hugetlb_page (struct vm_area_struct *vma,unsigned long vmaddr);void radix__local_flush_hugetlb_page (struct vm_area_struct *vma,unsigned long vmaddr); -extern unsigned long -radix__hugetlb_get_unmapped_area (struct file *file,unsigned long addr, -unsigned long len,unsigned long pgoff, -unsigned long flags); extern void radix__huge_ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep,
arch/powerpc/mm/book3s64/radix_hugetlbpage.c +0 -55
61 lines not on this page · raw message
arch/powerpc/mm/hugetlbpage.c +1 -3
@@ -553,11 +553,9 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { -#ifdef CONFIG_PPC_RADIX_MMU if (radix_enabled()) - return radix__hugetlb_get_unmapped_area(file, addr, len, + return generic_hugetlb_get_unmapped_area(file, addr, len, pgoff, flags); -#endif #ifdef CONFIG_PPC_64S_HASH_MMU return slice_get_unmapped_area (addr, len, flags,file_to_psize (file),1 );#endif
Signature · 1 line
2.33.1
PATCH v6 11/14 powerpc/mm: Move get_unmapped_area functions to slice.c
In reply to Christophe Leroyhugetlb_get_unmapped_area() is now identical to the generic version if only RADIX is enabled, so move it to slice.c and let it fallback on the generic one when HASH MMU is not compiled in.
Do the same with arch_get_unmapped_area() and arch_get_unmapped_area_topdown().
--- arch/powerpc/include/asm/book3s/64/mmu.h | 6 ---- arch/powerpc/include/asm/book3s/64/slice.h | 6 ++++ arch/powerpc/mm/book3s64/slice.c | 42 ++++++++++++++++++++++ arch/powerpc/mm/hugetlbpage.c | 21 ----------- arch/powerpc/mm/mmap.c | 36 ------------------- 5 files changed, 48 insertions(+), 63 deletions(-)
arch/powerpc/include/asm/book3s/64/mmu.h +0 -6
@@ -4,12 +4,6 @@#include <asm/page.h> -#ifdef CONFIG_HUGETLB_PAGE -#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA -#endif -#define HAVE_ARCH_UNMAPPED_AREA -#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN -#ifndef __ASSEMBLY__/* * Page size definition
arch/powerpc/include/asm/book3s/64/slice.h +6 -0
@@ -4,6 +4,12 @@#ifndef __ASSEMBLY__ +#ifdef CONFIG_HUGETLB_PAGE +#define HAVE_ARCH_HUGETLB_UNMAPPED_AREA +#endif +#define HAVE_ARCH_UNMAPPED_AREA +#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN +#define SLICE_LOW_SHIFT 28#define SLICE_LOW_TOP (0x100000000ul)#define SLICE_NUM_LOW (SLICE_LOW_TOP >> SLICE_LOW_SHIFT)
arch/powerpc/mm/book3s64/slice.c +42 -0
52 lines not on this page · raw message
arch/powerpc/mm/hugetlbpage.c +0 -21
@@ -542,27 +542,6 @@ struct page *follow_huge_pd(struct vm_area_struct *vma,return page; } -#ifdef HAVE_ARCH_HUGETLB_UNMAPPED_AREA -static inline int file_to_psize (struct file *file) -{ -struct hstate *hstate =hstate_file (file); -return shift_to_mmu_psize (huge_page_shift (hstate)); -} - -unsigned long hugetlb_get_unmapped_area (struct file *file,unsigned long addr, -unsigned long len,unsigned long pgoff, -unsigned long flags) -{ -if (radix_enabled ()) -return generic_hugetlb_get_unmapped_area (file, addr, len, - pgoff, flags); -#ifdef CONFIG_PPC_64S_HASH_MMU -return slice_get_unmapped_area (addr, len, flags,file_to_psize (file),1 ); -#endif -BUG (); -} -#endif -bool __init arch_hugetlb_valid_size (unsigned long size) {int shift =__ffs (size);
arch/powerpc/mm/mmap.c +0 -36
@@ -80,42 +80,6 @@ static inline unsigned long mmap_base(unsigned long rnd,return PAGE_ALIGN (DEFAULT_MAP_WINDOW - gap - rnd); } -#ifdef HAVE_ARCH_UNMAPPED_AREA -unsigned long arch_get_unmapped_area (struct file *filp, -unsigned long addr, -unsigned long len, -unsigned long pgoff, -unsigned long flags) -{ -if (radix_enabled ()) -return generic_get_unmapped_area (filp, addr, len, pgoff, flags); - -#ifdef CONFIG_PPC_64S_HASH_MMU -return slice_get_unmapped_area (addr, len, flags, -mm_ctx_user_psize (¤t->mm->context),0 ); -#else -BUG (); -#endif -} - -unsigned long arch_get_unmapped_area_topdown (struct file *filp, -const unsigned long addr0, -const unsigned long len, -const unsigned long pgoff, -const unsigned long flags) -{ -if (radix_enabled ()) -return generic_get_unmapped_area_topdown (filp, addr0, len, pgoff, flags); - -#ifdef CONFIG_PPC_64S_HASH_MMU -return slice_get_unmapped_area (addr0, len, flags, -mm_ctx_user_psize (¤t->mm->context),1 ); -#else -BUG (); -#endif -} -#endif /* HAVE_ARCH_UNMAPPED_AREA */ -/* * This function, called very early during the creation of a new * process VM image, sets up which VM layout function to use:
Signature · 1 line
2.33.1
PATCH v6 12/14 powerpc/mm: Enable full randomisation of memory mappings
In reply to Christophe LeroyDo like most other architectures and provide randomisation also to "legacy" memory mappings, by adding the random factor to mm->mmap_base in arch_pick_mmap_layout().
See commit 8b8addf891de ("x86/mm/32: Enable full randomization on i386 and X86_32") for all explanations and benefits of that mmap randomisation.
At the moment, slice_find_area_bottomup() doesn't use mm->mmap_base but uses the fixed TASK_UNMAPPED_BASE instead. slice_find_area_bottomup() being used as a fallback to slice_find_area_topdown(), it can't use mm->mmap_base directly.
Instead of always using TASK_UNMAPPED_BASE as base address, leave it to the caller. When called from slice_find_area_topdown() TASK_UNMAPPED_BASE is used. Otherwise mm->mmap_base is used.
--- arch/powerpc/mm/book3s64/slice.c | 18 +++++++----------- arch/powerpc/mm/mmap.c | 2 +- 2 files changed, 8 insertions(+), 12 deletions(-)
arch/powerpc/mm/book3s64/slice.c +7 -11
@@ -276,20 +276,18 @@ static bool slice_scan_available(unsigned long addr, }static unsigned long slice_find_area_bottomup (struct mm_struct *mm, -unsigned long len, +unsigned long addr,unsigned long len,const struct slice_mask *available,int psize,unsigned long high_limit) {int pshift =max_t (int, mmu_psize_defs[psize].shift,PAGE_SHIFT ); -unsigned long addr, found, next_end; +unsigned long found, next_end;struct vm_unmapped_area_info info; info.flags =0 ; info.length = len; info.align_mask =PAGE_MASK & ((1ul << pshift) -1 ); info.align_offset =0 ; - - addr =TASK_UNMAPPED_BASE ;/* * Check till the allow max value for this mmap request */
@@ -322,12 +320,12 @@ static unsigned long slice_find_area_bottomup(struct mm_struct *mm, }static unsigned long slice_find_area_topdown (struct mm_struct *mm, -unsigned long len, +unsigned long addr,unsigned long len,const struct slice_mask *available,int psize,unsigned long high_limit) {int pshift =max_t (int, mmu_psize_defs[psize].shift,PAGE_SHIFT ); -unsigned long addr, found, prev; +unsigned long found, prev;struct vm_unmapped_area_info info;unsigned long min_addr =max (PAGE_SIZE , mmap_min_addr);
@@ -335,8 +333,6 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm, info.length = len; info.align_mask =PAGE_MASK & ((1ul << pshift) -1 ); info.align_offset =0 ; - - addr = mm->mmap_base;/* * If we are trying to allocate above DEFAULT_MAP_WINDOW * Add the different to the mmap_base.
@@ -377,7 +373,7 @@ static unsigned long slice_find_area_topdown(struct mm_struct *mm,* can happen with large stack limits and large mmap() * allocations. */ -return slice_find_area_bottomup (mm, len, available, psize, high_limit); +return slice_find_area_bottomup (mm,TASK_UNMAPPED_BASE , len, available, psize, high_limit); }
@@ -386,9 +382,9 @@ static unsigned long slice_find_area(struct mm_struct *mm, unsigned long len, int topdown, unsigned long high_limit) { if (topdown) - return slice_find_area_topdown(mm, len, mask, psize, high_limit); + return slice_find_area_topdown(mm, mm->mmap_base, len, mask, psize, high_limit); else - return slice_find_area_bottomup(mm, len, mask, psize, high_limit); + return slice_find_area_bottomup(mm, mm->mmap_base, len, mask, psize, high_limit); } static inline void slice_copy_mask(struct slice_mask *dst,
arch/powerpc/mm/mmap.c +1 -1
@@ -96,7 +96,7 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack)* bit is set, or if the expected stack growth is unlimited: */ if (mmap_is_legacy (rlim_stack)) { - mm->mmap_base =TASK_UNMAPPED_BASE ; + mm->mmap_base =TASK_UNMAPPED_BASE + random_factor; mm->get_unmapped_area = arch_get_unmapped_area; }else { mm->mmap_base =mmap_base (random_factor, rlim_stack);
Signature · 1 line
2.33.1
PATCH v6 13/14 powerpc/mm: Convert to default topdown mmap layout
In reply to Christophe LeroySelect CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT and remove arch/powerpc/mm/mmap.c
This change reuses the generic framework added by commit 67f3977f805b ("arm64, mm: move generic mmap layout functions to mm") without any functional change.
Comparison between powerpc implementation and the generic one:
- mmap_is_legacy() is identical.
- arch_mmap_rnd() does exactly the same allthough it's written slightly differently.
- MIN_GAP and MAX_GAP are identical.
- mmap_base() does the same but uses STACK_RND_MASK which provides the same values as stack_maxrandom_size().
- arch_pick_mmap_layout() is identical.
--- arch/powerpc/Kconfig | 2 +- arch/powerpc/include/asm/processor.h | 2 - arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/mmap.c | 105 --------------------------- 4 files changed, 2 insertions(+), 109 deletions(-) delete mode 100644 arch/powerpc/mm/mmap.c
arch/powerpc/Kconfig +1 -1
@@ -122,7 +122,6 @@ config PPC select ARCH_HAS_DEBUG_WX if STRICT_KERNEL_RWX select ARCH_HAS_DEVMEM_IS_ALLOWED select ARCH_HAS_DMA_MAP_DIRECT if PPC_PSERIES - select ARCH_HAS_ELF_RANDOMIZE select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_HUGEPD if HUGETLB_PAGE
@@ -158,6 +157,7 @@ config PPC select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS if PPC_QUEUED_SPINLOCKS select ARCH_USE_QUEUED_SPINLOCKS if PPC_QUEUED_SPINLOCKS + select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT select ARCH_WANT_IPC_PARSE_VERSION select ARCH_WANT_IRQS_OFF_ACTIVATE_MM select ARCH_WANT_LD_ORPHAN_WARN
arch/powerpc/include/asm/processor.h +0 -2
@@ -392,8 +392,6 @@ static inline void prefetchw(const void *x)#define spin_lock_prefetch (x) prefetchw(x) -#define HAVE_ARCH_PICK_MMAP_LAYOUT -/* asm stubs */ extern unsigned long isa300_idle_stop_noloss (unsigned long psscr_val);extern unsigned long isa300_idle_stop_mayloss (unsigned long psscr_val);
arch/powerpc/mm/Makefile +1 -1
@@ -5,7 +5,7 @@ ccflags-$(CONFIG_PPC64) := $(NO_MINIMAL_TOC) -obj-y := fault.o mem.o pgtable.o mmap.o maccess.o pageattr.o \ +obj-y := fault.o mem.o pgtable.o maccess.o pageattr.o \ init_$(BITS).o pgtable_$(BITS).o \ pgtable-frag.o ioremap.o ioremap_$(BITS).o \ init-common.o mmu_context.o drmem.o \
arch/powerpc/mm/mmap.c deleted +0 -105
105 lines not on this page · raw message
Signature · 1 line
2.33.1
PATCH v6 14/14 powerpc: Simplify and move arch_randomize_brk()
In reply to Christophe Leroyarch_randomize_brk() is only needed for hash on book3s/64, for other platforms the one provided by the default mmap layout is good enough.
Move it to hash_utils.c and use randomize_page() like the generic one.
And properly opt out the radix case instead of making an assumption on mmu_highuser_ssize.
Also change to a 32M range like most other architectures instead of 8M.
--- arch/powerpc/kernel/process.c | 41 --------------------------- arch/powerpc/mm/book3s64/hash_utils.c | 19 +++++++++++++ 2 files changed, 19 insertions(+), 41 deletions(-)
arch/powerpc/kernel/process.c +0 -41
@@ -34,10 +34,8 @@#include <linux/ftrace.h> #include <linux/kernel_stat.h> #include <linux/personality.h> -#include <linux/random.h> #include <linux/hw_breakpoint.h> #include <linux/uaccess.h> -#include <linux/elf-randomize.h> #include <linux/pkeys.h> #include <linux/seq_buf.h>
@@ -2313,42 +2311,3 @@ unsigned long arch_align_stack(unsigned long sp) sp -=get_random_int () & ~PAGE_MASK ;return sp & ~0xf ; } - -static inline unsigned long brk_rnd (void ) -{ -unsigned long rnd =0 ; - -/* 8MB for 32bit, 1GB for 64bit */ -if (is_32bit_task ()) - rnd = (get_random_long () % (1UL <<(23 -PAGE_SHIFT ))); -else - rnd = (get_random_long () % (1UL <<(30 -PAGE_SHIFT ))); - -return rnd <<PAGE_SHIFT ; -} - -unsigned long arch_randomize_brk (struct mm_struct *mm) -{ -unsigned long base = mm->brk; -unsigned long ret; - -#ifdef CONFIG_PPC_BOOK3S_64 -/* -* If we are using 1TB segments and we are allowed to randomise -* the heap, we can put it above 1TB so it is backed by a 1TB -* segment. Otherwise the heap will be in the bottom 1TB -* which always uses 256MB segments and this may result in a -* performance penalty. -*/ -if (!radix_enabled () && !is_32bit_task () && (mmu_highuser_ssize ==MMU_SEGSIZE_1T )) - base = max_t(unsigned long, mm->brk, 1UL << SID_SHIFT_1T); -#endif - - ret =PAGE_ALIGN (base +brk_rnd ()); - -if (ret < mm->brk) -return mm->brk; - -return ret; -} -
arch/powerpc/mm/book3s64/hash_utils.c +19 -0
@@ -37,6 +37,8 @@#include <linux/cpu.h> #include <linux/pgtable.h> #include <linux/debugfs.h> +#include <linux/random.h> +#include <linux/elf-randomize.h> #include <asm/interrupt.h> #include <asm/processor.h>
@@ -2171,3 +2173,20 @@ void __init print_system_hash_info(void)if (htab_hash_mask)pr_info ("htab_hash_mask = 0x%lx\n" , htab_hash_mask); } + +unsigned long arch_randomize_brk (struct mm_struct *mm) +{ +/* +* If we are using 1TB segments and we are allowed to randomise +* the heap, we can put it above 1TB so it is backed by a 1TB +* segment. Otherwise the heap will be in the bottom 1TB +* which always uses 256MB segments and this may result in a +* performance penalty. +*/ +if (is_32bit_task ()) +return randomize_page (mm->brk,SZ_32M ); +else if (!radix_enabled () && mmu_highuser_ssize ==MMU_SEGSIZE_1T ) + return randomize_page(max_t(unsigned long, mm->brk, SZ_1T), SZ_1G); +else +return randomize_page (mm->brk,SZ_1G ); +}
Signature · 1 line
2.33.1
Re: [PATCH v6 03/14] mm: Add len and flags parameters to arch_get_mmap_end()
In reply to Christophe LeroyQuoted 18 lines · Christophe Leroy
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 <[email protected]>Cc Steve Capper <[email protected]>Cc Catalin Marinas <[email protected]>Cc Will Deacon <[email protected]>--- arch/arm64/include/asm/processor.h | 4 ++-- mm/mmap.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)arch/arm64/include/asm/processor.h +0
-0
arch/arm64/include/asm/processor.h line 95
Quoted 7 lines
arch/arm64/include/asm/processor.h +2
-2@@ -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)
Nitpick, move the "((addr > ...." on the following line. Either way,
Re: [PATCH v6 04/14] mm, hugetlbfs: Allow for "high" userspace addresses
In reply to Christophe LeroyQuoted 25 lines · Christophe Leroy
This is a complement of
f6795053dac8("mm: mmap: Allow for "high" userspace addresses") for hugetlb.This patch adds support for "high" userspace addresses that are optionally supported on the system and have to be requested via a hint mechanism ("high" addr parameter to mmap).
Architectures such as powerpc and x86 achieve this by making changes to their architectural versions of
hugetlb_get_unmapped_area()function. However, arm64 uses the generic version of that function.So take into account
arch_get_mmap_base()andarch_get_mmap_end()inhugetlb_get_unmapped_area(). To allow that, move those two macros out ofmm/mmap.cintoinclude/linux/sched/mm.hIf these macros are not defined in architectural code then they default to (
TASK_SIZE) and (base) so should not introduce any behavioural changes to architectures that do not define them.For the time being, only ARM64 is affected by this change.
Signed-off-by Christophe Leroy <[email protected]>Cc Steve Capper <[email protected]>Cc Will Deacon <[email protected]>Cc Catalin Marinas <[email protected]>
Quoted 5 lines
--- fs/hugetlbfs/inode.c | 9 +++++---- include/linux/sched/mm.h | 8 ++++++++ mm/mmap.c | 8 -------- 3 files changed, 13 insertions(+), 12 deletions(-)
This would be an ABI change but I'm fine with it. Basically with this patch, getting hugetblfs addresses above 48-bit require explicit hint passed to mmap().
I wonder whether we should add a fixes tag (or at least the cc stable):
I think the original commit should have changed hugetlb_get_unmapped_area() to have the same behaviour as arch_get_unmapped_area(). Steve, any thoughts?
FWIW,