[08/12] Add support for clock_gettime64 vDSO

Message ID	20191212181614.31782-8-adhemerval.zanella@linaro.org
State	New
Headers	show Return-Path: <libc-alpha-return-108021-incoming=patchwork.ozlabs.org@sourceware.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=EwhNzkvvTpUcex9TolVLX3S2uT1zGN7 +GFwjOmUSgacdcsB/W76ZOW7aGr9/hrHzaErJ9r47pys3xquyv87hCi0UPCOPp8P hIaU7e+gPgaQPutm8chdumCOEWio34z2xXgWJrzYCq8u06uA+eb/qPI3Wk4+wYk8 CTZK0oLakwx4= Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk Sender: libc-alpha-owner@sourceware.org From: Adhemerval Zanella <adhemerval.zanella@linaro.org> To: libc-alpha@sourceware.org Subject: [PATCH 08/12] Add support for clock_gettime64 vDSO Date: Thu, 12 Dec 2019 15:16:10 -0300 Message-Id: <20191212181614.31782-8-adhemerval.zanella@linaro.org> In-Reply-To: <20191212181614.31782-1-adhemerval.zanella@linaro.org> References: <20191212181614.31782-1-adhemerval.zanella@linaro.org>
Series	[01/12] linux: Fix vDSO macros build with time64 interfaces \| expand [01/12] linux: Fix vDSO macros build with time64 interfaces [v2,02/12] linux: Update x86 vDSO symbols [03/12] x86: Make x32 use x86 time implementation [04/12] linux: Update mips vDSO symbols [05/12] Remove vDSO support from make-syscall.sh [v2,06/12] elf: Enable relro for static build [v2,07/12] elf: Move vDSO setup to rtld (BZ#24967) [08/12] Add support for clock_gettime64 vDSO [09/12] Enable vDSO clock_gettime64 for i386 [10/12] Enable vDSO clock_gettime64 for arm [11/12] Enable vDSO clock_gettime64 for mips [12/12] Add support for clock_getres64 vDSO

Message ID

20191212181614.31782-8-adhemerval.zanella@linaro.org

State

New

Headers

DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id
	:list-unsubscribe:list-subscribe:list-archive:list-post
	:list-help:sender:from:to:subject:date:message-id:in-reply-to
	:references; q=dns; s=default; b=EwhNzkvvTpUcex9TolVLX3S2uT1zGN7
	+GFwjOmUSgacdcsB/W76ZOW7aGr9/hrHzaErJ9r47pys3xquyv87hCi0UPCOPp8P
	hIaU7e+gPgaQPutm8chdumCOEWio34z2xXgWJrzYCq8u06uA+eb/qPI3Wk4+wYk8
	CTZK0oLakwx4=
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
Sender: libc-alpha-owner@sourceware.org
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 08/12] Add support for clock_gettime64 vDSO
Date: Thu, 12 Dec 2019 15:16:10 -0300
Message-Id: <20191212181614.31782-8-adhemerval.zanella@linaro.org>
In-Reply-To: <20191212181614.31782-1-adhemerval.zanella@linaro.org>
References: <20191212181614.31782-1-adhemerval.zanella@linaro.org>

Series

[01/12] linux: Fix vDSO macros build with time64 interfaces | expand

Commit Message

Adhemerval Zanella Dec. 12, 2019, 6:16 p.m. UTC

No architecture currently defines the vDSO symbol.
---
 sysdeps/unix/sysv/linux/clock_gettime.c | 12 ++++++++++--
 sysdeps/unix/sysv/linux/dl-vdso-setup.c |  4 ++++
 sysdeps/unix/sysv/linux/dl-vdso-setup.h |  3 +++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c
index 4ea56c9a4b..43e378aa83 100644
--- a/sysdeps/unix/sysv/linux/clock_gettime.c
+++ b/sysdeps/unix/sysv/linux/clock_gettime.c
@@ -34,7 +34,11 @@  __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
-  r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
+#  ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
+  r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
+#  endif
+  if (r == -1)
+    r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
 # else
 #  ifdef HAVE_CLOCK_GETTIME_VSYSCALL
   r = INLINE_VSYSCALL (clock_gettime, 2, clock_id, tp);
@@ -45,7 +49,11 @@  __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
 #else
   /* Old 32-bit ABI with possible 64-bit time_t support.  */
 # ifdef __NR_clock_gettime64
-  r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
+#  ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
+  r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
+#  endif
+  if (r == -1)
+    r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
 # endif
   if (r == -1)
     {
diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.c b/sysdeps/unix/sysv/linux/dl-vdso-setup.c
index 1069879f1a..d19a4af6c1 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_GETTIME_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

[08/12] Add support for clock_gettime64 vDSO

Commit Message

Patch