| Message ID | 20190129173659.27901-7-rafael.tinoco@linaro.org |
|---|---|
| State | Accepted |
| Commit | 5d1e3c3065eb76200d504e350f5c7335433d2284 |
| Headers | show |
| Series | [v4,1/8] lib: add tst_clock_settime() to tst_clocks.h | expand |
Hi! > + if (elapsed > DELTA_US && elapsed < (DELTA_US + DELTA_EPS)) > + tst_res(TPASS, "clock_settime(2): was able to advance time"); > + else > + tst_res(TFAIL, "clock_settime(2): could not advance time"); I've changed this to elapsed >= DELTA_US just in case. > + /* test 02: move backward */ > + > + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &begin); > + > + change = tst_timespec_sub_us(begin, DELTA_US); > + > + if (clock_settime(CLOCK_REALTIME, &change) != 0) > + tst_brk(TBROK | TTERRNO, "could not set realtime change"); > + > + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &end); > + > + elapsed = tst_timespec_diff_us(end, begin); > + > + if (~(elapsed) < DELTA_US && ~(elapsed) > (DELTA_US - DELTA_EPS)) > + tst_res(TPASS, "clock_settime(2): was able to recede time"); > + else > + tst_res(TFAIL, "clock_settime(2): could not recede time"); And here as well. > +} > + > +static struct tst_test test = { > + .test_all = verify_clock_settime, > + .needs_root = 1, > + .restore_wallclock = 1, > +}; > diff --git a/testcases/kernel/syscalls/clock_settime/clock_settime02.c b/testcases/kernel/syscalls/clock_settime/clock_settime02.c > new file mode 100644 > index 000000000..09c9dc4a4 > --- /dev/null > +++ b/testcases/kernel/syscalls/clock_settime/clock_settime02.c > @@ -0,0 +1,148 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright (c) 2019 Linaro Limited. All rights reserved. > + * Author: Rafael David Tinoco <rafael.tinoco@linaro.org> > + */ > + > +/* > + * Basic tests for errors of clock_settime(2) on different clock types. > + */ > + > +#include "config.h" > +#include "tst_test.h" > +#include "lapi/syscalls.h" > +#include "tst_timer.h" > +#include "tst_safe_clocks.h" > + > +#define DELTA_SEC 10 > +#define NSEC_PER_SEC (1000000000L) > +#define MAX_CLOCKS 16 > + > +struct test_case { > + clockid_t type; > + struct timespec newtime; > + int exp_err; > + int replace; > +}; > + > +struct test_case tc[] = { > + { /* case 01: REALTIME: timespec NULL */ > + .type = CLOCK_REALTIME, > + .exp_err = EFAULT, > + .replace = 1, > + }, > + { /* case 02: REALTIME: tv_sec = -1 */ > + .type = CLOCK_REALTIME, > + .newtime.tv_sec = -1, > + .exp_err = EINVAL, > + .replace = 1, > + }, > + { /* case 03: REALTIME: tv_nsec = -1 */ > + .type = CLOCK_REALTIME, > + .newtime.tv_nsec = -1, > + .exp_err = EINVAL, > + .replace = 1, > + }, > + { /* case 04: REALTIME: tv_nsec = 1s+1 */ > + .type = CLOCK_REALTIME, > + .newtime.tv_nsec = NSEC_PER_SEC + 1, > + .exp_err = EINVAL, > + .replace = 1, > + }, > + { /* case 05: MONOTONIC */ > + .type = CLOCK_MONOTONIC, > + .exp_err = EINVAL, > + }, > + { /* case 06: MAXCLOCK */ > + .type = MAX_CLOCKS, > + .exp_err = EINVAL, > + }, > + { /* case 07: MAXCLOCK+1 */ > + .type = MAX_CLOCKS + 1, > + .exp_err = EINVAL, > + }, > + /* Linux specific */ > + { /* case 08: CLOCK_MONOTONIC_COARSE */ > + .type = CLOCK_MONOTONIC_COARSE, > + .exp_err = EINVAL, > + }, > + { /* case 09: CLOCK_MONOTONIC_RAW */ > + .type = CLOCK_MONOTONIC_RAW, > + .exp_err = EINVAL, > + }, > + { /* case 10: CLOCK_BOOTTIME */ > + .type = CLOCK_BOOTTIME, > + .exp_err = EINVAL, > + }, > + { /* case 11: CLOCK_PROCESS_CPUTIME_ID */ > + .type = CLOCK_PROCESS_CPUTIME_ID, > + .exp_err = EINVAL, > + }, > + { /* case 12: CLOCK_THREAD_CPUTIME_ID */ > + .type = CLOCK_THREAD_CPUTIME_ID, > + .exp_err = EINVAL, > + }, > +}; > + > +/* > + * Some tests may cause libc to segfault when passing bad arguments. > + */ > +static int sys_clock_settime(clockid_t clk_id, struct timespec *tp) > +{ > + return tst_syscall(__NR_clock_settime, clk_id, tp); > +} > + > +static void verify_clock_settime(unsigned int i) > +{ > + struct timespec spec, *specptr; > + > + specptr = &spec; > + > + if (tc[i].replace == 0) { > + > + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, specptr); > + > + /* add 1 sec to wall clock */ > + specptr->tv_sec += 1; > + > + } else { > + > + /* use given time spec */ > + *specptr = tc[i].newtime; > + } > + > + /* bad pointer case */ > + if (tc[i].exp_err == EFAULT) > + specptr = tst_get_bad_addr(NULL); > + > + TEST(sys_clock_settime(tc[i].type, specptr)); > + > + if (TST_RET == -1) { > + > + if (tc[i].exp_err == TST_ERR) { > + > + tst_res(TPASS, "clock_settime(2): failed as expected"); I've made this message a bit more verbose, we print withc kind of errno we got and name of the clock. > + > + } else { > + > + tst_res(TFAIL | TTERRNO, "clock_settime(2): clock %s " > + "expected %s, failed with %s instead.", > + clock_name(tc[i].type), > + tst_strerrno(tc[i].exp_err)); The format string didn't match the parameters here, fixed that. > + } > + > + return; > + } > + > + tst_res(TFAIL | TTERRNO, "clock_settime(2): clock %s passed " > + "unexpectedly, expected %s", > + clock_name(tc[i].type), > + tst_strerrno(tc[i].exp_err)); > +} > + > +static struct tst_test test = { > + .test = verify_clock_settime, > + .tcnt = ARRAY_SIZE(tc), > + .needs_root = 1, > + .restore_wallclock = 1, > +}; > -- > 2.20.1 >
diff --git a/runtest/syscalls b/runtest/syscalls index 45fcebdd9..668c87cd1 100644 --- a/runtest/syscalls +++ b/runtest/syscalls @@ -79,6 +79,9 @@ clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02 clock_nanosleep2_01 clock_nanosleep2_01 +clock_settime01 clock_settime01 +clock_settime02 clock_settime02 + clone01 clone01 clone02 clone02 clone03 clone03 diff --git a/testcases/kernel/syscalls/clock_settime/.gitignore b/testcases/kernel/syscalls/clock_settime/.gitignore new file mode 100644 index 000000000..281217550 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/.gitignore @@ -0,0 +1,2 @@ +clock_settime01 +clock_settime02 diff --git a/testcases/kernel/syscalls/clock_settime/Makefile b/testcases/kernel/syscalls/clock_settime/Makefile new file mode 100644 index 000000000..e6674a6b2 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/Makefile @@ -0,0 +1,8 @@ +# Copyright (c) 2018 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +include $(top_srcdir)/include/mk/generic_leaf_target.mk diff --git a/testcases/kernel/syscalls/clock_settime/clock_settime01.c b/testcases/kernel/syscalls/clock_settime/clock_settime01.c new file mode 100644 index 000000000..227cfe38f --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/clock_settime01.c @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2019 Linaro Limited. All rights reserved. + * Author: Rafael David Tinoco <rafael.tinoco@linaro.org> + */ + +/* + * Basic test for clock_settime(2) on REALTIME clock: + * + * 1) advance DELTA_SEC seconds + * 2) go backwards DELTA_SEC seconds + * + * Restore wall clock at the end of test. + */ + +#include "config.h" +#include "tst_timer.h" +#include "tst_safe_clocks.h" +#include "tst_test.h" +#include "lapi/syscalls.h" + +#define DELTA_SEC 10 +#define DELTA_US (long long) (DELTA_SEC * 1000000) +#define DELTA_EPS (long long) (DELTA_US * 0.1) + +static void verify_clock_settime(void) +{ + long long elapsed; + struct timespec begin, change, end; + + /* test 01: move forward */ + + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &begin); + + change = tst_timespec_add_us(begin, DELTA_US); + + if (clock_settime(CLOCK_REALTIME, &change) != 0) + tst_brk(TBROK | TTERRNO, "could not set realtime change"); + + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &end); + + elapsed = tst_timespec_diff_us(end, begin); + + if (elapsed > DELTA_US && elapsed < (DELTA_US + DELTA_EPS)) + tst_res(TPASS, "clock_settime(2): was able to advance time"); + else + tst_res(TFAIL, "clock_settime(2): could not advance time"); + + /* test 02: move backward */ + + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &begin); + + change = tst_timespec_sub_us(begin, DELTA_US); + + if (clock_settime(CLOCK_REALTIME, &change) != 0) + tst_brk(TBROK | TTERRNO, "could not set realtime change"); + + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, &end); + + elapsed = tst_timespec_diff_us(end, begin); + + if (~(elapsed) < DELTA_US && ~(elapsed) > (DELTA_US - DELTA_EPS)) + tst_res(TPASS, "clock_settime(2): was able to recede time"); + else + tst_res(TFAIL, "clock_settime(2): could not recede time"); +} + +static struct tst_test test = { + .test_all = verify_clock_settime, + .needs_root = 1, + .restore_wallclock = 1, +}; diff --git a/testcases/kernel/syscalls/clock_settime/clock_settime02.c b/testcases/kernel/syscalls/clock_settime/clock_settime02.c new file mode 100644 index 000000000..09c9dc4a4 --- /dev/null +++ b/testcases/kernel/syscalls/clock_settime/clock_settime02.c @@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (c) 2019 Linaro Limited. All rights reserved. + * Author: Rafael David Tinoco <rafael.tinoco@linaro.org> + */ + +/* + * Basic tests for errors of clock_settime(2) on different clock types. + */ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" +#include "tst_timer.h" +#include "tst_safe_clocks.h" + +#define DELTA_SEC 10 +#define NSEC_PER_SEC (1000000000L) +#define MAX_CLOCKS 16 + +struct test_case { + clockid_t type; + struct timespec newtime; + int exp_err; + int replace; +}; + +struct test_case tc[] = { + { /* case 01: REALTIME: timespec NULL */ + .type = CLOCK_REALTIME, + .exp_err = EFAULT, + .replace = 1, + }, + { /* case 02: REALTIME: tv_sec = -1 */ + .type = CLOCK_REALTIME, + .newtime.tv_sec = -1, + .exp_err = EINVAL, + .replace = 1, + }, + { /* case 03: REALTIME: tv_nsec = -1 */ + .type = CLOCK_REALTIME, + .newtime.tv_nsec = -1, + .exp_err = EINVAL, + .replace = 1, + }, + { /* case 04: REALTIME: tv_nsec = 1s+1 */ + .type = CLOCK_REALTIME, + .newtime.tv_nsec = NSEC_PER_SEC + 1, + .exp_err = EINVAL, + .replace = 1, + }, + { /* case 05: MONOTONIC */ + .type = CLOCK_MONOTONIC, + .exp_err = EINVAL, + }, + { /* case 06: MAXCLOCK */ + .type = MAX_CLOCKS, + .exp_err = EINVAL, + }, + { /* case 07: MAXCLOCK+1 */ + .type = MAX_CLOCKS + 1, + .exp_err = EINVAL, + }, + /* Linux specific */ + { /* case 08: CLOCK_MONOTONIC_COARSE */ + .type = CLOCK_MONOTONIC_COARSE, + .exp_err = EINVAL, + }, + { /* case 09: CLOCK_MONOTONIC_RAW */ + .type = CLOCK_MONOTONIC_RAW, + .exp_err = EINVAL, + }, + { /* case 10: CLOCK_BOOTTIME */ + .type = CLOCK_BOOTTIME, + .exp_err = EINVAL, + }, + { /* case 11: CLOCK_PROCESS_CPUTIME_ID */ + .type = CLOCK_PROCESS_CPUTIME_ID, + .exp_err = EINVAL, + }, + { /* case 12: CLOCK_THREAD_CPUTIME_ID */ + .type = CLOCK_THREAD_CPUTIME_ID, + .exp_err = EINVAL, + }, +}; + +/* + * Some tests may cause libc to segfault when passing bad arguments. + */ +static int sys_clock_settime(clockid_t clk_id, struct timespec *tp) +{ + return tst_syscall(__NR_clock_settime, clk_id, tp); +} + +static void verify_clock_settime(unsigned int i) +{ + struct timespec spec, *specptr; + + specptr = &spec; + + if (tc[i].replace == 0) { + + SAFE_CLOCK_GETTIME(CLOCK_REALTIME, specptr); + + /* add 1 sec to wall clock */ + specptr->tv_sec += 1; + + } else { + + /* use given time spec */ + *specptr = tc[i].newtime; + } + + /* bad pointer case */ + if (tc[i].exp_err == EFAULT) + specptr = tst_get_bad_addr(NULL); + + TEST(sys_clock_settime(tc[i].type, specptr)); + + if (TST_RET == -1) { + + if (tc[i].exp_err == TST_ERR) { + + tst_res(TPASS, "clock_settime(2): failed as expected"); + + } else { + + tst_res(TFAIL | TTERRNO, "clock_settime(2): clock %s " + "expected %s, failed with %s instead.", + clock_name(tc[i].type), + tst_strerrno(tc[i].exp_err)); + } + + return; + } + + tst_res(TFAIL | TTERRNO, "clock_settime(2): clock %s passed " + "unexpectedly, expected %s", + clock_name(tc[i].type), + tst_strerrno(tc[i].exp_err)); +} + +static struct tst_test test = { + .test = verify_clock_settime, + .tcnt = ARRAY_SIZE(tc), + .needs_root = 1, + .restore_wallclock = 1, +};
Fixes: 343 clock_settime01 creates a new test, using new API, based on existing and older kernel/timers/clock_settime02 test. clock_settime02 creates another test based on older kernel/timers/clock_settime03 test. Both will be deleted in the next commits. Signed-off-by: Rafael David Tinoco <rafael.tinoco@linaro.org> --- runtest/syscalls | 3 + .../kernel/syscalls/clock_settime/.gitignore | 2 + .../kernel/syscalls/clock_settime/Makefile | 8 + .../syscalls/clock_settime/clock_settime01.c | 72 +++++++++ .../syscalls/clock_settime/clock_settime02.c | 148 ++++++++++++++++++ 5 files changed, 233 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_settime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_settime/Makefile create mode 100644 testcases/kernel/syscalls/clock_settime/clock_settime01.c create mode 100644 testcases/kernel/syscalls/clock_settime/clock_settime02.c