forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mm: Make arch_unmap()/bprm_mm_init() available to all architectures

Browse source 
The x86 MPX patch set calls arch_unmap() and arch_bprm_mm_init()
from fs/exec.c, so we need at least a stub for them in all
architectures.  They are only called under an #ifdef for
CONFIG_MMU=y, so we can at least restict this to architectures
with MMU support.

blackfin/c6x have no MMU support, so do not call arch_unmap().
They also do not include mm_hooks.h or mmu_context.h at all and
do not need to be touched.

s390, um and unicore32 do not use asm-generic/mm_hooks.h, so got
their own arch_unmap() versions.  (I also moved um's
arch_dup_mmap() to be closer to the other mm_hooks.h functions).

xtensa only includes mm_hooks when MMU=y, which should be fine
since arch_unmap() is called only from MMU=y code.

For the rest, we use the stub copies of these functions in
asm-generic/mm_hook.h.

I cross compiled defconfigs for cris (to check NOMMU) and s390
to make sure that this works.  I also checked a 64-bit build
of UML and all my normal x86 builds including PARAVIRT on and
off.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Dave Hansen <dave@sr71.net>
Cc: linux-arch@vger.kernel.org
Cc: x86@kernel.org
Link: http://lkml.kernel.org/r/20141118182350.8B4AA2C2@viggo.jf.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Dave Hansen 2014-11-18 10:23:50 -08:00 • committed by Thomas Gleixner
commit 62e88b1c00
5 changed files with 55 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/s390/include/asm/mmu_context.h
View file

@ -120,4 +120,15 @@ static inline void arch_exit_mmap(struct mm_struct *mm)
{ {
} }
static inline void arch_unmap(struct mm_struct *mm,
struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
}
static inline void arch_bprm_mm_init(struct mm_struct *mm,
struct vm_area_struct *vma)
{
}
#endif /* __S390_MMU_CONTEXT_H */ #endif /* __S390_MMU_CONTEXT_H */

24
arch/um/include/asm/mmu_context.h
View file

@ -10,7 +10,26 @@
#include <asm/mmu.h> #include <asm/mmu.h>
extern void uml_setup_stubs(struct mm_struct *mm); extern void uml_setup_stubs(struct mm_struct *mm);
/*
* Needed since we do not use the asm-generic/mm_hooks.h:
*/
static inline void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
{
uml_setup_stubs(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,
struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
}
static inline void arch_bprm_mm_init(struct mm_struct *mm,
struct vm_area_struct *vma)
{
}
/*
* end asm-generic/mm_hooks.h functions
*/
#define deactivate_mm(tsk,mm) do { } while (0) #define deactivate_mm(tsk,mm) do { } while (0)
@ -41,11 +60,6 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
} }
} }
static inline void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm)
{
uml_setup_stubs(mm);
}
static inline void enter_lazy_tlb(struct mm_struct *mm, static inline void enter_lazy_tlb(struct mm_struct *mm,
struct task_struct *tsk) struct task_struct *tsk)
{ {

11
arch/unicore32/include/asm/mmu_context.h
View file

@ -86,4 +86,15 @@ static inline void arch_dup_mmap(struct mm_struct *oldmm,
{ {
} }
static inline void arch_unmap(struct mm_struct *mm,
struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
}
static inline void arch_bprm_mm_init(struct mm_struct *mm,
struct vm_area_struct *vma)
{
}
#endif #endif

17
include/asm-generic/mm_hooks.h
View file

@ -1,7 +1,7 @@
/* /*
* Define generic no-op hooks for arch_dup_mmap and arch_exit_mmap, to * Define generic no-op hooks for arch_dup_mmap, arch_exit_mmap
* be included in asm-FOO/mmu_context.h for any arch FOO which doesn't * and arch_unmap to be included in asm-FOO/mmu_context.h for any
* need to hook these. * arch FOO which 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
@ -15,4 +15,15 @@ static inline void arch_exit_mmap(struct mm_struct *mm)
{ {
} }
static inline void arch_unmap(struct mm_struct *mm,
struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
}
static inline void arch_bprm_mm_init(struct mm_struct *mm,
struct vm_area_struct *vma)
{
}
#endif /* _ASM_GENERIC_MM_HOOKS_H */ #endif /* _ASM_GENERIC_MM_HOOKS_H */

6
include/asm-generic/mmu_context.h
View file

@ -47,10 +47,4 @@ static inline void arch_bprm_mm_init(struct mm_struct *mm,
{ {
} }
static inline void arch_unmap(struct mm_struct *mm,
struct vm_area_struct *vma,
unsigned long start, unsigned long end)
{
}
#endif /* __ASM_GENERIC_MMU_CONTEXT_H */ #endif /* __ASM_GENERIC_MMU_CONTEXT_H */