mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-30 12:31:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

linux: Fix vDSO macros build with time64 interfaces

Browse Source 
As indicated on libc-help [1] the ec138c67cb commit broke 32-bit
builds when configured with --enable-kernel=5.1 or higher.  The
scenario 10 from [2] might also occur in this configuration and
INLINE_VSYSCALL will try to use the vDSO symbol and
HAVE_CLOCK_GETTIME64_VSYSCALL does not set HAVE_VSYSCALL prior its
usage.

Also, there is no easy way to just enable the code to use one
vDSO symbol since the macro INLINE_VSYSCALL is redefined if
HAVE_VSYSCALL is set.

Instead of adding more pre-processor handling and making the code
even more convoluted, this patch removes the requirement of defining
HAVE_VSYSCALL before including sysdep-vdso.h to enable vDSO usage.

The INLINE_VSYSCALL is now expected to be issued inside a
HAVE_*_VSYSCALL check, since it will try to use the internal vDSO
pointers.

Both clock_getres and clock_gettime vDSO code for time64_t were
removed since there is no vDSO setup code for the symbol (an
architecture can not set HAVE_CLOCK_GETTIME64_VSYSCALL).

Checked on i686-linux-gnu (default and with --enable-kernel=5.1),
x86_64-linux-gnu, aarch64-linux-gnu, and powerpc64le-linux-gnu.
I also checked against a build to mips64-linux-gnu and
sparc64-linux-gnu.

[1] https://sourceware.org/ml/libc-help/2019-12/msg00014.html
[2] https://sourceware.org/ml/libc-alpha/2019-12/msg00142.html

Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
Adhemerval Zanella 2019-12-13 17:30:15 -03:00
parent b03688bfbb
commit d0def09ff6
10 changed files with 58 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
View File

@ -22,10 +22,6 @@
#include <time.h>
#include <sysdep.h>
#ifdef HAVE_GETTIMEOFDAY_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
/* Used as a fallback in the ifunc resolver if VDSO is not available

36
sysdeps/unix/sysv/linux/clock_getres.c
View File

@ -20,9 +20,6 @@
#include <errno.h>
#include <time.h>
#ifdef HAVE_CLOCK_GETRES_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
#include <shlib-compat.h>
#include <kernel-features.h>
@ -32,23 +29,34 @@ int
__clock_getres64 (clockid_t clock_id, struct __timespec64 *res)
{
#ifdef __ASSUME_TIME64_SYSCALLS
# ifndef __NR_clock_getres_time64
return INLINE_VSYSCALL (clock_getres, 2, clock_id, res);
/* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */
# ifdef __NR_clock_getres_time64
return INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
# else
return INLINE_SYSCALL (clock_getres_time64, 2, clock_id, res);
# ifdef HAVE_CLOCK_GETRES_VSYSCALL
return INLINE_VSYSCALL (clock_getres, 2, clock_id, res);
# else
return INLINE_SYSCALL_CALL (clock_getres, clock_id, res);
# endif
# endif
#else
int r;
/* Old 32-bit ABI with possible 64-bit time_t support. */
# ifdef __NR_clock_getres_time64
int ret = INLINE_SYSCALL (clock_getres_time64, 2, clock_id, res);
if (ret == 0 || errno != ENOSYS)
return ret;
r = INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
if (r == 0 || errno != ENOSYS)
return r;
# endif
/* Fallback code that uses 32-bit support. */
struct timespec ts32;
int retval = INLINE_VSYSCALL (clock_getres, 2, clock_id, &ts32);
if (! retval && res)
# ifdef HAVE_CLOCK_GETRES_VSYSCALL
r = INLINE_VSYSCALL (clock_getres, 2, clock_id, &ts32);
# else
r = INLINE_SYSCALL_CALL (clock_getres, clock_id, &ts32);
# endif
if (r == 0)
*res = valid_timespec_to_timespec64 (ts32);
return retval;
return r;
#endif
}
@ -60,7 +68,7 @@ __clock_getres (clockid_t clock_id, struct timespec *res)
int retval;
retval = __clock_getres64 (clock_id, &ts64);
if (! retval && res)
if (retval == 0 && res != NULL)
*res = valid_timespec64_to_timespec (ts64);
return retval;

38
sysdeps/unix/sysv/linux/clock_gettime.c
View File

@ -21,10 +21,6 @@
#include <errno.h>
#include <time.h>
#include "kernel-posix-cpu-timers.h"
#ifdef HAVE_CLOCK_GETTIME_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
#include <shlib-compat.h>
@ -34,22 +30,34 @@ int
__clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
{
#ifdef __ASSUME_TIME64_SYSCALLS
# ifndef __NR_clock_gettime64
# define __NR_clock_gettime64 __NR_clock_gettime
# define __vdso_clock_gettime64 __vdso_clock_gettime
/* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */
# ifdef __NR_clock_gettime64
return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
# 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
return INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
#else
# if defined HAVE_CLOCK_GETTIME64_VSYSCALL
int ret64 = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
if (ret64 == 0 || errno != ENOSYS)
return ret64;
int r;
/* Old 32-bit ABI with possible 64-bit time_t support. */
# ifdef __NR_clock_gettime64
r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
if (r == 0 || errno != ENOSYS)
return r;
# endif
/* Fallback code that uses 32-bit support. */
struct timespec tp32;
int ret = INLINE_VSYSCALL (clock_gettime, 2, clock_id, &tp32);
if (ret == 0)
# ifdef HAVE_CLOCK_GETTIME_VSYSCALL
r = INLINE_VSYSCALL (clock_gettime, 2, clock_id, &tp32);
# else
r = INLINE_SYSCALL_CALL (clock_gettime, clock_id, &tp32);
# endif
if (r == 0)
*tp = valid_timespec_to_timespec64 (tp32);
return ret;
return r;
#endif
}

