From: Siddhesh Poyarekar <siddhesh@gotplt.org>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>,
libc-alpha@sourceware.org
Subject: Re: [PATCH v2 10/16] linux: Add support for clock_gettime64 vDSO
Date: Thu, 2 Jan 2020 18:33:01 +0530 [thread overview]
Message-ID: <7eacb7d2-dc71-28d9-b8b1-306acb8ff532@gotplt.org> (raw)
In-Reply-To: <20191217214728.2886-10-adhemerval.zanella@linaro.org>
On 18/12/19 3:17 am, Adhemerval Zanella wrote:
> Changes from previous version:
>
> - Rename HAVE_CLOCK_GETTIME_VSYSCALL to
> HAVE_CLOCK_GETTIME64_VSYSCALL on 64 bit time_t architectures.
>
> --
>
> No architecture currently defines the vDSO symbol. On archictures
typo
> with 64-bit time_t the HAVE_CLOCK_GETTIME_VSYSCALL is renamed to
> HAVE_CLOCK_GETTIME64_VSYSCALL, it simplifies clock_gettime code.
> ---
> sysdeps/unix/sysv/linux/aarch64/sysdep.h | 2 +-
> sysdeps/unix/sysv/linux/clock_gettime.c | 19 +++++++++++--------
> sysdeps/unix/sysv/linux/dl-vdso-setup.c | 4 ++++
> sysdeps/unix/sysv/linux/dl-vdso-setup.h | 3 +++
> sysdeps/unix/sysv/linux/powerpc/sysdep.h | 4 ++++
> sysdeps/unix/sysv/linux/riscv/sysdep.h | 2 +-
> sysdeps/unix/sysv/linux/s390/sysdep.h | 4 ++++
> sysdeps/unix/sysv/linux/sparc/sysdep.h | 6 +++++-
> sysdeps/unix/sysv/linux/x86_64/sysdep.h | 2 +-
> 9 files changed, 34 insertions(+), 12 deletions(-)
OK.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
>
> diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> index 53b515aab6..26aa2f9779 100644
> --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
> @@ -161,7 +161,7 @@
>
> /* List of system calls which are supported as vsyscalls. */
> # 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"
>
> /* Previously AArch64 used the generic version without the libc_hidden_def
> diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
> index e895812704..9be1f779e3 100644
> --- a/sysdeps/unix/sysv/linux/clock_gettime.c
> +++ b/sysdeps/unix/sysv/linux/clock_gettime.c
> @@ -30,21 +30,24 @@ int
> __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
> {
> #ifdef __ASSUME_TIME64_SYSCALLS
> - /* 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);
> + /* 64 bit ABIs or newer 32-bit ABIs that only support 64-bit time_t. */
> +# ifndef __NR_clock_gettime64
> +# define __NR_clock_gettime64 __NR_clock_gettime
> +# endif
> +# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
> + return INLINE_VSYSCALL (clock_gettime64, 2, 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
> + return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
> # endif
> #else
> int r;
> /* Old 32-bit ABI with possible 64-bit time_t support. */
> # 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);
> +# endif
> if (r == 0 || errno != ENOSYS)
> return r;
> # endif
> diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.c b/sysdeps/unix/sysv/linux/dl-vdso-setup.c
> index 1069879f1a..b0b692f78c 100644
> --- a/sysdeps/unix/sysv/linux/dl-vdso-setup.c
> +++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.c
> @@ -45,6 +45,10 @@
> PROCINFO_CLASS int (*_dl_vdso_clock_gettime) (clockid_t,
> struct timespec *) RELRO;
> #endif
> +# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
> +PROCINFO_CLASS int (*_dl_vdso_clock_gettime64) (clockid_t,
> + struct __timespec64 *) RELRO;
> +#endif
> # ifdef HAVE_GETTIMEOFDAY_VSYSCALL
> PROCINFO_CLASS int (*_dl_vdso_gettimeofday) (struct timeval *, void *) RELRO;
> #endif
> diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.h b/sysdeps/unix/sysv/linux/dl-vdso-setup.h
> index f4e76202fc..8a89e100c8 100644
> --- a/sysdeps/unix/sysv/linux/dl-vdso-setup.h
> +++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.h
> @@ -26,6 +26,9 @@ setup_vdso_pointers (void)
> #ifdef HAVE_CLOCK_GETTIME_VSYSCALL
> GLRO(dl_vdso_clock_gettime) = dl_vdso_vsym (HAVE_CLOCK_GETTIME_VSYSCALL);
> #endif
> +#ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
> + GLRO(dl_vdso_clock_gettime64) = dl_vdso_vsym (HAVE_CLOCK_GETTIME64_VSYSCALL);
> +#endif
> #ifdef HAVE_GETTIMEOFDAY_VSYSCALL
> GLRO(dl_vdso_gettimeofday) = dl_vdso_vsym (HAVE_GETTIMEOFDAY_VSYSCALL);
> #endif
> diff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
> index a29f286ad7..c42659a9c4 100644
> --- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h
> @@ -21,7 +21,11 @@
>
> /* List of system calls which are supported as vsyscalls. */
> #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"
> +#endif
> #define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"
> #define HAVE_TIME_VSYSCALL "__kernel_time"
> #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
> diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h
> index bfbcf60feb..7f43595cb0 100644
> --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h
> @@ -126,7 +126,7 @@
>
> /* List of system calls which are supported as vsyscalls. */
> # 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_GETCPU_VSYSCALL "__vdso_getcpu"
>
> diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h
> index 97d78e246c..030bd59ad0 100644
> --- a/sysdeps/unix/sysv/linux/s390/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/s390/sysdep.h
> @@ -21,6 +21,10 @@
>
> /* List of system calls which are supported as vsyscalls. */
> #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"
> +#endif
> #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
> #define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"
> diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h
> index f38144c912..739f361384 100644
> --- a/sysdeps/unix/sysv/linux/sparc/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h
> @@ -45,7 +45,11 @@
> # define VDSO_HASH 61765110
>
> /* List of system calls which are supported as vsyscalls. */
> -# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime"
> +# ifdef __arch64__
> +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime"
> +# else
> +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime"
> +# endif
> # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday"
>
> #undef INLINE_SYSCALL
> diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
> index 965fd4b851..57a64dce31 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
> +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
> @@ -374,7 +374,7 @@
> # define VDSO_HASH 61765110
>
> /* 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_TIME_VSYSCALL "__vdso_time"
> # define HAVE_GETCPU_VSYSCALL "__vdso_getcpu"
>
next prev parent reply other threads:[~2020-01-02 13:03 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 21:47 [PATCH v2 01/16] linux: Fix vDSO macros build with time64 interfaces Adhemerval Zanella
2019-12-17 21:47 ` [PATCH v2 02/16] x86: Make x32 use x86 time implementation Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 03/16] Remove vDSO support from make-syscall.sh Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 04/16] linux: Update x86 vDSO symbols Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 05/16] linux: Update mips " Adhemerval Zanella
2020-01-02 12:08 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 06/16] linux: Consolidate Linux gettimeofday Adhemerval Zanella
2019-12-18 8:46 ` Andreas Schwab
2019-12-18 14:50 ` Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 07/16] linux: Consolidate time implementation Adhemerval Zanella
2020-01-02 12:51 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH v3 08/16] elf: Enable relro for static build Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH v3 09/16] elf: Move vDSO setup to rtld (BZ#24967) Adhemerval Zanella
2020-01-02 12:55 ` Siddhesh Poyarekar
2020-01-02 13:00 ` Adhemerval Zanella
2020-01-07 16:13 ` [PATCH v3 09/16] elf: Move vDSO setup to rtld (BZ#24967) - regression found Lukasz Majewski
2020-01-07 19:40 ` Adhemerval Zanella
2019-12-17 21:47 ` [PATCH v2 10/16] linux: Add support for clock_gettime64 vDSO Adhemerval Zanella
2020-01-02 13:03 ` Siddhesh Poyarekar [this message]
2019-12-17 21:47 ` [PATCH 11/16] linux: Optimize fallback 32-bit clock_gettime Adhemerval Zanella
2019-12-18 8:53 ` Andreas Schwab
2019-12-18 14:58 ` Adhemerval Zanella
2020-01-02 13:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 12/16] linux: Enable vDSO clock_gettime64 for i386 Adhemerval Zanella
2020-01-02 13:08 ` Siddhesh Poyarekar
2020-01-02 13:08 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 13/16] linux: Enable vDSO clock_gettime64 for arm Adhemerval Zanella
2020-01-02 13:08 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 14/16] linux: Enable vDSO clock_gettime64 for mips Adhemerval Zanella
2019-12-18 15:33 ` Florian Weimer
2020-01-02 13:13 ` Siddhesh Poyarekar
2020-01-02 13:50 ` Adhemerval Zanella
2020-01-02 14:09 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH v2 15/16] linux: Add support for clock_getres64 vDSO Adhemerval Zanella
2020-01-02 13:15 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 16/16] linux: Optimize fallback 32-bit clock_getres Adhemerval Zanella
2019-12-18 8:56 ` Andreas Schwab
2019-12-18 14:58 ` Adhemerval Zanella
2019-12-18 15:02 ` Adhemerval Zanella
2020-01-02 13:16 ` Siddhesh Poyarekar
2020-01-02 12:07 ` [PATCH v2 01/16] linux: Fix vDSO macros build with time64 interfaces Siddhesh Poyarekar
2020-01-02 12:55 ` Adhemerval Zanella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7eacb7d2-dc71-28d9-b8b1-306acb8ff532@gotplt.org \
--to=siddhesh@gotplt.org \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).