s390: convert to GENERIC_VDSO
Sven Schnelle
reviewerRFC PATCH v2 1/1 s390: convert to GENERIC_VDSO
as discussed here's the second version of the generic vdso patch for s390.
Changes in v2:
- added patch from Thomas that adds vdso_update_begin()/vdso_update_end()
- changed the s390 code to use the vdso update functions
- changed the name of the architecture specific data to 'arch_data'
Sven Schnelle
reviewerPATCH 1/3 vdso: allow to add architecture-specific vdso data
Add the possibility to add architecture specific vDSO
data to struct vdso_data. This is useful if the arch specific user space VDSO code needs additional data during execution. If CONFIG_ARCH_HAS_VDSO_DATA is defined, the generic code will include asm/vdso/data.h which should contain 'struct arch_vdso_data'. This structure will be embedded in the generic vDSO data.
--- arch/Kconfig | 3 +++ include/vdso/datapage.h | 7 +++++++ 2 files changed, 10 insertions(+)
arch/Kconfig +3 -0
@@ -979,6 +979,9 @@ config HAVE_SPARSE_SYSCALL_NR entries at 4000, 5000 and 6000 locations. This option turns on syscall related optimizations for a given architecture. +config ARCH_HAS_VDSO_DATA + bool + source "kernel/gcov/Kconfig" source "scripts/gcc-plugins/Kconfig"
include/vdso/datapage.h +7 -0
@@ -19,6 +19,10 @@#include <vdso/time32.h> #include <vdso/time64.h> +#ifdef CONFIG_ARCH_HAS_VDSO_DATA +#include <asm/vdso/data.h> +#endif +#define VDSO_BASES (CLOCK_TAI + 1)#define VDSO_HRES (BIT(CLOCK_REALTIME) | \ BIT(CLOCK_MONOTONIC) | \
@@ -97,6 +101,9 @@ struct vdso_data {s32 tz_dsttime;u32 hrtimer_res;u32 __unused; +#ifdef CONFIG_ARCH_HAS_VDSO_DATA +struct arch_vdso_data arch; +#endif };/*
Signature · 1 line
2.17.1
Sven Schnelle
reviewerRe: [PATCH 1/3] vdso: allow to add architecture-specific vdso data
Hi,
Quoted 43 lines · Sven Schnelle
Add the possibility to add architecture specific vDSO
data to structvdso_data. This is useful if the arch specific user space VDSO code needs additional data during execution. IfCONFIG_ARCH_HAS_VDSO_DATAis defined, the generic code will includeasm/vdso/data.hwhich should contain 'structarch_vdso_data'. This structure will be embedded in the generic vDSO data.Signed-off-by Sven Schnelle <[email protected]>--- arch/Kconfig | 3 +++ include/vdso/datapage.h | 7 +++++++ 2 files changed, 10 insertions(+)arch/Kconfig +3
-0@@ -979,6 +979,9 @@ config HAVE_SPARSE_SYSCALL_NR entries at 4000, 5000 and 6000 locations. This option turns on syscall related optimizations for a given architecture. +config ARCH_HAS_VDSO_DATA + bool + source "kernel/gcov/Kconfig" source "scripts/gcc-plugins/Kconfig"include/vdso/datapage.h +4
-0@@ -19,6 +19,10 @@#include <vdso/time32.h> #include <vdso/time64.h> +#ifdef CONFIG_ARCH_HAS_VDSO_DATA +#include <asm/vdso/data.h> +#endif +#define VDSO_BASES (CLOCK_TAI + 1)#define VDSO_HRES (BIT(CLOCK_REALTIME) | \ BIT(CLOCK_MONOTONIC) | \
include/vdso/datapage.h struct vdso_data { · line 109
Quoted 9 lines
include/vdso/datapage.h +3
-0@@ -97,6 +101,9 @@ struct vdso_data {s32 tz_dsttime;u32 hrtimer_res;u32 __unused; +#ifdef CONFIG_ARCH_HAS_VDSO_DATA +struct arch_vdso_data arch; +#endif };/*
I've sent the wrong version of this patch. I'll send a revised version with the requested changes later.
Sven Schnelle
reviewerPATCH 2/3 timekeeping/vsyscall: Provide vdso_update_begin/end()
In reply to Sven SchnelleFrom: Thomas Gleixner <[email protected]>
Architectures can have the requirement to add additional architecture specific data to the VDSO data page which needs to be updated independent of the timekeeper updates.
To protect these updates vs. concurrent readers and a conflicting update through timekeeping, provide helper functions to make such updates safe.
vdso_update_begin() takes the timekeeper_lock to protect against a potential update from timekeeper code and increments the VDSO sequence count to signal data inconsistency to concurrent readers. vdso_update_end() makes the sequence count even again to signal data consistency and drops the timekeeper lock.
--- include/vdso/vsyscall.h | 3 +++ kernel/time/timekeeping.c | 2 +- kernel/time/timekeeping_internal.h | 11 +++++++--- kernel/time/vsyscall.c | 32 ++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-)
include/vdso/vsyscall.h +3 -0
@@ -6,6 +6,9 @@#include <asm/vdso/vsyscall.h> +unsigned long vdso_update_begin (void ); +void vdso_update_end (unsigned long flags); +#endif /* !__ASSEMBLY__ */ #endif /* __VDSO_VSYSCALL_H */
kernel/time/timekeeping.c +1 -1
@@ -50,7 +50,7 @@ static struct { .seq = SEQCNT_ZERO(tk_core.seq), }; -static DEFINE_RAW_SPINLOCK (timekeeper_lock); +DEFINE_RAW_SPINLOCK (timekeeper_lock);static struct timekeeper shadow_timekeeper;/**
kernel/time/timekeeping_internal.h +8 -3
@@ -1,12 +1,14 @@/* SPDX-License-Identifier: GPL-2.0 */ #ifndef _TIMEKEEPING_INTERNAL_H#define _TIMEKEEPING_INTERNAL_H -/* -* timekeeping debug functions -*/ +#include <linux/clocksource.h> +#include <linux/spinlock.h> #include <linux/time.h> +/* +* timekeeping debug functions +*/ #ifdef CONFIG_DEBUG_FS extern void tk_debug_account_sleep_time (const struct timespec64 *t);#else
@@ -31,4 +33,7 @@ static inline u64 clocksource_delta(u64 now, u64 last, u64 mask) }#endif +/* Semi public for serialization of non timekeeper VDSO updates. */ +extern raw_spinlock_t timekeeper_lock; +#endif /* _TIMEKEEPING_INTERNAL_H */
kernel/time/vsyscall.c +32 -0
@@ -13,6 +13,8 @@#include <vdso/helpers.h> #include <vdso/vsyscall.h> +#include "timekeeping_internal.h" +static inline void update_vdso_data (struct vdso_data *vdata,struct timekeeper *tk) {
@@ -127,3 +129,33 @@ void update_vsyscall_tz(void)__arch_sync_vdso_data (vdata); } + +/** +* vdso_update_begin - Start of a VDSO update section +* +* Allows architecture code to safely update the architecture specific VDSO +* data. +*/ +unsigned long vdso_update_begin (void ) +{ +struct vdso_data *vdata =__arch_get_k_vdso_data (); +unsigned long flags; + +raw_spin_lock_irqsave (&timekeeper_lock, flags); +vdso_write_begin (vdata); +return flags; +} + +/** +* vdso_update_end - End of a VDSO update section +* +* Pairs with vdso_update_begin(). +*/ +void vdso_update_end (unsigned long flags) +{ +struct vdso_data *vdata =__arch_get_k_vdso_data (); + +vdso_write_end (vdata); +__arch_sync_vdso_data (vdata); +raw_spin_unlock_irqrestore (&timekeeper_lock, flags); +}
Signature · 1 line
2.17.1
Sven Schnelle
reviewerPATCH 3/3 s390: convert to GENERIC_VDSO
In reply to Sven SchnelleThis patch converts s390 to the generic vDSO. There are a few special things on s390:
- vDSO can be called without a stack frame - glibc did this in the past. So we need to allocate a stackframe on our own.
- The former assembly code used stcke to get the TOD clock and applied time steering to it. We need to do the same in the new code. This is done in the architecture specific __arch_get_hw_counter function. The steering information is stored in an architecure specific area in the vDSO data.
- CPUCLOCK_VIRT is now handled with a syscall fallback, which might be slower/less accurate than the old implementation.
The getcpu() function stays as an assembly function because there is no generic implementation and the code is just a few lines.
Performance number from my system do 100 mio gettimeofday() calls:
Plain syscall: 8.6s Generic VDSO: 1.3s old ASM VDSO: 1s
So it's a bit slower but still much faster than syscalls.
--- arch/s390/Kconfig | 3 + arch/s390/include/asm/clocksource.h | 7 + arch/s390/include/asm/vdso.h | 25 +-- arch/s390/include/asm/vdso/clocksource.h | 8 + arch/s390/include/asm/vdso/data.h | 13 ++ arch/s390/include/asm/vdso/gettimeofday.h | 71 +++++++++ arch/s390/include/asm/vdso/processor.h | 5 + arch/s390/include/asm/vdso/vdso.h | 0 arch/s390/include/asm/vdso/vsyscall.h | 26 ++++ arch/s390/kernel/asm-offsets.c | 20 --- arch/s390/kernel/entry.S | 6 - arch/s390/kernel/setup.c | 1 - arch/s390/kernel/time.c | 66 ++------ arch/s390/kernel/vdso.c | 29 +--- arch/s390/kernel/vdso64/Makefile | 19 ++- arch/s390/kernel/vdso64/clock_getres.S | 50 ------ arch/s390/kernel/vdso64/clock_gettime.S | 163 -------------------- arch/s390/kernel/vdso64/gettimeofday.S | 71 --------- arch/s390/kernel/vdso64/vdso64_generic.c | 18 +++ arch/s390/kernel/vdso64/vdso_user_wrapper.S | 38 +++++ 20 files changed, 219 insertions(+), 420 deletions(-) create mode 100644 arch/s390/include/asm/clocksource.h create mode 100644 arch/s390/include/asm/vdso/clocksource.h create mode 100644 arch/s390/include/asm/vdso/data.h create mode 100644 arch/s390/include/asm/vdso/gettimeofday.h create mode 100644 arch/s390/include/asm/vdso/processor.h create mode 100644 arch/s390/include/asm/vdso/vdso.h create mode 100644 arch/s390/include/asm/vdso/vsyscall.h delete mode 100644 arch/s390/kernel/vdso64/clock_getres.S delete mode 100644 arch/s390/kernel/vdso64/clock_gettime.S delete mode 100644 arch/s390/kernel/vdso64/gettimeofday.S create mode 100644 arch/s390/kernel/vdso64/vdso64_generic.c create mode 100644 arch/s390/kernel/vdso64/vdso_user_wrapper.S
arch/s390/Kconfig +3 -0
@@ -73,6 +73,7 @@ config S390 select ARCH_HAS_STRICT_MODULE_RWX select ARCH_HAS_SYSCALL_WRAPPER select ARCH_HAS_UBSAN_SANITIZE_ALL + select ARCH_HAS_VDSO_DATA select ARCH_HAVE_NMI_SAFE_CMPXCHG select ARCH_INLINE_READ_LOCK select ARCH_INLINE_READ_LOCK_BH
@@ -118,6 +119,7 @@ config S390 select GENERIC_CPU_AUTOPROBE select GENERIC_CPU_VULNERABILITIES select GENERIC_FIND_FIRST_BIT + select GENERIC_GETTIMEOFDAY select GENERIC_SMP_IDLE_THREAD select GENERIC_TIME_VSYSCALL select HAVE_ALIGNED_STRUCT_PAGE if SLUB
@@ -149,6 +151,7 @@ config S390 select HAVE_FUNCTION_TRACER select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_GCC_PLUGINS + select HAVE_GENERIC_VDSO select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_GZIP select HAVE_KERNEL_LZ4
arch/s390/include/asm/clocksource.h new file +7 -0
@@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* s390-specific clocksource additions */ + +#ifndef _ASM_S390_CLOCKSOURCE_H +#define _ASM_S390_CLOCKSOURCE_H + +#endif /* _ASM_S390_CLOCKSOURCE_H */
arch/s390/include/asm/vdso.h +2 -23
@@ -2,6 +2,8 @@#ifndef __S390_VDSO_H__#define __S390_VDSO_H__ +#include <vdso/datapage.h> +/* Default link addresses for the vDSOs */ #define VDSO32_LBASE 0#define VDSO64_LBASE 0
@@ -18,30 +20,7 @@* itself and may change without notice. */ -struct vdso_data { -__u64 tb_update_count;/* Timebase atomicity ctr 0x00 */ -__u64 xtime_tod_stamp;/* TOD clock for xtime 0x08 */ -__u64 xtime_clock_sec;/* Kernel time 0x10 */ -__u64 xtime_clock_nsec;/* 0x18 */ -__u64 xtime_coarse_sec;/* Coarse kernel time 0x20 */ -__u64 xtime_coarse_nsec;/* 0x28 */ -__u64 wtom_clock_sec;/* Wall to monotonic clock 0x30 */ -__u64 wtom_clock_nsec;/* 0x38 */ -__u64 wtom_coarse_sec;/* Coarse wall to monotonic 0x40 */ -__u64 wtom_coarse_nsec;/* 0x48 */ -__u32 tz_minuteswest;/* Minutes west of Greenwich 0x50 */ -__u32 tz_dsttime;/* Type of dst correction 0x54 */ -__u32 ectg_available;/* ECTG instruction present 0x58 */ -__u32 tk_mult;/* Mult. used for xtime_nsec 0x5c */ -__u32 tk_shift;/* Shift used for xtime_nsec 0x60 */ -__u32 ts_dir;/* TOD steering direction 0x64 */ -__u64 ts_end;/* TOD steering end 0x68 */ -__u32 hrtimer_res;/* hrtimer resolution 0x70 */ -}; -struct vdso_per_cpu_data { -__u64 ectg_timer_base; -__u64 ectg_user_time;/* * Note: node_id and cpu_nr must be at adjacent memory locations. * VDSO userspace must read both values with a single instruction.
arch/s390/include/asm/vdso/clocksource.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_VDSO_CLOCKSOURCE_H +#define __ASM_VDSO_CLOCKSOURCE_H + +#define VDSO_ARCH_CLOCKMODES \ + VDSO_CLOCKMODE_TOD + +#endif /* __ASM_VDSO_CLOCKSOURCE_H */
arch/s390/include/asm/vdso/data.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __S390_ASM_VDSO_DATA_H +#define __S390_ASM_VDSO_DATA_H + +#include <linux/types.h> +#include <vdso/datapage.h> + +struct arch_vdso_data { +__u64 tod_steering_delta; +__u64 tod_steering_end; +}; + +#endif /* __S390_ASM_VDSO_DATA_H */
arch/s390/include/asm/vdso/gettimeofday.h new file +71 -0
71 lines not on this page · raw message
arch/s390/include/asm/vdso/processor.h new file +5 -0
@@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_VDSO_PROCESSOR_H +#define __ASM_VDSO_PROCESSOR_H + +#endif /* __ASM_VDSO_PROCESSOR_H */
arch/s390/include/asm/vdso/vdso.h new file +0 -0
arch/s390/include/asm/vdso/vsyscall.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_VDSO_VSYSCALL_H +#define __ASM_VDSO_VSYSCALL_H + +#ifndef __ASSEMBLY__ + +#include <linux/hrtimer.h> +#include <linux/timekeeper_internal.h> +#include <vdso/datapage.h> +#include <asm/vdso.h> +/* +* Update the vDSO data page to keep in sync with kernel timekeeping. +*/ + +static __always_inline struct vdso_data *__s390_get_k_vdso_data(void) +{ +return vdso_data; +} +#define __arch_get_k_vdso_data __s390_get_k_vdso_data + +/* The asm-generic header needs to be included after the definitions above */ +#include <asm-generic/vdso/vsyscall.h> + +#endif /* !__ASSEMBLY__ */ + +#endif /* __ASM_VDSO_VSYSCALL_H */
arch/s390/kernel/asm-offsets.c +0 -20
@@ -59,26 +59,6 @@ int main(void)OFFSET (__SF_SIE_REASON, stack_frame, empty1[2 ]);OFFSET (__SF_SIE_FLAGS, stack_frame, empty1[3 ]);BLANK (); -/* timeval/timezone offsets for use by vdso */ -OFFSET (__VDSO_UPD_COUNT, vdso_data, tb_update_count); -OFFSET (__VDSO_XTIME_STAMP, vdso_data, xtime_tod_stamp); -OFFSET (__VDSO_XTIME_SEC, vdso_data, xtime_clock_sec); -OFFSET (__VDSO_XTIME_NSEC, vdso_data, xtime_clock_nsec); -OFFSET (__VDSO_XTIME_CRS_SEC, vdso_data, xtime_coarse_sec); -OFFSET (__VDSO_XTIME_CRS_NSEC, vdso_data, xtime_coarse_nsec); -OFFSET (__VDSO_WTOM_SEC, vdso_data, wtom_clock_sec); -OFFSET (__VDSO_WTOM_NSEC, vdso_data, wtom_clock_nsec); -OFFSET (__VDSO_WTOM_CRS_SEC, vdso_data, wtom_coarse_sec); -OFFSET (__VDSO_WTOM_CRS_NSEC, vdso_data, wtom_coarse_nsec); -OFFSET (__VDSO_TIMEZONE, vdso_data, tz_minuteswest); -OFFSET (__VDSO_ECTG_OK, vdso_data, ectg_available); -OFFSET (__VDSO_TK_MULT, vdso_data, tk_mult); -OFFSET (__VDSO_TK_SHIFT, vdso_data, tk_shift); -OFFSET (__VDSO_TS_DIR, vdso_data, ts_dir); -OFFSET (__VDSO_TS_END, vdso_data, ts_end); -OFFSET (__VDSO_CLOCK_REALTIME_RES, vdso_data, hrtimer_res); -OFFSET (__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base); -OFFSET (__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time);OFFSET (__VDSO_GETCPU_VAL, vdso_per_cpu_data, getcpu_val);BLANK ();/* constants used by the vdso */
arch/s390/kernel/entry.S +0 -6
@@ -435,10 +435,8 @@ ENTRY(system_call) jz .Lsysc_skip_fpu brasl %r14,load_fpu_regs .Lsysc_skip_fpu: - lg %r14,__LC_VDSO_PER_CPU mvc __LC_RETURN_PSW(16),__PT_PSW(%r11) stpt __LC_EXIT_TIMER - mvc __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER lmg %r0,%r15,__PT_R0(%r11) b __LC_RETURN_LPSWE
@@ -797,13 +795,11 @@ ENTRY(io_int_handler) TRACE_IRQS_ON 0: #endif - lg %r14,__LC_VDSO_PER_CPU mvc __LC_RETURN_PSW(16),__PT_PSW(%r11) tm __PT_PSW+1(%r11),0x01 # returning to user ? jno .Lio_exit_kernel BPEXIT __TI_flags(%r12),_TIF_ISOLATE_BP stpt __LC_EXIT_TIMER - mvc __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER .Lio_exit_kernel: lmg %r0,%r15,__PT_R0(%r11) b __LC_RETURN_LPSWE
@@ -1213,14 +1209,12 @@ ENTRY(mcck_int_handler) brasl %r14,s390_handle_mcck TRACE_IRQS_ON .Lmcck_return: - lg %r14,__LC_VDSO_PER_CPU lmg %r0,%r10,__PT_R0(%r11) mvc __LC_RETURN_MCCK_PSW(16),__PT_PSW(%r11) # move return PSW tm __LC_RETURN_MCCK_PSW+1,0x01 # returning to user ? jno 0f BPEXIT __TI_flags(%r12),_TIF_ISOLATE_BP stpt __LC_EXIT_TIMER - mvc __VDSO_ECTG_BASE(16,%r14),__LC_EXIT_TIMER 0: lmg %r11,%r15,__PT_R11(%r11) b __LC_RETURN_MCCK_LPSWE
arch/s390/kernel/setup.c +0 -1
@@ -402,7 +402,6 @@ static void __init setup_lowcore_dat_off(void)memcpy (lc->alt_stfle_fac_list, S390_lowcore.alt_stfle_fac_list,sizeof (lc->alt_stfle_fac_list));nmi_alloc_boot_cpu (lc); -vdso_alloc_boot_cpu (lc); lc->sync_enter_timer = S390_lowcore.sync_enter_timer; lc->async_enter_timer = S390_lowcore.async_enter_timer; lc->exit_timer = S390_lowcore.exit_timer;
arch/s390/kernel/time.c +10 -56
120 lines not on this page · raw message
arch/s390/kernel/vdso.c +3 -26
@@ -20,6 +20,8 @@#include <linux/security.h> #include <linux/memblock.h> #include <linux/compat.h> +#include <linux/binfmts.h> +#include <vdso/datapage.h> #include <asm/asm-offsets.h> #include <asm/processor.h> #include <asm/mmu.h>
@@ -96,35 +98,12 @@ static union {struct vdso_data data;u8 page[PAGE_SIZE ]; }vdso_data_store __page_aligned_data; -struct vdso_data *vdso_data = &vdso_data_store.data; - -/* -* Setup vdso data page. -*/ -static void __init vdso_init_data (struct vdso_data *vd) -{ - vd->ectg_available =test_facility (31 ); -} - +struct vdso_data *vdso_data = (struct vdso_data *)&vdso_data_store.data;/* * Allocate/free per cpu vdso data. */ #define SEGMENT_ORDER 2 -/* -* The initial vdso_data structure for the boot CPU. Eventually -* it is replaced with a properly allocated structure in vdso_init. -* This is necessary because a valid S390_lowcore.vdso_per_cpu_data -* pointer is required to be able to return from an interrupt or -* program check. See the exit paths in entry.S. -*/ -struct vdso_data boot_vdso_data__initdata ; - -void __init vdso_alloc_boot_cpu (struct lowcore *lowcore) -{ - lowcore->vdso_per_cpu_data = (unsigned long ) &boot_vdso_data; -} -int vdso_alloc_per_cpu (struct lowcore *lowcore) {unsigned long segment_table, page_table, page_frame;
@@ -246,8 +225,6 @@ static int __init vdso_init(void) {int i; -vdso_init_data (vdso_data); -/* Calculate the size of the 64 bit vDSO */ vdso64_pages = ((&vdso64_end - &vdso64_start +PAGE_SIZE -1 ) >>PAGE_SHIFT ) +1 ;
arch/s390/kernel/vdso64/Makefile +15 -4
@@ -1,14 +1,20 @@ # SPDX-License-Identifier: GPL-2.0 -# List of files in the vdso, has to be asm only for now +# List of files in the vdso KCOV_INSTRUMENT := n +ARCH_REL_TYPE_ABS := R_390_COPY|R_390_GLOB_DAT|R_390_JMP_SLOT|R_390_RELATIVE +ARCH_REL_TYPE_ABS += R_390_GOT|R_390_PLT -obj-vdso64 = gettimeofday.o clock_getres.o clock_gettime.o note.o getcpu.o +include $(srctree)/lib/vdso/Makefile +obj-vdso64 = vdso_user_wrapper.o note.o getcpu.o +obj-cvdso64 = vdso64_generic.o +CFLAGS_REMOVE_vdso64_generic.o = -pg $(CC_FLAGS_FTRACE) $(CC_FLAGS_EXPOLINE) # Build rules -targets := $(obj-vdso64) vdso64.so vdso64.so.dbg +targets := $(obj-vdso64) $(obj-cvdso64) vdso64.so vdso64.so.dbg obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64)) +obj-cvdso64 := $(addprefix $(obj)/, $(obj-cvdso64)) KBUILD_AFLAGS += -DBUILD_VDSO KBUILD_CFLAGS += -DBUILD_VDSO
@@ -37,7 +43,7 @@ KASAN_SANITIZE := n $(obj)/vdso64_wrapper.o : $(obj)/vdso64.so # link rule for the .so file, .lds has to be first -$(obj)/vdso64.so.dbg: $(obj)/vdso64.lds $(obj-vdso64) FORCE +$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) $(obj-cvdso64) FORCE $(call if_changed,ld) # strip rule for the .so file
@@ -49,9 +55,14 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE $(obj-vdso64): %.o: %.S FORCE $(call if_changed_dep,vdso64as) +$(obj-cvdso64): %.o: %.c FORCE + $(call if_changed_dep,vdso64cc) + # actual build commands quiet_cmd_vdso64as = VDSO64A $@ cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< +quiet_cmd_vdso64cc = VDSO64C $@ + cmd_vdso64cc = $(CC) $(c_flags) -c -o $@ $< # install commands for the unstripped file quiet_cmd_vdso_install = INSTALL $@
arch/s390/kernel/vdso64/clock_getres.S deleted +0 -50
50 lines not on this page · raw message
arch/s390/kernel/vdso64/clock_gettime.S deleted +0 -163
163 lines not on this page · raw message
arch/s390/kernel/vdso64/gettimeofday.S deleted +0 -71
71 lines not on this page · raw message
arch/s390/kernel/vdso64/vdso64_generic.c new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "../../../../lib/vdso/gettimeofday.c" + +int __s390_vdso_gettimeofday (struct __kernel_old_timeval *tv, +struct timezone *tz) +{ +return __cvdso_gettimeofday (tv, tz); +} + +int __s390_vdso_clock_gettime (clockid_t clock,struct __kernel_timespec *ts) +{ +return __cvdso_clock_gettime (clock, ts); +} + +int __s390_vdso_clock_getres (clockid_t clock,struct __kernel_timespec *ts) +{ +return __cvdso_clock_getres (clock, ts); +}
arch/s390/kernel/vdso64/vdso_user_wrapper.S new file +38 -0
@@ -0,0 +1,38 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/vdso.h> +#include <asm/unistd.h> +#include <asm/asm-offsets.h> +#include <asm/dwarf.h> +#include <asm/ptrace.h> + +#define WRAPPER_FRAME_SIZE (STACK_FRAME_OVERHEAD+8) + +/* + * Older glibc version called vdso without allocating a stackframe. This wrapper + * is just used to allocate a stackframe. See + * https://sourceware.org/git/?p=glibc.git;a=commit;h=478593e6374f3818da39332260dc453cb19cfa1e + * for details. + */ +.macro vdso_func func + .globl __kernel_\func + .type __kernel_\func,@function + .align 8 +__kernel_\func: + CFI_STARTPROC + aghi %r15,-WRAPPER_FRAME_SIZE + CFI_DEF_CFA_OFFSET (STACK_FRAME_OVERHEAD + WRAPPER_FRAME_SIZE) + CFI_VAL_OFFSET 15, -STACK_FRAME_OVERHEAD + stg %r14,STACK_FRAME_OVERHEAD(%r15) + brasl %r14,__s390_vdso_\func + lg %r14,STACK_FRAME_OVERHEAD(%r15) + aghi %r15,WRAPPER_FRAME_SIZE + CFI_DEF_CFA_OFFSET STACK_FRAME_OVERHEAD + CFI_RESTORE 15 + br %r14 + CFI_ENDPROC + .size __kernel_\func,.-__kernel_\func +.endm + +vdso_func gettimeofday +vdso_func clock_getres +vdso_func clock_gettime
Signature · 1 line
2.17.1