mirror of
https://sourceware.org/git/glibc.git
synced 2025-05-16 06:44:32 +03:00
d0def09ff6
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>
60 lines
2.1 KiB
C
60 lines
2.1 KiB
C
/* vDSO common definition for Linux.
|
|
Copyright (C) 2015-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef SYSDEP_VDSO_LINUX_H
|
|
# 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
|
|
|
|
#define INLINE_VSYSCALL(name, nr, args...) \
|
|
({ \
|
|
__label__ out; \
|
|
__label__ iserr; \
|
|
INTERNAL_SYSCALL_DECL (sc_err); \
|
|
long int sc_ret; \
|
|
\
|
|
__typeof (__vdso_##name) vdsop = __vdso_##name; \
|
|
PTR_DEMANGLE (vdsop); \
|
|
if (vdsop != NULL) \
|
|
{ \
|
|
sc_ret = INTERNAL_VSYSCALL_CALL (vdsop, sc_err, nr, ##args); \
|
|
if (!INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
|
goto out; \
|
|
if (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err) != ENOSYS) \
|
|
goto iserr; \
|
|
} \
|
|
\
|
|
sc_ret = INTERNAL_SYSCALL (name, sc_err, nr, ##args); \
|
|
if (INTERNAL_SYSCALL_ERROR_P (sc_ret, sc_err)) \
|
|
{ \
|
|
iserr: \
|
|
__set_errno (INTERNAL_SYSCALL_ERRNO (sc_ret, sc_err)); \
|
|
sc_ret = -1L; \
|
|
} \
|
|
out: \
|
|
sc_ret; \
|
|
})
|
|
|
|
#endif /* SYSDEP_VDSO_LINUX_H */
|