The libc types are not necessarily compatible with the vDSO functions. Use the dedicated types from vdso_types.h instead.
Signed-off-by: Thomas Weißschuh <[email protected]> --- .../testing/selftests/vDSO/vdso_test_correctness.c | 45 ++++++++-------------- 1 file changed, 15 insertions(+), 30 deletions(-) diff --git a/tools/testing/selftests/vDSO/vdso_test_correctness.c b/tools/testing/selftests/vDSO/vdso_test_correctness.c index 66cd1d4c19872e78c0e608f5e0fb5215cf902b50..77bd77c32456617fc1ee240aebce57cf5b1cf89d 100644 --- a/tools/testing/selftests/vDSO/vdso_test_correctness.c +++ b/tools/testing/selftests/vDSO/vdso_test_correctness.c @@ -7,7 +7,6 @@ #define _GNU_SOURCE #include <stdio.h> -#include <sys/time.h> #include <time.h> #include <stdlib.h> #include <unistd.h> @@ -21,6 +20,7 @@ #include "vdso_config.h" #include "vdso_call.h" +#include "vdso_types.h" #include "../kselftest.h" static const char **name; @@ -29,29 +29,14 @@ static const char **name; #define __NR_clock_gettime64 403 #endif -#ifndef __kernel_timespec -struct __kernel_timespec { - long long tv_sec; - long long tv_nsec; -}; -#endif - /* max length of lines in /proc/self/maps - anything longer is skipped here */ #define MAPS_LINE_LEN 128 int nerrs = 0; -typedef int (*vgettime_t)(clockid_t, struct timespec *); - -vgettime_t vdso_clock_gettime; - -typedef int (*vgettime64_t)(clockid_t, struct __kernel_timespec *); - -vgettime64_t vdso_clock_gettime64; - -typedef long (*vgtod_t)(struct timeval *tv, struct timezone *tz); - -vgtod_t vdso_gettimeofday; +vdso_clock_gettime_t vdso_clock_gettime; +vdso_clock_gettime64_t vdso_clock_gettime64; +vdso_gettimeofday_t vdso_gettimeofday; typedef long (*getcpu_t)(unsigned *, unsigned *, void *); @@ -124,17 +109,17 @@ static void fill_function_pointers(void) vgetcpu = (getcpu_t) vsyscall_getcpu(); - vdso_clock_gettime = (vgettime_t)dlsym(vdso, name[1]); + vdso_clock_gettime = (vdso_clock_gettime_t)dlsym(vdso, name[1]); if (!vdso_clock_gettime) printf("Warning: failed to find clock_gettime in vDSO\n"); #if defined(VDSO_32BIT) - vdso_clock_gettime64 = (vgettime64_t)dlsym(vdso, name[5]); + vdso_clock_gettime64 = (vdso_clock_gettime64_t)dlsym(vdso, name[5]); if (!vdso_clock_gettime64) printf("Warning: failed to find clock_gettime64 in vDSO\n"); #endif - vdso_gettimeofday = (vgtod_t)dlsym(vdso, name[0]); + vdso_gettimeofday = (vdso_gettimeofday_t)dlsym(vdso, name[0]); if (!vdso_gettimeofday) printf("Warning: failed to find gettimeofday in vDSO\n"); @@ -146,17 +131,17 @@ static long sys_getcpu(unsigned * cpu, unsigned * node, return syscall(__NR_getcpu, cpu, node, cache); } -static inline int sys_clock_gettime(clockid_t id, struct timespec *ts) +static inline int sys_clock_gettime(__kernel_clockid_t id, struct __kernel_old_timespec *ts) { return syscall(__NR_clock_gettime, id, ts); } -static inline int sys_clock_gettime64(clockid_t id, struct __kernel_timespec *ts) +static inline int sys_clock_gettime64(__kernel_clockid_t id, struct __kernel_timespec *ts) { return syscall(__NR_clock_gettime64, id, ts); } -static inline int sys_gettimeofday(struct timeval *tv, struct timezone *tz) +static inline int sys_gettimeofday(struct __kernel_old_timeval *tv, struct kernel_timezone *tz) { return syscall(__NR_gettimeofday, tv, tz); } @@ -213,7 +198,7 @@ static void test_getcpu(void) } } -static bool ts_leq(const struct timespec *a, const struct timespec *b) +static bool ts_leq(const struct __kernel_old_timespec *a, const struct __kernel_old_timespec *b) { if (a->tv_sec != b->tv_sec) return a->tv_sec < b->tv_sec; @@ -230,7 +215,7 @@ static bool ts64_leq(const struct __kernel_timespec *a, return a->tv_nsec <= b->tv_nsec; } -static bool tv_leq(const struct timeval *a, const struct timeval *b) +static bool tv_leq(const struct __kernel_old_timeval *a, const struct __kernel_old_timeval *b) { if (a->tv_sec != b->tv_sec) return a->tv_sec < b->tv_sec; @@ -255,7 +240,7 @@ static char const * const clocknames[] = { static void test_one_clock_gettime(int clock, const char *name) { - struct timespec start, vdso, end; + struct __kernel_old_timespec start, vdso, end; int vdso_ret, end_ret; printf("[RUN]\tTesting clock_gettime for clock %s (%d)...\n", name, clock); @@ -379,8 +364,8 @@ static void test_clock_gettime64(void) static void test_gettimeofday(void) { - struct timeval start, vdso, end; - struct timezone sys_tz, vdso_tz; + struct __kernel_old_timeval start, vdso, end; + struct kernel_timezone sys_tz, vdso_tz; int vdso_ret, end_ret; if (!vdso_gettimeofday) -- 2.51.0