9
sysdeps/unix/sysv/linux/getcpu.c
View File

@ -18,20 +18,15 @@
#include <errno.h>
#include <sched.h>
#include <sysdep.h>
#ifdef HAVE_GETCPU_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
int
__getcpu (unsigned int *cpu, unsigned int *node)
{
#ifdef __NR_getcpu
#ifdef HAVE_GETCPU_VSYSCALL
return INLINE_VSYSCALL (getcpu, 3, cpu, node, NULL);
#else
__set_errno (ENOSYS);
return -1;
return INLINE_SYSCALL_CALL (getcpu, cpu, node, NULL);
#endif
}
weak_alias (__getcpu, getcpu)

4
sysdeps/unix/sysv/linux/powerpc/gettimeofday.c
View File

@ -17,10 +17,6 @@
#include <time.h>
#include <sysdep.h>
#ifdef HAVE_GETTIMEOFDAY_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
static int

4
sysdeps/unix/sysv/linux/powerpc/time.c
View File

@ -18,10 +18,6 @@
#include <time.h>
#include <sysdep.h>
#ifdef HAVE_TIME_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
static time_t

15
sysdeps/unix/sysv/linux/sched_getcpu.c
View File

@ -18,22 +18,17 @@
#include <errno.h>
#include <sched.h>
#include <sysdep.h>
#ifdef HAVE_GETCPU_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
int
sched_getcpu (void)
{
#ifdef __NR_getcpu
unsigned int cpu;
int r = INLINE_VSYSCALL (getcpu, 3, &cpu, NULL, NULL);
return r == -1 ? r : cpu;
int r = -1;
#ifdef HAVE_GETCPU_VSYSCALL
r = INLINE_VSYSCALL (getcpu, 3, &cpu, NULL, NULL);
#else
__set_errno (ENOSYS);
return -1;
r = INLINE_SYSCALL_CALL (getcpu, &cpu, NULL, NULL);
#endif
return r == -1 ? r : cpu;
}

34
sysdeps/unix/sysv/linux/sysdep-vdso.h
View File

@ -20,17 +20,14 @@
# define SYSDEP_VDSO_LINUX_H
#include <dl-vdso.h>
#include <libc-vdso.h>
#ifndef INTERNAL_VSYSCALL_CALL
# define INTERNAL_VSYSCALL_CALL(funcptr, err, nr, args...) \
funcptr (args)
#endif
#ifdef HAVE_VSYSCALL
# include <libc-vdso.h>
# define INLINE_VSYSCALL(name, nr, args...) \
#define INLINE_VSYSCALL(name, nr, args...) \
({ \
__label__ out; \
__label__ iserr; \
@ -59,31 +56,4 @@
sc_ret; \
})
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
({ \
__label__ out; \
long v_ret; \
\
__typeof (__vdso_##name) vdsop = __vdso_##name; \
PTR_DEMANGLE (vdsop); \
if (vdsop != NULL) \
{ \
v_ret = INTERNAL_VSYSCALL_CALL (vdsop, err, nr, ##args); \
if (!INTERNAL_SYSCALL_ERROR_P (v_ret, err) \
|| INTERNAL_SYSCALL_ERRNO (v_ret, err) != ENOSYS) \
goto out; \
} \
v_ret = INTERNAL_SYSCALL (name, err, nr, ##args); \
out: \
v_ret; \
})
#else
# define INLINE_VSYSCALL(name, nr, args...) \
INLINE_SYSCALL (name, nr, ##args)
# define INTERNAL_VSYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL (name, err, nr, ##args)
#endif /* USE_VSYSCALL && defined HAVE_VSYSCALL */
#endif /* SYSDEP_VDSO_LINUX_H */

4
sysdeps/unix/sysv/linux/x86/gettimeofday.c
View File

@ -18,10 +18,6 @@
#include <time.h>
#include <sysdep.h>
#ifdef HAVE_GETTIMEOFDAY_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
static int

8
sysdeps/unix/sysv/linux/x86/time.c
View File

@ -18,16 +18,16 @@
#include <time.h>
#include <sysdep.h>
#ifdef HAVE_TIME_VSYSCALL
# define HAVE_VSYSCALL
#endif
#include <sysdep-vdso.h>
static time_t
time_vsyscall (time_t *t)
{
#ifdef HAVE_TIME_VSYSCALL
return INLINE_VSYSCALL (time, 1, t);
#else
return INLINE_SYSCALL_CALL (time, t);
#endif
}
#ifdef SHARED