arm64,ia64,ppc,s390,sh,tile,um,x86,mm: remove default gate area

The core mm code will provide a default gate area based on
FIXADDR_USER_START and FIXADDR_USER_END if
!defined(__HAVE_ARCH_GATE_AREA) && defined(AT_SYSINFO_EHDR).

This default is only useful for ia64.  arm64, ppc, s390, sh, tile, 64-bit
UML, and x86_32 have their own code just to disable it.  arm, 32-bit UML,
and x86_64 have gate areas, but they have their own implementations.

This gets rid of the default and moves the code into ia64.

This should save some code on architectures without a gate area: it's now
possible to inline the gate_area functions in the default case.

Signed-off-by: Andy Lutomirski <luto@amacapital.net>
Acked-by: Nathan Lynch <nathan_lynch@mentor.com>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> [in principle]
Acked-by: Richard Weinberger <richard@nod.at> [for um]
Acked-by: Will Deacon <will.deacon@arm.com> [for arm64]
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Nathan Lynch <Nathan_Lynch@mentor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h
index 7a3f462133b0b83c57dd5de0fde19931b73ad877..22b16232bd609b7a916c4214df0e53819abe82fb 100644 (file)
--- a/arch/arm64/include/asm/page.h
+++ b/arch/arm64/include/asm/page.h
@@ -28,9 +28,6 @@
 #define PAGE_SIZE              (_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK              (~(PAGE_SIZE-1))
 
 #define PAGE_SIZE              (_AC(1,UL) << PAGE_SHIFT)
 #define PAGE_MASK              (~(PAGE_SIZE-1))
 

-/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
-#define __HAVE_ARCH_GATE_AREA          1
-

 /*
  * The idmap and swapper page tables need some space reserved in the kernel
  * image. Both require pgd, pud (4 levels only) and pmd tables to (section)
 /*
  * The idmap and swapper page tables need some space reserved in the kernel
  * image. Both require pgd, pud (4 levels only) and pmd tables to (section)

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index a81a446a578628ea63e96405f7cbfb6eb6434151..32aeea083d93b2391122ad9d1c49c3925121e38b 100644 (file)
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -194,25 +194,6 @@ up_fail:
        return PTR_ERR(ret);
 }
 
        return PTR_ERR(ret);
 }
 

-/*
- * We define AT_SYSINFO_EHDR, so we need these function stubs to keep
- * Linux happy.
- */
-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-       return 0;
-}
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}
-

 /*
  * Update the vDSO data page to keep in sync with kernel timekeeping.
  */
 /*
  * Update the vDSO data page to keep in sync with kernel timekeeping.
  */

diff --git a/arch/ia64/include/asm/page.h b/arch/ia64/include/asm/page.h
index f1e1b2e3cdb3890cd8b35b0224eacbbafa94fe01..1f1bf144fe62b165cd7854c19c30717a9026d97d 100644 (file)
--- a/arch/ia64/include/asm/page.h
+++ b/arch/ia64/include/asm/page.h
@@ -231,4 +231,6 @@ get_order (unsigned long size)
 #define PERCPU_ADDR            (-PERCPU_PAGE_SIZE)
 #define LOAD_OFFSET            (KERNEL_START - KERNEL_TR_PAGE_SIZE)
 
 #define PERCPU_ADDR            (-PERCPU_PAGE_SIZE)
 #define LOAD_OFFSET            (KERNEL_START - KERNEL_TR_PAGE_SIZE)
 

+#define __HAVE_ARCH_GATE_AREA  1
+

 #endif /* _ASM_IA64_PAGE_H */
 #endif /* _ASM_IA64_PAGE_H */

diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
index 892d43e32f3b5995936a24d91b4229cb38e78afb..6b3345758d3e3298ed8ee23b592d21adda88034d 100644 (file)
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -278,6 +278,37 @@ setup_gate (void)
        ia64_patch_gate();
 }
 
        ia64_patch_gate();
 }
 

