Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 updates from Will Deacon:
 "Once again, Catalin's off on holiday and I'm looking after the arm64
  tree.  Please can you pull the following arm64 updates for 3.17?

  Note that this branch also includes the new GICv3 driver (merged via a
  stable tag from Jason's irqchip tree), since there is a fix for older
  binutils on top.

  Changes include:
   - context tracking support (NO_HZ_FULL) which narrowly missed 3.16
   - vDSO layout rework following Andy's work on x86
   - TEXT_OFFSET fuzzing for bootloader testing
   - /proc/cpuinfo tidy-up
   - preliminary work to support 48-bit virtual addresses, but this is
     currently disabled until KVM has been ported to use it (the patches
     do, however, bring some nice clean-up)
   - boot-time CPU sanity checks (especially useful on heterogenous
     systems)
   - support for syscall auditing
   - support for CC_STACKPROTECTOR
   - defconfig updates"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (55 commits)
  arm64: add newline to I-cache policy string
  Revert "arm64: dmi: Add SMBIOS/DMI support"
  arm64: fpsimd: fix a typo in fpsimd_save_partial_state ENDPROC
  arm64: don't call break hooks for BRK exceptions from EL0
  arm64: defconfig: enable devtmpfs mount option
  arm64: vdso: fix build error when switching from LE to BE
  arm64: defconfig: add virtio support for running as a kvm guest
  arm64: gicv3: Allow GICv3 compilation with older binutils
  arm64: fix soft lockup due to large tlb flush range
  arm64/crypto: fix makefile rule for aes-glue-%.o
  arm64: Do not invoke audit_syscall_* functions if !CONFIG_AUDIT_SYSCALL
  arm64: Fix barriers used for page table modifications
  arm64: Add support for 48-bit VA space with 64KB page configuration
  arm64: asm/pgtable.h pmd/pud definitions clean-up
  arm64: Determine the vmalloc/vmemmap space at build time based on VA_BITS
  arm64: Clean up the initial page table creation in head.S
  arm64: Remove asm/pgtable-*level-types.h files
  arm64: Remove asm/pgtable-*level-hwdef.h files
  arm64: Convert bool ARM64_x_LEVELS to int ARM64_PGTABLE_LEVELS
  arm64: mm: Implement 4 levels of translation tables
  ...

1 files changed, 51 insertions, 43 deletions

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index 50384fec56c4..24f2e8c62479 100644
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -88,22 +88,29 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp)
 {
         struct mm_struct *mm = current->mm;
         unsigned long addr = AARCH32_VECTORS_BASE;
-        int ret;
+        static struct vm_special_mapping spec = {
+                .name   = "[vectors]",
+                .pages  = vectors_page,
+
+        };
+        void *ret;
 
         down_write(&mm->mmap_sem);
         current->mm->context.vdso = (void *)addr;
 
         /* Map vectors page at the high address. */
-        ret = install_special_mapping(mm, addr, PAGE_SIZE,
-                                      VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC,
-                                      vectors_page);
+        ret = _install_special_mapping(mm, addr, PAGE_SIZE,
+                                       VM_READ|VM_EXEC|VM_MAYREAD|VM_MAYEXEC,
+                                       &spec);
 
         up_write(&mm->mmap_sem);
 
-        return ret;
+        return PTR_ERR_OR_ZERO(ret);
 }
 #endif /* CONFIG_COMPAT */
 
+static struct vm_special_mapping vdso_spec[2];
+
 static int __init vdso_init(void)
 {
         int i;
@@ -114,8 +121,8 @@ static int __init vdso_init(void)
         }
 
         vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
-        pr_info("vdso: %ld pages (%ld code, %ld data) at base %p\n",
-                vdso_pages + 1, vdso_pages, 1L, &vdso_start);
+        pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
+                vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
 
         /* Allocate the vDSO pagelist, plus a page for the data. */
         vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -123,12 +130,23 @@ static int __init vdso_init(void)
         if (vdso_pagelist == NULL)
                 return -ENOMEM;
 
+        /* Grab the vDSO data page. */
+        vdso_pagelist[0] = virt_to_page(vdso_data);
+
         /* Grab the vDSO code pages. */
         for (i = 0; i < vdso_pages; i++)
-                vdso_pagelist[i] = virt_to_page(&vdso_start + i * PAGE_SIZE);
+                vdso_pagelist[i + 1] = virt_to_page(&vdso_start + i * PAGE_SIZE);
 
-        /* Grab the vDSO data page. */
-        vdso_pagelist[i] = virt_to_page(vdso_data);
+        /* Populate the special mapping structures */
+        vdso_spec[0] = (struct vm_special_mapping) {
+                .name   = "[vvar]",
+                .pages  = vdso_pagelist,
+        };
+
+        vdso_spec[1] = (struct vm_special_mapping) {
+                .name   = "[vdso]",
+                .pages  = &vdso_pagelist[1],
+        };
 
         return 0;
 }
@@ -138,52 +156,42 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                                 int uses_interp)
 {
         struct mm_struct *mm = current->mm;
-        unsigned long vdso_base, vdso_mapping_len;
-        int ret;
+        unsigned long vdso_base, vdso_text_len, vdso_mapping_len;
+        void *ret;
 
+        vdso_text_len = vdso_pages << PAGE_SHIFT;
         /* Be sure to map the data page */
-        vdso_mapping_len = (vdso_pages + 1) << PAGE_SHIFT;
+        vdso_mapping_len = vdso_text_len + PAGE_SIZE;
 
         down_write(&mm->mmap_sem);
         vdso_base = get_unmapped_area(NULL, 0, vdso_mapping_len, 0, 0);
         if (IS_ERR_VALUE(vdso_base)) {
-                ret = vdso_base;
+                ret = ERR_PTR(vdso_base);
                 goto up_fail;
         }
-        mm->context.vdso = (void *)vdso_base;
-
-        ret = install_special_mapping(mm, vdso_base, vdso_mapping_len,
-                                      VM_READ|VM_EXEC|
-                                      VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
-                                      vdso_pagelist);
-        if (ret) {
-                mm->context.vdso = NULL;
+        ret = _install_special_mapping(mm, vdso_base, PAGE_SIZE,
+                                       VM_READ|VM_MAYREAD,
+                                       &vdso_spec[0]);
+        if (IS_ERR(ret))
                 goto up_fail;
-        }
 
-up_fail:
-        up_write(&mm->mmap_sem);
+        vdso_base += PAGE_SIZE;
+        mm->context.vdso = (void *)vdso_base;
+        ret = _install_special_mapping(mm, vdso_base, vdso_text_len,
+                                       VM_READ|VM_EXEC|
+                                       VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
+                                       &vdso_spec[1]);
+        if (IS_ERR(ret))
+                goto up_fail;
 
-        return ret;
-}
 
-const char *arch_vma_name(struct vm_area_struct *vma)
-{
-        /*
-         * We can re-use the vdso pointer in mm_context_t for identifying
-         * the vectors page for compat applications. The vDSO will always
-         * sit above TASK_UNMAPPED_BASE and so we don't need to worry about
-         * it conflicting with the vectors base.
-         */
-        if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) {
-#ifdef CONFIG_COMPAT
-                if (vma->vm_start == AARCH32_VECTORS_BASE)
-                        return "[vectors]";
-#endif
-                return "[vdso]";
-        }
+        up_write(&mm->mmap_sem);
+        return 0;
 
-        return NULL;
+up_fail:
+        mm->context.vdso = NULL;
+        up_write(&mm->mmap_sem);
+        return PTR_ERR(ret);
 }
 
 /*