Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

mm: remove arch_unmap()

Browse Source 
Now that powerpc no longer uses arch_unmap() to handle VDSO unmapping,
there are no meaningful implementions left.  Drop support for it entirely,
and update comments which refer to it.

Link: https://lkml.kernel.org/r/20240812082605.743814-3-mpe@ellerman.id.au
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Liam R. Howlett <Liam.Howlett@oracle.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Jeff Xu <jeffxu@google.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Pedro Falcato <pedro.falcato@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Michael Ellerman 2024-08-12 18:26:04 +10:00 committed by Andrew Morton
parent 5463bafab4
commit 40b88644dd
5 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/mmu_context.h
View File

@ -260,11 +260,6 @@ static inline void enter_lazy_tlb(struct mm_struct *mm,
extern void arch_exit_mmap(struct mm_struct *mm); extern void arch_exit_mmap(struct mm_struct *mm);
static inline void arch_unmap(struct mm_struct *mm,
unsigned long start, unsigned long end)
{
}
#ifdef CONFIG_PPC_MEM_KEYS #ifdef CONFIG_PPC_MEM_KEYS
bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write, bool arch_vma_access_permitted(struct vm_area_struct *vma, bool write,
bool execute, bool foreign); bool execute, bool foreign);

5
arch/x86/include/asm/mmu_context.h
View File

@ -232,11 +232,6 @@ static inline bool is_64bit_mm(struct mm_struct *mm)
} }
#endif #endif
static inline void arch_unmap(struct mm_struct *mm, unsigned long start,
unsigned long end)
{
}
/* /*
* We only want to enforce protection keys on the current process * We only want to enforce protection keys on the current process
* because we effectively have no access to PKRU for other * because we effectively have no access to PKRU for other

11
include/asm-generic/mm_hooks.h
View File

@ -1,8 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */ /* SPDX-License-Identifier: GPL-2.0 */
/* /*
* Define generic no-op hooks for arch_dup_mmap, arch_exit_mmap * Define generic no-op hooks for arch_dup_mmap and arch_exit_mmap
* and arch_unmap to be included in asm-FOO/mmu_context.h for any * to be included in asm-FOO/mmu_context.h for any arch FOO which
* arch FOO which doesn't need to hook these. * doesn't need to hook these.
*/ */
#ifndef _ASM_GENERIC_MM_HOOKS_H #ifndef _ASM_GENERIC_MM_HOOKS_H
#define _ASM_GENERIC_MM_HOOKS_H #define _ASM_GENERIC_MM_HOOKS_H
@ -17,11 +17,6 @@ static inline void arch_exit_mmap(struct mm_struct *mm)
{ {
} }
static inline void arch_unmap(struct mm_struct *mm,
unsigned long start, unsigned long end)
{
}
static inline bool arch_vma_access_permitted(struct vm_area_struct *vma, static inline bool arch_vma_access_permitted(struct vm_area_struct *vma,
bool write, bool execute, bool foreign) bool write, bool execute, bool foreign)
{ {

4
mm/mmap.c
View File

@ -1743,14 +1743,12 @@ int do_vma_munmap(struct vma_iterator *vmi, struct vm_area_struct *vma,
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
/* /*
* Check if memory is sealed before arch_unmap. * Check if memory is sealed, prevent unmapping a sealed VMA.
* Prevent unmapping a sealed VMA.
* can_modify_mm assumes we have acquired the lock on MM. * can_modify_mm assumes we have acquired the lock on MM.
*/ */
if (unlikely(!can_modify_mm(mm, start, end))) if (unlikely(!can_modify_mm(mm, start, end)))
return -EPERM; return -EPERM;
arch_unmap(mm, start, end);
return do_vmi_align_munmap(vmi, vma, mm, start, end, uf, unlock); return do_vmi_align_munmap(vmi, vma, mm, start, end, uf, unlock);
} }

8
mm/vma.c
View File

@ -841,7 +841,7 @@ map_count_exceeded:
* *
* This function takes a @mas that is either pointing to the previous VMA or set * This function takes a @mas that is either pointing to the previous VMA or set
* to MA_START and sets it up to remove the mapping(s). The @len will be * to MA_START and sets it up to remove the mapping(s). The @len will be
* aligned and any arch_unmap work will be preformed. * aligned.
* *
* Return: 0 on success and drops the lock if so directed, error and leaves the * Return: 0 on success and drops the lock if so directed, error and leaves the
* lock held otherwise. * lock held otherwise.
@ -861,16 +861,12 @@ int do_vmi_munmap(struct vma_iterator *vmi, struct mm_struct *mm,
return -EINVAL; return -EINVAL;
/* /*
* Check if memory is sealed before arch_unmap. * Check if memory is sealed, prevent unmapping a sealed VMA.
* Prevent unmapping a sealed VMA.
* can_modify_mm assumes we have acquired the lock on MM. * can_modify_mm assumes we have acquired the lock on MM.
*/ */
if (unlikely(!can_modify_mm(mm, start, end))) if (unlikely(!can_modify_mm(mm, start, end)))
return -EPERM; return -EPERM;
/* arch_unmap() might do unmaps itself. */
arch_unmap(mm, start, end);
/* Find the first overlapping VMA */ /* Find the first overlapping VMA */
vma = vma_find(vmi, end); vma = vma_find(vmi, end);
if (!vma) { if (!vma) {