+static struct vm_area_struct gate_vma;
+
+static int __init gate_vma_init(void)
+{
+       gate_vma.vm_mm = NULL;
+       gate_vma.vm_start = FIXADDR_USER_START;
+       gate_vma.vm_end = FIXADDR_USER_END;
+       gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
+       gate_vma.vm_page_prot = __P101;
+
+       return 0;
+}
+__initcall(gate_vma_init);
+
+struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+{
+       return &gate_vma;
+}
+
+int in_gate_area_no_mm(unsigned long addr)
+{
+       if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END))
+               return 1;
+       return 0;
+}
+
+int in_gate_area(struct mm_struct *mm, unsigned long addr)
+{
+       return in_gate_area_no_mm(addr);
+}
+

 void ia64_mmu_init(void *my_cpu_data)
 {
        unsigned long pta, impl_va_bits;
 void ia64_mmu_init(void *my_cpu_data)
 {
        unsigned long pta, impl_va_bits;

diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index 32e4e212b9c1a3c14e941d211dd5f5d2e2cf6aba..26fe1ae1521255b514d267acc0010833b5e93e8a 100644 (file)
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -48,9 +48,6 @@ extern unsigned int HPAGE_SHIFT;
 #define HUGE_MAX_HSTATE                (MMU_PAGE_COUNT-1)
 #endif
 
 #define HUGE_MAX_HSTATE                (MMU_PAGE_COUNT-1)
 #endif
 

-/* We do define AT_SYSINFO_EHDR but don't use the gate mechanism */
-#define __HAVE_ARCH_GATE_AREA          1
-

 /*
  * Subtle: (1 << PAGE_SHIFT) is an int, not an unsigned long. So if we
  * assign PAGE_MASK to a larger type it gets extended the way we want
 /*
  * Subtle: (1 << PAGE_SHIFT) is an int, not an unsigned long. So if we
  * assign PAGE_MASK to a larger type it gets extended the way we want

diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ce74c335a6a405b03e8400a72b74e1fc7227b56f..f174351842cf449cfcdcc9117ec183e951542af7 100644 (file)
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -840,19 +840,3 @@ static int __init vdso_init(void)
        return 0;
 }
 arch_initcall(vdso_init);
        return 0;
 }
 arch_initcall(vdso_init);

-
-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-       return 0;
-}
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}
-

diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 114258eeaacdbbd796a07605e74c53d9610ba3be..7b2ac6e44166ac258ebd6481cb1691e77be53b71 100644 (file)
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -162,6 +162,4 @@ static inline int devmem_is_allowed(unsigned long pfn)
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 

-#define __HAVE_ARCH_GATE_AREA 1
-

 #endif /* _S390_PAGE_H */
 #endif /* _S390_PAGE_H */

diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 613649096783401e0cf9acf73069dff48a35e438..0bbb7e027c5aae5778483db3fcdbe334f9a4243b 100644 (file)
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -316,18 +316,3 @@ static int __init vdso_init(void)
        return 0;
 }
 early_initcall(vdso_init);
        return 0;
 }
 early_initcall(vdso_init);

-
-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-       return 0;
-}
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}

diff --git a/arch/sh/include/asm/page.h b/arch/sh/include/asm/page.h
index 15d970328f717c929d25287a09b14af181e23d9c..fe20d14ae051a5892350185d55ce1adfc352e538 100644 (file)
--- a/arch/sh/include/asm/page.h
+++ b/arch/sh/include/asm/page.h
@@ -186,11 +186,6 @@ typedef struct page *pgtable_t;
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 

-/* vDSO support */
-#ifdef CONFIG_VSYSCALL
-#define __HAVE_ARCH_GATE_AREA
-#endif
-

 /*
  * Some drivers need to perform DMA into kmalloc'ed buffers
  * and so we have to increase the kmalloc minalign for this.
 /*
  * Some drivers need to perform DMA into kmalloc'ed buffers
  * and so we have to increase the kmalloc minalign for this.

diff --git a/arch/sh/kernel/vsyscall/vsyscall.c b/arch/sh/kernel/vsyscall/vsyscall.c
index 5ca579720a0992322099732c16faa79a1d1b9b75..ea2aa1393b8749b72b2ed2c3efd802f213bff342 100644 (file)
--- a/arch/sh/kernel/vsyscall/vsyscall.c
+++ b/arch/sh/kernel/vsyscall/vsyscall.c
@@ -92,18 +92,3 @@ const char *arch_vma_name(struct vm_area_struct *vma)
 
        return NULL;
 }
 
        return NULL;
 }

-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long address)
-{
-       return 0;
-}
-
-int in_gate_area_no_mm(unsigned long address)
-{
-       return 0;
-}

diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h
index 67276800861833f674422a10cf47440f7864af3b..a213a8d84a95ac48a149de807558290c21dbe2cb 100644 (file)
--- a/arch/tile/include/asm/page.h
+++ b/arch/tile/include/asm/page.h
@@ -38,12 +38,6 @@
 #define PAGE_MASK      (~(PAGE_SIZE - 1))
 #define HPAGE_MASK     (~(HPAGE_SIZE - 1))
 
 #define PAGE_MASK      (~(PAGE_SIZE - 1))
 #define HPAGE_MASK     (~(HPAGE_SIZE - 1))
 

-/*
- * We do define AT_SYSINFO_EHDR to support vDSO,
- * but don't use the gate mechanism.
- */
-#define __HAVE_ARCH_GATE_AREA          1
-

 /*
  * If the Kconfig doesn't specify, set a maximum zone order that
  * is enough so that we can create huge pages from small pages given
 /*
  * If the Kconfig doesn't specify, set a maximum zone order that
  * is enough so that we can create huge pages from small pages given

diff --git a/arch/tile/kernel/vdso.c b/arch/tile/kernel/vdso.c
index 1533af24106ea4653faa97588e73935999f74495..5bc51d7dfdcb0e493c156ebcf7c3ebc4d0525404 100644 (file)
--- a/arch/tile/kernel/vdso.c
+++ b/arch/tile/kernel/vdso.c
@@ -121,21 +121,6 @@ const char *arch_vma_name(struct vm_area_struct *vma)
        return NULL;
 }
 
        return NULL;
 }
 

-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long address)
-{
-       return 0;
-}
-
-int in_gate_area_no_mm(unsigned long address)
-{
-       return 0;
-}
-

 int setup_vdso_pages(void)
 {
        struct page **pagelist;
 int setup_vdso_pages(void)
 {
        struct page **pagelist;

diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
index 5ff53d9185f7f81260f4b41f46226ed1683a836a..71c5d132062aa32074b3bda4a30db2ca08b86c5b 100644 (file)
--- a/arch/um/include/asm/page.h
+++ b/arch/um/include/asm/page.h
@@ -119,4 +119,9 @@ extern unsigned long uml_physmem;
 #include <asm-generic/getorder.h>
 
 #endif /* __ASSEMBLY__ */
 #include <asm-generic/getorder.h>
 
 #endif /* __ASSEMBLY__ */

