niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

linux: Add support for clock_gettime64 vDSO

Browse source 
No architecture currently defines the vDSO symbol.  On architectures
with 64-bit time_t the HAVE_CLOCK_GETTIME_VSYSCALL is renamed to
HAVE_CLOCK_GETTIME64_VSYSCALL, it simplifies clock_gettime code.

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Adhemerval Zanella 2019-12-11 11:13:50 -03:00
parent 1bdda52fe9
commit ff500a623d
9 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sysdeps/unix/sysv/linux/aarch64/sysdep.h
View file

@ -161,7 +161,7 @@
/* List of system calls which are supported as vsyscalls. */ /* List of system calls which are supported as vsyscalls. */
# define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" # define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
# define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime" # define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime"
# define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" # define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
/* Previously AArch64 used the generic version without the libc_hidden_def /* Previously AArch64 used the generic version without the libc_hidden_def

19
sysdeps/unix/sysv/linux/clock_gettime.c
View file

@ -30,21 +30,24 @@ int
__clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp) __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
{ {
#ifdef __ASSUME_TIME64_SYSCALLS #ifdef __ASSUME_TIME64_SYSCALLS
/* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */ /* 64 bit ABIs or newer 32-bit ABIs that only support 64-bit time_t. */
# ifdef __NR_clock_gettime64 # ifndef __NR_clock_gettime64
return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); # define __NR_clock_gettime64 __NR_clock_gettime
# else
# ifdef HAVE_CLOCK_GETTIME_VSYSCALL
return INLINE_VSYSCALL (clock_gettime, 2, clock_id, tp);
# else
return INLINE_SYSCALL_CALL (clock_gettime, clock_id, tp);
# endif # endif
# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
return INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
# else
return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
# endif # endif
#else #else
int r; int r;
/* Old 32-bit ABI with possible 64-bit time_t support. */ /* Old 32-bit ABI with possible 64-bit time_t support. */
# ifdef __NR_clock_gettime64 # ifdef __NR_clock_gettime64
# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
# else
r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
# endif
if (r == 0 || errno != ENOSYS) if (r == 0 || errno != ENOSYS)
return r; return r;
# endif # endif

4
sysdeps/unix/sysv/linux/dl-vdso-setup.c
View file

@ -45,6 +45,10 @@
PROCINFO_CLASS int (*_dl_vdso_clock_gettime) (clockid_t, PROCINFO_CLASS int (*_dl_vdso_clock_gettime) (clockid_t,
struct timespec *) RELRO; struct timespec *) RELRO;
#endif #endif
# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
PROCINFO_CLASS int (*_dl_vdso_clock_gettime64) (clockid_t,
struct __timespec64 *) RELRO;
#endif
# ifdef HAVE_GETTIMEOFDAY_VSYSCALL # ifdef HAVE_GETTIMEOFDAY_VSYSCALL
PROCINFO_CLASS int (*_dl_vdso_gettimeofday) (struct timeval *, void *) RELRO; PROCINFO_CLASS int (*_dl_vdso_gettimeofday) (struct timeval *, void *) RELRO;
#endif #endif

3
sysdeps/unix/sysv/linux/dl-vdso-setup.h
View file

@ -26,6 +26,9 @@ setup_vdso_pointers (void)
#ifdef HAVE_CLOCK_GETTIME_VSYSCALL #ifdef HAVE_CLOCK_GETTIME_VSYSCALL
GLRO(dl_vdso_clock_gettime) = dl_vdso_vsym (HAVE_CLOCK_GETTIME_VSYSCALL); GLRO(dl_vdso_clock_gettime) = dl_vdso_vsym (HAVE_CLOCK_GETTIME_VSYSCALL);
#endif #endif
#ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
GLRO(dl_vdso_clock_gettime64) = dl_vdso_vsym (HAVE_CLOCK_GETTIME64_VSYSCALL);
#endif
#ifdef HAVE_GETTIMEOFDAY_VSYSCALL #ifdef HAVE_GETTIMEOFDAY_VSYSCALL
GLRO(dl_vdso_gettimeofday) = dl_vdso_vsym (HAVE_GETTIMEOFDAY_VSYSCALL); GLRO(dl_vdso_gettimeofday) = dl_vdso_vsym (HAVE_GETTIMEOFDAY_VSYSCALL);
#endif #endif

4
sysdeps/unix/sysv/linux/powerpc/sysdep.h
View file

@ -21,7 +21,11 @@
/* List of system calls which are supported as vsyscalls. */ /* List of system calls which are supported as vsyscalls. */
#define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" #define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
#if defined(__PPC64__) || defined(__powerpc64__)
#define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime"
#else
#define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime" #define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime"
#endif
#define HAVE_GETCPU_VSYSCALL "__kernel_getcpu" #define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"
#define HAVE_TIME_VSYSCALL "__kernel_time" #define HAVE_TIME_VSYSCALL "__kernel_time"
#define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"

2
sysdeps/unix/sysv/linux/riscv/sysdep.h
View file

@ -126,7 +126,7 @@
/* List of system calls which are supported as vsyscalls. */ /* List of system calls which are supported as vsyscalls. */
# define HAVE_CLOCK_GETRES_VSYSCALL "__vdso_clock_getres" # define HAVE_CLOCK_GETRES_VSYSCALL "__vdso_clock_getres"
# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" # define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime"
# define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday"
# define HAVE_GETCPU_VSYSCALL "__vdso_getcpu" # define HAVE_GETCPU_VSYSCALL "__vdso_getcpu"

4
sysdeps/unix/sysv/linux/s390/sysdep.h
View file

@ -21,6 +21,10 @@
/* List of system calls which are supported as vsyscalls. */ /* List of system calls which are supported as vsyscalls. */
#define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" #define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
#ifdef __s390x__
#define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime"
#else
#define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime" #define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime"
#endif
#define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
#define HAVE_GETCPU_VSYSCALL "__kernel_getcpu" #define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"

4
sysdeps/unix/sysv/linux/sparc/sysdep.h
View file

@ -45,7 +45,11 @@
# define VDSO_HASH 61765110 # define VDSO_HASH 61765110
/* List of system calls which are supported as vsyscalls. */ /* List of system calls which are supported as vsyscalls. */
# ifdef __arch64__
# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime"
# else
# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" # define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime"
# endif
# define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday"
#undef INLINE_SYSCALL #undef INLINE_SYSCALL

2
sysdeps/unix/sysv/linux/x86_64/sysdep.h
View file

@ -364,7 +364,7 @@
# define VDSO_HASH 61765110 # define VDSO_HASH 61765110
/* List of system calls which are supported as vsyscalls. */ /* List of system calls which are supported as vsyscalls. */
# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" # define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime"
# define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday"
# define HAVE_TIME_VSYSCALL "__vdso_time" # define HAVE_TIME_VSYSCALL "__vdso_time"
# define HAVE_GETCPU_VSYSCALL "__vdso_getcpu" # define HAVE_GETCPU_VSYSCALL "__vdso_getcpu"