| Message ID | 20190416161434.32691-6-vincenzo.frascino@arm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Fix vDSO clock_getres() | expand |
On Tue, Apr 16, 2019 at 05:14:34PM +0100, Vincenzo Frascino wrote: > The current version of the multiarch vDSO selftest verifies only > gettimeofday. > > Extend the vDSO selftest to clock_getres, to verify that the > syscall and the vDSO library function return the same information. > > The extension has been used to verify the hrtimer_resoltion fix. > > Cc: Shuah Khan <shuah@kernel.org> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> > --- > tools/testing/selftests/vDSO/Makefile | 2 + > .../selftests/vDSO/vdso_clock_getres.c | 108 ++++++++++++++++++ > 2 files changed, 110 insertions(+) > create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c Assuming this will go via Shuah's tree. Will
Hi Shuah, I did not see this patch in 5.2-rc1 and I was wondering if there is anything I can do to help with upstraming it. Please let me know. Thanks, Vincenzo On 16/04/2019 17:14, Vincenzo Frascino wrote: > The current version of the multiarch vDSO selftest verifies only > gettimeofday. > > Extend the vDSO selftest to clock_getres, to verify that the > syscall and the vDSO library function return the same information. > > The extension has been used to verify the hrtimer_resoltion fix. > > Cc: Shuah Khan <shuah@kernel.org> > Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> > --- > tools/testing/selftests/vDSO/Makefile | 2 + > .../selftests/vDSO/vdso_clock_getres.c | 108 ++++++++++++++++++ > 2 files changed, 110 insertions(+) > create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c > > diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile > index 9e03d61f52fd..d5c5bfdf1ac1 100644 > --- a/tools/testing/selftests/vDSO/Makefile > +++ b/tools/testing/selftests/vDSO/Makefile > @@ -5,6 +5,7 @@ uname_M := $(shell uname -m 2>/dev/null || echo not) > ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) > > TEST_GEN_PROGS := $(OUTPUT)/vdso_test > +TEST_GEN_PROGS += $(OUTPUT)/vdso_clock_getres > ifeq ($(ARCH),x86) > TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86 > endif > @@ -18,6 +19,7 @@ endif > > all: $(TEST_GEN_PROGS) > $(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c > +$(OUTPUT)/vdso_clock_getres: vdso_clock_getres.c > $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c > $(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \ > vdso_standalone_test_x86.c parse_vdso.c \ > diff --git a/tools/testing/selftests/vDSO/vdso_clock_getres.c b/tools/testing/selftests/vDSO/vdso_clock_getres.c > new file mode 100644 > index 000000000000..b1b9652972eb > --- /dev/null > +++ b/tools/testing/selftests/vDSO/vdso_clock_getres.c > @@ -0,0 +1,108 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * vdso_clock_getres.c: Sample code to test clock_getres. > + * Copyright (c) 2019 Arm Ltd. > + * > + * Compile with: > + * gcc -std=gnu99 vdso_clock_getres.c > + * > + * Tested on ARM, ARM64, MIPS32, x86 (32-bit and 64-bit), > + * Power (32-bit and 64-bit), S390x (32-bit and 64-bit). > + * Might work on other architectures. > + */ > + > +#define _GNU_SOURCE > +#include <elf.h> > +#include <err.h> > +#include <fcntl.h> > +#include <stdint.h> > +#include <stdio.h> > +#include <stdlib.h> > +#include <time.h> > +#include <sys/auxv.h> > +#include <sys/mman.h> > +#include <sys/time.h> > +#include <unistd.h> > +#include <sys/syscall.h> > + > +#include "../kselftest.h" > + > +static long syscall_clock_getres(clockid_t _clkid, struct timespec *_ts) > +{ > + long ret; > + > + ret = syscall(SYS_clock_getres, _clkid, _ts); > + > + return ret; > +} > + > +const char *vdso_clock_name[12] = { > + "CLOCK_REALTIME", > + "CLOCK_MONOTONIC", > + "CLOCK_PROCESS_CPUTIME_ID", > + "CLOCK_THREAD_CPUTIME_ID", > + "CLOCK_MONOTONIC_RAW", > + "CLOCK_REALTIME_COARSE", > + "CLOCK_MONOTONIC_COARSE", > + "CLOCK_BOOTTIME", > + "CLOCK_REALTIME_ALARM", > + "CLOCK_BOOTTIME_ALARM", > + "CLOCK_SGI_CYCLE", > + "CLOCK_TAI", > +}; > + > +/* > + * Macro to call clock_getres in vdso and by system call > + * with different values for clock_id. > + */ > +#define vdso_test_clock(clock_id) \ > +do { \ > + struct timespec x, y; \ > + printf("clock_id: %s", vdso_clock_name[clock_id]); \ > + clock_getres(clock_id, &x); \ > + syscall_clock_getres(clock_id, &y); \ > + if ((x.tv_sec != y.tv_sec) || (x.tv_sec != y.tv_sec)) { \ > + printf(" [FAIL]\n"); \ > + return KSFT_SKIP; \ > + } else { \ > + printf(" [PASS]\n"); \ > + } \ > +} while (0) > + > +int main(int argc, char **argv) > +{ > + > +#if _POSIX_TIMERS > 0 > + > +#ifdef CLOCK_REALTIME > + vdso_test_clock(CLOCK_REALTIME); > +#endif > + > +#ifdef CLOCK_BOOTTIME > + vdso_test_clock(CLOCK_BOOTTIME); > +#endif > + > +#ifdef CLOCK_TAI > + vdso_test_clock(CLOCK_TAI); > +#endif > + > +#ifdef CLOCK_REALTIME_COARSE > + vdso_test_clock(CLOCK_REALTIME_COARSE); > +#endif > + > +#ifdef CLOCK_MONOTONIC > + vdso_test_clock(CLOCK_MONOTONIC); > +#endif > + > +#ifdef CLOCK_MONOTONIC_RAW > + vdso_test_clock(CLOCK_MONOTONIC_RAW); > +#endif > + > +#ifdef CLOCK_MONOTONIC_COARSE > + vdso_test_clock(CLOCK_MONOTONIC_COARSE); > +#endif > + > +#endif > + > + return 0; > +} >
On 5/21/19 10:11 AM, Vincenzo Frascino wrote: > Hi Shuah, > > I did not see this patch in 5.2-rc1 and I was wondering if there is anything I > can do to help with upstraming it. > Thanks for the ping. Sorry about this. I saw that this part of a series and thought it depends on other patches and should go through another tree. Totally missed that Will suggested that I take it though selftests. My bad. I will get this in - I hope there are no dependencies with other trees. thanks, -- Shuah
On 5/21/19 10:24 AM, shuah wrote: > On 5/21/19 10:11 AM, Vincenzo Frascino wrote: >> Hi Shuah, >> >> I did not see this patch in 5.2-rc1 and I was wondering if there is >> anything I >> can do to help with upstraming it. >> > > Thanks for the ping. > > Sorry about this. I saw that this part of a series and thought it > depends on other patches and should go through another tree. > > Totally missed that Will suggested that I take it though selftests. > > My bad. I will get this in - I hope there are no dependencies with other > trees. > > thanks, > -- Shuah > > Can you take a look at the macro in this patch. It has checkpatch warn: WARNING: Macros with flow control statements should be avoided thanks, -- Shuah
Hi Shuah, On 21/05/2019 18:33, shuah wrote: > On 5/21/19 10:24 AM, shuah wrote: >> On 5/21/19 10:11 AM, Vincenzo Frascino wrote: >>> Hi Shuah, >>> >>> I did not see this patch in 5.2-rc1 and I was wondering if there is >>> anything I >>> can do to help with upstraming it. >>> >> >> Thanks for the ping. >> >> Sorry about this. I saw that this part of a series and thought it >> depends on other patches and should go through another tree. >> >> Totally missed that Will suggested that I take it though selftests. >> >> My bad. I will get this in - I hope there are no dependencies with other >> trees. >> >> thanks, >> -- Shuah >> >> > > Can you take a look at the macro in this patch. It has checkpatch > warn: > > WARNING: Macros with flow control statements should be avoided > > Ok, I will fix this in v3. > thanks, > -- Shuah >
diff --git a/tools/testing/selftests/vDSO/Makefile b/tools/testing/selftests/vDSO/Makefile index 9e03d61f52fd..d5c5bfdf1ac1 100644 --- a/tools/testing/selftests/vDSO/Makefile +++ b/tools/testing/selftests/vDSO/Makefile @@ -5,6 +5,7 @@ uname_M := $(shell uname -m 2>/dev/null || echo not) ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) TEST_GEN_PROGS := $(OUTPUT)/vdso_test +TEST_GEN_PROGS += $(OUTPUT)/vdso_clock_getres ifeq ($(ARCH),x86) TEST_GEN_PROGS += $(OUTPUT)/vdso_standalone_test_x86 endif @@ -18,6 +19,7 @@ endif all: $(TEST_GEN_PROGS) $(OUTPUT)/vdso_test: parse_vdso.c vdso_test.c +$(OUTPUT)/vdso_clock_getres: vdso_clock_getres.c $(OUTPUT)/vdso_standalone_test_x86: vdso_standalone_test_x86.c parse_vdso.c $(CC) $(CFLAGS) $(CFLAGS_vdso_standalone_test_x86) \ vdso_standalone_test_x86.c parse_vdso.c \ diff --git a/tools/testing/selftests/vDSO/vdso_clock_getres.c b/tools/testing/selftests/vDSO/vdso_clock_getres.c new file mode 100644 index 000000000000..b1b9652972eb --- /dev/null +++ b/tools/testing/selftests/vDSO/vdso_clock_getres.c @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * vdso_clock_getres.c: Sample code to test clock_getres. + * Copyright (c) 2019 Arm Ltd. + * + * Compile with: + * gcc -std=gnu99 vdso_clock_getres.c + * + * Tested on ARM, ARM64, MIPS32, x86 (32-bit and 64-bit), + * Power (32-bit and 64-bit), S390x (32-bit and 64-bit). + * Might work on other architectures. + */ + +#define _GNU_SOURCE +#include <elf.h> +#include <err.h> +#include <fcntl.h> +#include <stdint.h> +#include <stdio.h> +#include <stdlib.h> +#include <time.h> +#include <sys/auxv.h> +#include <sys/mman.h> +#include <sys/time.h> +#include <unistd.h> +#include <sys/syscall.h> + +#include "../kselftest.h" + +static long syscall_clock_getres(clockid_t _clkid, struct timespec *_ts) +{ + long ret; + + ret = syscall(SYS_clock_getres, _clkid, _ts); + + return ret; +} + +const char *vdso_clock_name[12] = { + "CLOCK_REALTIME", + "CLOCK_MONOTONIC", + "CLOCK_PROCESS_CPUTIME_ID", + "CLOCK_THREAD_CPUTIME_ID", + "CLOCK_MONOTONIC_RAW", + "CLOCK_REALTIME_COARSE", + "CLOCK_MONOTONIC_COARSE", + "CLOCK_BOOTTIME", + "CLOCK_REALTIME_ALARM", + "CLOCK_BOOTTIME_ALARM", + "CLOCK_SGI_CYCLE", + "CLOCK_TAI", +}; + +/* + * Macro to call clock_getres in vdso and by system call + * with different values for clock_id. + */ +#define vdso_test_clock(clock_id) \ +do { \ + struct timespec x, y; \ + printf("clock_id: %s", vdso_clock_name[clock_id]); \ + clock_getres(clock_id, &x); \ + syscall_clock_getres(clock_id, &y); \ + if ((x.tv_sec != y.tv_sec) || (x.tv_sec != y.tv_sec)) { \ + printf(" [FAIL]\n"); \ + return KSFT_SKIP; \ + } else { \ + printf(" [PASS]\n"); \ + } \ +} while (0) + +int main(int argc, char **argv) +{ + +#if _POSIX_TIMERS > 0 + +#ifdef CLOCK_REALTIME + vdso_test_clock(CLOCK_REALTIME); +#endif + +#ifdef CLOCK_BOOTTIME + vdso_test_clock(CLOCK_BOOTTIME); +#endif + +#ifdef CLOCK_TAI + vdso_test_clock(CLOCK_TAI); +#endif + +#ifdef CLOCK_REALTIME_COARSE + vdso_test_clock(CLOCK_REALTIME_COARSE); +#endif + +#ifdef CLOCK_MONOTONIC + vdso_test_clock(CLOCK_MONOTONIC); +#endif + +#ifdef CLOCK_MONOTONIC_RAW + vdso_test_clock(CLOCK_MONOTONIC_RAW); +#endif + +#ifdef CLOCK_MONOTONIC_COARSE + vdso_test_clock(CLOCK_MONOTONIC_COARSE); +#endif + +#endif + + return 0; +}
The current version of the multiarch vDSO selftest verifies only gettimeofday. Extend the vDSO selftest to clock_getres, to verify that the syscall and the vDSO library function return the same information. The extension has been used to verify the hrtimer_resoltion fix. Cc: Shuah Khan <shuah@kernel.org> Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com> --- tools/testing/selftests/vDSO/Makefile | 2 + .../selftests/vDSO/vdso_clock_getres.c | 108 ++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 tools/testing/selftests/vDSO/vdso_clock_getres.c