Revert "arm64: vdso: move data page before code pages"

This reverts commit 82a95d0521cb6258559d18dca736da8272ba05a7.

Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c
index b8289f08795f0b55532c69a606dcb208c839a187..ad8dddbffef265ec0b7916a82c53d3d85f1cb779 100644 (file)
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
@@ -118,8 +118,8 @@ static int __init vdso_init(void)
        }
 
        vdso_pages = (&vdso_end - &vdso_start) >> PAGE_SHIFT;
-       pr_info("vdso: %ld pages (%ld code @ %p, %ld data @ %p)\n",
-               vdso_pages + 1, vdso_pages, &vdso_start, 1L, vdso_data);
+       pr_info("vdso: %ld pages (%ld code, %ld data) at base %p\n",
+               vdso_pages + 1, vdso_pages, 1L, &vdso_start);
 
        /* Allocate the vDSO pagelist, plus a page for the data. */
        vdso_pagelist = kcalloc(vdso_pages + 1, sizeof(struct page *),
@@ -127,22 +127,22 @@ 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 + 1] = virt_to_page(&vdso_start + i * PAGE_SIZE);
+               vdso_pagelist[i] = 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]",
+               .name   = "[vdso]",
                .pages  = vdso_pagelist,
        };
 
        vdso_spec[1] = (struct vm_special_mapping) {
-               .name   = "[vdso]",
-               .pages  = &vdso_pagelist[1],
+               .name   = "[vvar]",
+               .pages  = vdso_pagelist + vdso_pages,
        };
 
        return 0;
@@ -166,21 +166,21 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
                ret = ERR_PTR(vdso_base);
                goto up_fail;
        }
-       ret = _install_special_mapping(mm, vdso_base, PAGE_SIZE,
-                                      VM_READ|VM_MAYREAD,
-                                      &vdso_spec[0]);
-       if (IS_ERR(ret))
-               goto up_fail;
-
-       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]);
+                                      &vdso_spec[0]);
        if (IS_ERR(ret))
                goto up_fail;
 
+       vdso_base += vdso_text_len;
+       ret = _install_special_mapping(mm, vdso_base, PAGE_SIZE,
+                                      VM_READ|VM_MAYREAD,
+                                      &vdso_spec[1]);
+       if (IS_ERR(ret))
+               goto up_fail;
 
        up_write(&mm->mmap_sem);
        return 0;

diff --git a/arch/arm64/kernel/vdso/vdso.lds.S b/arch/arm64/kernel/vdso/vdso.lds.S
index beca249bc2f394ca3592a76d868b60ff275ddb5b..8154b8d1c826b39d1a8fa527bf23f07496c1763d 100644 (file)
--- a/arch/arm64/kernel/vdso/vdso.lds.S
+++ b/arch/arm64/kernel/vdso/vdso.lds.S
@@ -28,7 +28,6 @@ OUTPUT_ARCH(aarch64)
 
 SECTIONS
 {
-       PROVIDE(_vdso_data = . - PAGE_SIZE);
        . = VDSO_LBASE + SIZEOF_HEADERS;
 
        .hash           : { *(.hash) }                  :text
@@ -58,6 +57,9 @@ SECTIONS
        _end = .;
        PROVIDE(end = .);
 
+       . = ALIGN(PAGE_SIZE);
+       PROVIDE(_vdso_data = .);
+
        /DISCARD/       : {
                *(.note.GNU-stack)
                *(.data .data.* .gnu.linkonce.d.* .sdata*)