2019-05-29 07:18:00 -07:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0-only */
|
2017-07-10 18:07:09 -07:00
|
|
|
/*
|
|
|
|
* Copyright (C) 2012 Regents of the University of California
|
|
|
|
*/
|
2020-06-09 22:14:48 +08:00
|
|
|
#include <asm/page.h>
|
riscv/vdso: Move vdso data page up front
As commit 601255ae3c98 ("arm64: vdso: move data page before code pages"), the
same issue exists on riscv, testcase is shown below, make sure that vdso.so is
bigger than page size,
struct timespec tp;
clock_gettime(5, &tp);
printf("tv_sec: %ld, tv_nsec: %ld\n", tp.tv_sec, tp.tv_nsec);
without this patch, test result : tv_sec: 0, tv_nsec: 0
with this patch, test result : tv_sec: 1629271537, tv_nsec: 748000000
Move the vdso data page in front of the VDSO area to fix the issue.
Fixes: ad5d1122b82fb ("riscv: use vDSO common flow to reduce the latency of the time-related functions")
Signed-off-by: Tong Tiangen <tongtiangen@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
2021-09-01 02:46:20 +00:00
|
|
|
#include <asm/vdso.h>
|
2017-07-10 18:07:09 -07:00
|
|
|
|
|
|
|
OUTPUT_ARCH(riscv)
|
|
|
|
|
|
|
|
SECTIONS
|
|
|
|
{
|
riscv/vdso: Move vdso data page up front
As commit 601255ae3c98 ("arm64: vdso: move data page before code pages"), the
same issue exists on riscv, testcase is shown below, make sure that vdso.so is
bigger than page size,
struct timespec tp;
clock_gettime(5, &tp);
printf("tv_sec: %ld, tv_nsec: %ld\n", tp.tv_sec, tp.tv_nsec);
without this patch, test result : tv_sec: 0, tv_nsec: 0
with this patch, test result : tv_sec: 1629271537, tv_nsec: 748000000
Move the vdso data page in front of the VDSO area to fix the issue.
Fixes: ad5d1122b82fb ("riscv: use vDSO common flow to reduce the latency of the time-related functions")
Signed-off-by: Tong Tiangen <tongtiangen@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
2021-09-01 02:46:20 +00:00
|
|
|
PROVIDE(_vdso_data = . - __VVAR_PAGES * PAGE_SIZE);
|
2021-09-01 03:20:25 +00:00
|
|
|
#ifdef CONFIG_TIME_NS
|
|
|
|
PROVIDE(_timens_data = _vdso_data + PAGE_SIZE);
|
|
|
|
#endif
|
2017-07-10 18:07:09 -07:00
|
|
|
. = SIZEOF_HEADERS;
|
|
|
|
|
|
|
|
.hash : { *(.hash) } :text
|
|
|
|
.gnu.hash : { *(.gnu.hash) }
|
|
|
|
.dynsym : { *(.dynsym) }
|
|
|
|
.dynstr : { *(.dynstr) }
|
|
|
|
.gnu.version : { *(.gnu.version) }
|
|
|
|
.gnu.version_d : { *(.gnu.version_d) }
|
|
|
|
.gnu.version_r : { *(.gnu.version_r) }
|
|
|
|
|
|
|
|
.note : { *(.note.*) } :text :note
|
|
|
|
.dynamic : { *(.dynamic) } :text :dynamic
|
|
|
|
|
|
|
|
.eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
|
|
|
|
.eh_frame : { KEEP (*(.eh_frame)) } :text
|
|
|
|
|
|
|
|
.rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This linker script is used both with -r and with -shared.
|
|
|
|
* For the layouts to match, we need to skip more than enough
|
|
|
|
* space for the dynamic symbol table, etc. If this amount is
|
|
|
|
* insufficient, ld -shared will error; simply increase it here.
|
|
|
|
*/
|
|
|
|
. = 0x800;
|
|
|
|
.text : { *(.text .text.*) } :text
|
|
|
|
|
|
|
|
.data : {
|
|
|
|
*(.got.plt) *(.got)
|
|
|
|
*(.data .data.* .gnu.linkonce.d.*)
|
|
|
|
*(.dynbss)
|
|
|
|
*(.bss .bss.* .gnu.linkonce.b.*)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We must supply the ELF program headers explicitly to get just one
|
|
|
|
* PT_LOAD segment, and set the flags explicitly to make segments read-only.
|
|
|
|
*/
|
|
|
|
PHDRS
|
|
|
|
{
|
|
|
|
text PT_LOAD FLAGS(5) FILEHDR PHDRS; /* PF_R|PF_X */
|
|
|
|
dynamic PT_DYNAMIC FLAGS(4); /* PF_R */
|
|
|
|
note PT_NOTE FLAGS(4); /* PF_R */
|
|
|
|
eh_frame_hdr PT_GNU_EH_FRAME;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This controls what symbols we export from the DSO.
|
|
|
|
*/
|
|
|
|
VERSION
|
|
|
|
{
|
|
|
|
LINUX_4.15 {
|
|
|
|
global:
|
|
|
|
__vdso_rt_sigreturn;
|
2017-10-23 15:42:14 -07:00
|
|
|
__vdso_gettimeofday;
|
|
|
|
__vdso_clock_gettime;
|
|
|
|
__vdso_clock_getres;
|
|
|
|
__vdso_getcpu;
|
2017-10-25 14:32:16 -07:00
|
|
|
__vdso_flush_icache;
|
2017-07-10 18:07:09 -07:00
|
|
|
local: *;
|
|
|
|
};
|
|
|
|
}
|