Add a vDSO fastpath for clock_getres().
Signed-off-by: Thomas Weißschuh thomas.weissschuh@linutronix.de --- arch/sparc/include/asm/vdso/gettimeofday.h | 42 +++++++++++++++++++++++++++++- arch/sparc/vdso/vclock_gettime.c | 16 ++++++++++++ arch/sparc/vdso/vdso.lds.S | 2 ++ arch/sparc/vdso/vdso32/vdso32.lds.S | 2 ++ 4 files changed, 61 insertions(+), 1 deletion(-)
diff --git a/arch/sparc/include/asm/vdso/gettimeofday.h b/arch/sparc/include/asm/vdso/gettimeofday.h index a35875fba45470ba961a7df3ae52bc17d2a4a4a0..ccd2bda0a0c42ec826eb0464b7a41f98b4cea993 100644 --- a/arch/sparc/include/asm/vdso/gettimeofday.h +++ b/arch/sparc/include/asm/vdso/gettimeofday.h @@ -16,6 +16,8 @@
#include <linux/types.h>
+#define VDSO_HAS_CLOCK_GETRES 1 + #ifdef CONFIG_SPARC64 static __always_inline u64 vread_tick(void) { @@ -125,7 +127,45 @@ long clock_gettime32_fallback(clockid_t clock, struct old_timespec32 *ts) "0" (o0), "r" (o1) : SYSCALL_CLOBBERS); return o0; } -#endif + +static __always_inline +long clock_getres_fallback(clockid_t clock, struct __kernel_timespec *ts) +{ + register long num __asm__("g1") = __NR_clock_getres_time64; + register long o0 __asm__("o0") = clock; + register long o1 __asm__("o1") = (long) ts; + + __asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num), + "0" (o0), "r" (o1) : SYSCALL_CLOBBERS); + return o0; +} + +static __always_inline +long clock_getres32_fallback(clockid_t clock, struct old_timespec32 *ts) +{ + register long num __asm__("g1") = __NR_clock_getres; + register long o0 __asm__("o0") = clock; + register long o1 __asm__("o1") = (long) ts; + + __asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num), + "0" (o0), "r" (o1) : SYSCALL_CLOBBERS); + return o0; +} +#else /* !CONFIG_SPARC64 */ + +static __always_inline +long clock_getres_fallback(clockid_t clock, struct __kernel_timespec *ts) +{ + register long num __asm__("g1") = __NR_clock_getres; + register long o0 __asm__("o0") = clock; + register long o1 __asm__("o1") = (long) ts; + + __asm__ __volatile__(SYSCALL_STRING : "=r" (o0) : "r" (num), + "0" (o0), "r" (o1) : SYSCALL_CLOBBERS); + return o0; +} + +#endif /* CONFIG_SPARC64 */
static __always_inline long gettimeofday_fallback(struct __kernel_old_timeval *tv, struct timezone *tz) diff --git a/arch/sparc/vdso/vclock_gettime.c b/arch/sparc/vdso/vclock_gettime.c index 1d9859392e4cfd285349cf9155ca1fc25d3a7b41..3cadf94e6cee5392586755e97f629092d4bcab1e 100644 --- a/arch/sparc/vdso/vclock_gettime.c +++ b/arch/sparc/vdso/vclock_gettime.c @@ -38,6 +38,14 @@ int __vdso_clock_gettime(clockid_t clock, struct __kernel_timespec *ts) int clock_gettime(clockid_t, struct __kernel_timespec *) __weak __alias(__vdso_clock_gettime);
+int __vdso_clock_getres(clockid_t clock, struct __kernel_timespec *res) +{ + return __cvdso_clock_getres(clock, res); +} + +int clock_getres(clockid_t, struct __kernel_timespec *) + __weak __alias(__vdso_clock_getres); + #else
int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) @@ -56,4 +64,12 @@ int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts) int clock_gettime64(clockid_t, struct __kernel_timespec *) __weak __alias(__vdso_clock_gettime64);
+int __vdso_clock_getres(clockid_t clock, struct old_timespec32 *res) +{ + return __cvdso_clock_getres_time32(clock, res); +} + +int clock_getres(clockid_t, struct old_timespec32 *) + __weak __alias(__vdso_clock_getres); + #endif diff --git a/arch/sparc/vdso/vdso.lds.S b/arch/sparc/vdso/vdso.lds.S index f3caa29a331c58175b67ea60d7ac15cd467fe5ff..67c64a3adfa94f61356ce11081df442c18d6d8d5 100644 --- a/arch/sparc/vdso/vdso.lds.S +++ b/arch/sparc/vdso/vdso.lds.S @@ -20,6 +20,8 @@ VERSION { __vdso_clock_gettime; gettimeofday; __vdso_gettimeofday; + clock_getres; + __vdso_clock_getres; local: *; }; } diff --git a/arch/sparc/vdso/vdso32/vdso32.lds.S b/arch/sparc/vdso/vdso32/vdso32.lds.S index a14e4f77e6f2222b855df27cc7a0d0a4f98bd4ac..d09b1893ee1411f450df935335e6fe8d8c8b2632 100644 --- a/arch/sparc/vdso/vdso32/vdso32.lds.S +++ b/arch/sparc/vdso/vdso32/vdso32.lds.S @@ -21,6 +21,8 @@ VERSION { __vdso_clock_gettime64; gettimeofday; __vdso_gettimeofday; + clock_getres; + __vdso_clock_getres; local: *; }; }