+
+#ifdef CONFIG_X86_32
+#define __HAVE_ARCH_GATE_AREA 1
+#endif
+

 #endif /* __UM_PAGE_H */
 #endif /* __UM_PAGE_H */

diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
index 775873d3be55617a49e15c3460ae22a94dabad75..802dde30c92877588be2d068a692cf9ed4418b7d 100644 (file)
--- a/arch/x86/include/asm/page.h
+++ b/arch/x86/include/asm/page.h
@@ -70,7 +70,6 @@ extern bool __virt_addr_valid(unsigned long kaddr);
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 
 #include <asm-generic/memory_model.h>
 #include <asm-generic/getorder.h>
 

-#define __HAVE_ARCH_GATE_AREA 1

 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 
 #endif /* __KERNEL__ */
 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 
 #endif /* __KERNEL__ */

diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
index 0f1ddee6a0ceb66f2d97fd42c4e53acd05300c3d..f408caf73430fb5875db71ada002d88b99cb4d1d 100644 (file)
--- a/arch/x86/include/asm/page_64.h
+++ b/arch/x86/include/asm/page_64.h
@@ -39,4 +39,6 @@ void copy_page(void *to, void *from);
 
 #endif /* !__ASSEMBLY__ */
 
 
 #endif /* !__ASSEMBLY__ */
 

+#define __HAVE_ARCH_GATE_AREA 1
+

 #endif /* _ASM_X86_PAGE_64_H */
 #endif /* _ASM_X86_PAGE_64_H */

diff --git a/arch/x86/um/asm/elf.h b/arch/x86/um/asm/elf.h
index 0feee2fd5077bbd90c9c6e914d1b386f12482120..25a1022dd793c52898cdeaee27aceb601d10f39d 100644 (file)
--- a/arch/x86/um/asm/elf.h
+++ b/arch/x86/um/asm/elf.h
@@ -216,6 +216,5 @@ extern long elf_aux_hwcap;
 #define ELF_HWCAP (elf_aux_hwcap)
 
 #define SET_PERSONALITY(ex) do ; while(0)
 #define ELF_HWCAP (elf_aux_hwcap)
 
 #define SET_PERSONALITY(ex) do ; while(0)

-#define __HAVE_ARCH_GATE_AREA 1

 
 #endif
 
 #endif

diff --git a/arch/x86/um/mem_64.c b/arch/x86/um/mem_64.c
index c6492e75797b7bbceca4437810a59f6eb892a405..f8fecaddcc0df94a3b723f01018e09063ed7c632 100644 (file)
--- a/arch/x86/um/mem_64.c
+++ b/arch/x86/um/mem_64.c
@@ -9,18 +9,3 @@ const char *arch_vma_name(struct vm_area_struct *vma)
 
        return NULL;
 }
 
        return NULL;
 }

-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-       return 0;
-}
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}

diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
index e4f7781ee16280a1606349262dcb14b055f5599b..e904c270573bf58054d5fd83f2b9c77b0ee81347 100644 (file)
--- a/arch/x86/vdso/vdso32-setup.c
+++ b/arch/x86/vdso/vdso32-setup.c
@@ -115,23 +115,6 @@ static __init int ia32_binfmt_init(void)
        return 0;
 }
 __initcall(ia32_binfmt_init);
        return 0;
 }
 __initcall(ia32_binfmt_init);

-#endif
-
-#else  /* CONFIG_X86_32 */
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-       return NULL;
-}
-
-int in_gate_area(struct mm_struct *mm, unsigned long addr)
-{
-       return 0;
-}
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}
+#endif /* CONFIG_SYSCTL */

 
 #endif /* CONFIG_X86_64 */
 
 #endif /* CONFIG_X86_64 */

diff --git a/include/linux/mm.h b/include/linux/mm.h
index e03dd29145a019a184fbf47fbdd252251b05acaa..8981cc882ed2eb0d2dfdebfbc5355e8c1cc2eb16 100644 (file)
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2014,13 +2014,20 @@ static inline bool kernel_page_present(struct page *page) { return true; }
 #endif /* CONFIG_HIBERNATION */
 #endif
 
 #endif /* CONFIG_HIBERNATION */
 #endif
 

+#ifdef __HAVE_ARCH_GATE_AREA

 extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm);
 extern struct vm_area_struct *get_gate_vma(struct mm_struct *mm);

-#ifdef __HAVE_ARCH_GATE_AREA
-int in_gate_area_no_mm(unsigned long addr);
-int in_gate_area(struct mm_struct *mm, unsigned long addr);
+extern int in_gate_area_no_mm(unsigned long addr);
+extern int in_gate_area(struct mm_struct *mm, unsigned long addr);

 #else
 #else

-int in_gate_area_no_mm(unsigned long addr);
-#define in_gate_area(mm, addr) ({(void)mm; in_gate_area_no_mm(addr);})
+static inline struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+{
+       return NULL;
+}
+static inline int in_gate_area_no_mm(unsigned long addr) { return 0; }
+static inline int in_gate_area(struct mm_struct *mm, unsigned long addr)
+{
+       return 0;
+}

 #endif /* __HAVE_ARCH_GATE_AREA */
 
 #ifdef CONFIG_SYSCTL
 #endif /* __HAVE_ARCH_GATE_AREA */
 
 #ifdef CONFIG_SYSCTL

diff --git a/mm/memory.c b/mm/memory.c
index 2a899e4e82badbb21b7763b2986fe9e5a08ef777..ab3537bcfed2334fd1636cfc8e74ff634e54c943 100644 (file)
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -3430,44 +3430,6 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
 }
 #endif /* __PAGETABLE_PMD_FOLDED */
 
 }
 #endif /* __PAGETABLE_PMD_FOLDED */
 

-#if !defined(__HAVE_ARCH_GATE_AREA)
-
-#if defined(AT_SYSINFO_EHDR)
-static struct vm_area_struct gate_vma;
-
-static int __init gate_vma_init(void)
-{
-       gate_vma.vm_mm = NULL;
-       gate_vma.vm_start = FIXADDR_USER_START;
-       gate_vma.vm_end = FIXADDR_USER_END;
-       gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
-       gate_vma.vm_page_prot = __P101;
-
-       return 0;
-}
-__initcall(gate_vma_init);
-#endif
-
-struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
-{
-#ifdef AT_SYSINFO_EHDR
-       return &gate_vma;
-#else
-       return NULL;
-#endif
-}
-
-int in_gate_area_no_mm(unsigned long addr)
-{
-#ifdef AT_SYSINFO_EHDR
-       if ((addr >= FIXADDR_USER_START) && (addr < FIXADDR_USER_END))
-               return 1;
-#endif
-       return 0;
-}
-
-#endif /* __HAVE_ARCH_GATE_AREA */
-

 static int __follow_pte(struct mm_struct *mm, unsigned long address,
                pte_t **ptepp, spinlock_t **ptlp)
 {
 static int __follow_pte(struct mm_struct *mm, unsigned long address,
                pte_t **ptepp, spinlock_t **ptlp)
 {

diff --git a/mm/nommu.c b/mm/nommu.c
index 4a852f6c5709dbda2a29561714b704972ec292f6..a881d9673c6b165e5336e83bf2ab75bf3c03d938 100644 (file)
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -1981,11 +1981,6 @@ error:
        return -ENOMEM;
 }
 
        return -ENOMEM;
 }
 

-int in_gate_area_no_mm(unsigned long addr)
-{
-       return 0;
-}
-

 int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        BUG();
 int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
        BUG();