Skip to contentSkip to conversation

: arch: arm64: vdso: export the symbols for time()

PATCH In review Mark Salyzyn 2 participants 3 messages Jun 15, 2020 – Jun 23, 2020 1 message not in the archive arm64

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 : arch: arm64: vdso: export the symbols for time()

From: Chiawei Wang <[email protected]>

__cvdso_time() can be found in vDSO implementation, but the symbols for time() are not exported.

Export the symbols and run bionic-benchmarks.

BEFORE:
bionic-benchmarks32 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 83.6 ns 83.5 ns 8385964

bionic-benchmarks64 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 63.5 ns 63.4 ns 11037509

AFTER:
bionic-benchmarks32 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 8.57 ns 8.56 ns 81887312

bionic-benchmarks64 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 7.52 ns 7.51 ns 93253809

Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vincenzo Frascino <[email protected]>
Cc Enrico Weigelt <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alexios Zavras <[email protected]>

---
v2:
- add prototypes in both vgettimeofday.c
- use __kernel_old_time_t instead of time_t

---
 arch/arm64/include/asm/vdso/compat_gettimeofday.h | 12 ++++++++++++
 arch/arm64/include/asm/vdso/gettimeofday.h        | 10 ++++++++++
 arch/arm64/kernel/vdso/vdso.lds.S                 |  1 +
 arch/arm64/kernel/vdso/vgettimeofday.c            |  5 +++++
 arch/arm64/kernel/vdso32/vdso.lds.S               |  1 +
 arch/arm64/kernel/vdso32/vgettimeofday.c          |  5 +++++
 6 files changed, 34 insertions(+)
arch/arm64/include/asm/vdso/compat_gettimeofday.h +12 -0
index b6907ae78e53..d0a5655785bd 100644
@@ -14,8 +14,20 @@
 
 #define VDSO_HAS_CLOCK_GETRES		1
 
+#define VDSO_HAS_TIME			1
+
 #define BUILD_VDSO32			1
 
+extern int __vdso_clock_gettime(clockid_t clock,
+				struct old_timespec32 *ts);
+extern int __vdso_clock_gettime64(clockid_t clock,
+				  struct __kernel_timespec *ts);
+extern int __vdso_gettimeofday(struct __kernel_old_timeval *tv,
+			       struct timezone *tz);
+extern int __vdso_clock_getres(clockid_t clock_id,
+			       struct old_timespec32 *res);
+extern __kernel_old_time_t time(__kernel_old_time_t *time);
+
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,
 			  struct timezone *_tz)
arch/arm64/include/asm/vdso/gettimeofday.h +10 -0
index afba6ba332f8..e0dcf0dce6c0 100644
@@ -11,6 +11,16 @@
 
 #define VDSO_HAS_CLOCK_GETRES		1
 
+#define VDSO_HAS_TIME			1
+
+extern int __kernel_clock_gettime(clockid_t clock,
+				  struct __kernel_timespec *ts);
+extern int __kernel_gettimeofday(struct __kernel_old_timeval *tv,
+				 struct timezone *tz);
+extern int __kernel_clock_getres(clockid_t clock_id,
+				 struct __kernel_timespec *res);
+extern __kernel_old_time_t __vdso_time(__kernel_old_time_t *time);
+
 static __always_inline
 int gettimeofday_fallback(struct __kernel_old_timeval *_tv,
 			  struct timezone *_tz)
arch/arm64/kernel/vdso/vdso.lds.S +1 -0
index 7ad2d3a0cd48..61dddb0af1a5 100644
@@ -77,6 +77,7 @@ VERSION
 		__kernel_gettimeofday;
 		__kernel_clock_gettime;
 		__kernel_clock_getres;
+		__kernel_time;
 	local: *;
 	};
 }
arch/arm64/kernel/vdso/vgettimeofday.c +5 -0
index 4236cf34d7d9..9a9058ba1f89 100644
@@ -23,3 +23,8 @@ int __kernel_clock_getres(clockid_t clock_id,
 {
 	return __cvdso_clock_getres(clock_id, res);
 }
+
+__kernel_old_time_t __vdso_time(__kernel_old_time_t *time)
+{
+	return __cvdso_time(time);
+}
arch/arm64/kernel/vdso32/vdso.lds.S +1 -0
index a3944927eaeb..2222c78451b4 100644
@@ -69,6 +69,7 @@ VERSION
 		__kernel_rt_sigreturn_arm;
 		__kernel_rt_sigreturn_thumb;
 		__vdso_clock_gettime64;
+		__vdso_time;
 	local: *;
 	};
 }
arch/arm64/kernel/vdso32/vgettimeofday.c +5 -0
index 5acff29c5991..7eb988fa06d8 100644
@@ -30,6 +30,11 @@ int __vdso_clock_getres(clockid_t clock_id,
 	return __cvdso_clock_getres_time32(clock_id, res);
 }
 
+__kernel_old_time_t time(__kernel_old_time_t *time)
+{
+	return __cvdso_time(time);
+}
+
 /* Avoid unresolved references emitted by GCC */
 
 void __aeabi_unwind_cpp_pr0(void)
Signature · 1 line
2.27.0.290.gba653c62da-goog
maintainer
#1 lore raw
Quoted 33 lines · Mark Salyzyn

From: Chiawei Wang <[email protected]>

__cvdso_time() can be found in vDSO implementation, but the symbols for time() are not exported.

Export the symbols and run bionic-benchmarks.

BEFORE:
bionic-benchmarks32 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 83.6 ns 83.5 ns 8385964

bionic-benchmarks64 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 63.5 ns 63.4 ns 11037509

AFTER:
bionic-benchmarks32 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 8.57 ns 8.56 ns 81887312

bionic-benchmarks64 --bionic_extra BM_time_time
-----------------------------------------------------
Benchmark Time CPU Iterations
-----------------------------------------------------
BM_time_time 7.52 ns 7.51 ns 93253809

Quoted 12 lines
Cc Catalin Marinas <[email protected]>
Cc Will Deacon <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Vincenzo Frascino <[email protected]>
Cc Enrico Weigelt <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Alexios Zavras <[email protected]>

I don't understand this: neither arm nor arm64 offer the time() syscall afaict, so the C library should be implementing it in terms of clock_gettime() anyway, which _is_ implemented in the vDSO.

What's am I missing?

Will

A message that is not in the archive (sent off-list or not yet received): CAJ-C09j3ZZOZDPLiS+8-9Ypd1hYtfJY5LUym8z79xAUKS11VUA@mail.gmail.com

maintainer
#3 lore raw
Quoted 2 lines · Mark Salyzyn

time() in bionic libc will go an use vDSO interface to pick up this low-resolution timer.

But my point is it should _already_ be using the vDSO implementation of clock_gettime(), which should be plenty fast enough.

Will