[LTP] [PATCH V4 4/5] syscalls/clock_nanosleep: Add support for time64 tests
Viresh Kumar
viresh.kumar@linaro.org
Wed Apr 22 07:37:25 CEST 2020
This adds support for time64 tests to the existing clock_nanosleep()
syscall tests.
This also moves the tests from clock_nanosleep2/ directory to
clock_nanosleep/ directory as it was added mistakenly there, as there is
no clock_nanosleep2() syscall.
Also note that this patch doesn't update clock_nanosleep02.c test as
that uses the sample test pattern and will result in many other changes
to core libraries of LTP test suite.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
include/tst_timer.h | 24 +++++
runtest/syscalls | 2 +-
.../syscalls/clock_nanosleep/.gitignore | 1 +
.../clock_nanosleep/clock_nanosleep01.c | 102 +++++++++++++-----
.../clock_nanosleep/clock_nanosleep03.c | 68 ++++++++++--
.../clock_nanosleep/clock_nanosleep04.c | 90 ++++++++++++++++
.../syscalls/clock_nanosleep2/.gitignore | 1 -
.../kernel/syscalls/clock_nanosleep2/Makefile | 10 --
.../clock_nanosleep2/clock_nanosleep2_01.c | 45 --------
9 files changed, 253 insertions(+), 90 deletions(-)
create mode 100644 testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep04.c
delete mode 100644 testcases/kernel/syscalls/clock_nanosleep2/.gitignore
delete mode 100644 testcases/kernel/syscalls/clock_nanosleep2/Makefile
delete mode 100644 testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
diff --git a/include/tst_timer.h b/include/tst_timer.h
index df59c6aac0a5..ab7d65f73b7b 100644
--- a/include/tst_timer.h
+++ b/include/tst_timer.h
@@ -196,6 +196,30 @@ static inline int sys_clock_settime64(clockid_t clk_id, struct tst_ts *t)
return tst_syscall(__NR_clock_settime64, clk_id, tst_get_ts(t));
}
+static inline int libc_clock_nanosleep(clockid_t clk_id, int flags,
+ struct tst_ts *request,
+ struct tst_ts *remain)
+{
+ return clock_nanosleep(clk_id, flags, tst_get_ts(request),
+ tst_get_ts(remain));
+}
+
+static inline int sys_clock_nanosleep(clockid_t clk_id, int flags,
+ struct tst_ts *request,
+ struct tst_ts *remain)
+{
+ return tst_syscall(__NR_clock_nanosleep, clk_id, flags,
+ tst_get_ts(request), tst_get_ts(remain));
+}
+
+static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags,
+ struct tst_ts *request,
+ struct tst_ts *remain)
+{
+ return tst_syscall(__NR_clock_nanosleep_time64, clk_id, flags,
+ tst_get_ts(request), tst_get_ts(remain));
+}
+
/*
* tst_ts_nonzero return:
* 0: On success, i.e. timespec updated correctly.
diff --git a/runtest/syscalls b/runtest/syscalls
index 9bb72beb2287..bfd8d3dc32f2 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -90,8 +90,8 @@ clock_adjtime02 clock_adjtime02
clock_getres01 clock_getres01
clock_nanosleep01 clock_nanosleep01
clock_nanosleep02 clock_nanosleep02
-clock_nanosleep2_01 clock_nanosleep2_01
clock_nanosleep03 clock_nanosleep03
+clock_nanosleep04 clock_nanosleep04
clock_gettime01 clock_gettime01
clock_gettime02 clock_gettime02
diff --git a/testcases/kernel/syscalls/clock_nanosleep/.gitignore b/testcases/kernel/syscalls/clock_nanosleep/.gitignore
index 406897cded6d..1ab03a335f37 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/.gitignore
+++ b/testcases/kernel/syscalls/clock_nanosleep/.gitignore
@@ -1,3 +1,4 @@
/clock_nanosleep01
/clock_nanosleep02
/clock_nanosleep03
+/clock_nanosleep04
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
index d1fb0ee664c9..5add7226880a 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c
@@ -9,10 +9,10 @@
#include <limits.h>
-#include "lapi/syscalls.h"
+#include "tst_safe_clocks.h"
#include "tst_sig_proc.h"
#include "tst_timer.h"
-#include "tst_test.h"
+#include "lapi/abisize.h"
static void sighandler(int sig LTP_ATTRIBUTE_UNUSED)
{
@@ -30,7 +30,8 @@ struct test_case {
int ttype; /* test type (enum) */
const char *desc; /* test description (name) */
int flags; /* clock_nanosleep flags parameter */
- struct timespec rq;
+ long tv_sec;
+ long tv_nsec;
int exp_ret;
int exp_err;
};
@@ -46,45 +47,76 @@ static struct test_case tcase[] = {
TYPE_NAME(NORMAL),
.clk_id = CLOCK_REALTIME,
.flags = 0,
- .rq = (struct timespec) {.tv_sec = 0, .tv_nsec = -1},
- .exp_ret = EINVAL,
- .exp_err = 0,
+ .tv_sec = 0,
+ .tv_nsec = -1,
+ .exp_ret = -1,
+ .exp_err = EINVAL,
},
{
TYPE_NAME(NORMAL),
.clk_id = CLOCK_REALTIME,
.flags = 0,
- .rq = (struct timespec) {.tv_sec = 0, .tv_nsec = 1000000000},
- .exp_ret = EINVAL,
- .exp_err = 0,
+ .tv_sec = 0,
+ .tv_nsec = 1000000000,
+ .exp_ret = -1,
+ .exp_err = EINVAL,
},
{
TYPE_NAME(NORMAL),
.clk_id = CLOCK_THREAD_CPUTIME_ID,
.flags = 0,
- .rq = (struct timespec) {.tv_sec = 0, .tv_nsec = 500000000},
- .exp_ret = EINVAL,
- .exp_err = 0,
+ .tv_sec = 0,
+ .tv_nsec = 500000000,
+ .exp_ret = -1,
+ .exp_err = ENOTSUP,
},
{
TYPE_NAME(SEND_SIGINT),
.clk_id = CLOCK_REALTIME,
.flags = 0,
- .rq = (struct timespec) {.tv_sec = 10, .tv_nsec = 0},
- .exp_ret = EINTR,
- .exp_err = 0,
+ .tv_sec = 10,
+ .tv_nsec = 0,
+ .exp_ret = -1,
+ .exp_err = EINTR,
},
};
+static struct tst_ts rq;
+
+static struct test_variants {
+ int (*func)(clockid_t clock_id, int flags,
+ struct tst_ts *request,
+ struct tst_ts *remain);
+ enum tst_ts_type type;
+ char *desc;
+} variants[] = {
+#if defined(TST_ABI32)
+ { .func = libc_clock_nanosleep, .type = TST_LIBC_TIMESPEC, .desc = "vDSO or syscall with libc spec"},
+ { .func = sys_clock_nanosleep, .type = TST_LIBC_TIMESPEC, .desc = "syscall with libc spec"},
+ { .func = sys_clock_nanosleep, .type = TST_KERN_OLD_TIMESPEC, .desc = "syscall with kernel spec32"},
+#endif
+
+#if defined(TST_ABI64)
+ { .func = sys_clock_nanosleep, .type = TST_KERN_TIMESPEC, .desc = "syscall with kernel spec64"},
+#endif
+
+#if (__NR_clock_nanosleep_time64 != __LTP__NR_INVALID_SYSCALL)
+ { .func = sys_clock_nanosleep64, .type = TST_KERN_TIMESPEC, .desc = "syscall time64 with kernel spec64"},
+#endif
+};
+
void setup(void)
{
+ rq.type = variants[tst_variant].type;
+ tst_res(TINFO, "Testing variant: %s", variants[tst_variant].desc);
SAFE_SIGNAL(SIGINT, sighandler);
}
static void do_test(unsigned int i)
{
+ struct test_variants *tv = &variants[tst_variant];
struct test_case *tc = &tcase[i];
- struct timespec rm = {0};
+ struct tst_ts rm = {.type = tv->type, };
pid_t pid = 0;
tst_res(TINFO, "case %s", tc->desc);
@@ -92,7 +124,29 @@ static void do_test(unsigned int i)
if (tc->ttype == SEND_SIGINT)
pid = create_sig_proc(SIGINT, 40, 500000);
- TEST(clock_nanosleep(tc->clk_id, tc->flags, &tc->rq, &rm));
+ tst_ts_set_sec(&rq, tc->tv_sec);
+ tst_ts_set_nsec(&rq, tc->tv_nsec);
+
+ TEST(tv->func(tc->clk_id, tc->flags, &rq, &rm));
+
+ if (tv->func == libc_clock_nanosleep) {
+ /*
+ * The return value and error number are differently set for
+ * libc syscall as compared to kernel syscall.
+ */
+ if (TST_RET) {
+ TST_ERR = TST_RET;
+ TST_RET = -1;
+ }
+
+ /*
+ * nsleep isn't implemented by kernelf or
+ * CLOCK_THREAD_CPUTIME_ID and it returns ENOTSUP, but libc
+ * changes that error value to EINVAL.
+ */
+ if (tc->clk_id == CLOCK_THREAD_CPUTIME_ID)
+ tc->exp_err = EINVAL;
+ }
if (pid) {
SAFE_KILL(pid, SIGTERM);
@@ -100,12 +154,10 @@ static void do_test(unsigned int i)
}
if (tc->ttype == SEND_SIGINT) {
- long long expect_ms = tst_timespec_to_ms(tc->rq);
- long long remain_ms = tst_timespec_to_ms(rm);
-
- tst_res(TINFO, "remain time: %lds %ldns", rm.tv_sec, rm.tv_nsec);
+ long long expect_ms = tst_ts_to_ms(rq);
+ long long remain_ms = tst_ts_to_ms(rm);
- if (!rm.tv_sec && !rm.tv_nsec) {
+ if (tst_ts_nonzero(&rm)) {
tst_res(TFAIL | TTERRNO,
"The clock_nanosleep() haven't updated"
" timestamp with remaining time");
@@ -120,20 +172,20 @@ static void do_test(unsigned int i)
}
}
- if (TST_RET != tc->exp_ret) {
+ if ((TST_RET != tc->exp_ret) || (TST_ERR != tc->exp_err)) {
tst_res(TFAIL | TTERRNO, "returned %ld, expected %d,"
" expected errno: %s (%d)", TST_RET,
tc->exp_ret, tst_strerrno(tc->exp_err), tc->exp_err);
return;
}
- tst_res(TPASS, "returned %s (%ld)",
- tst_strerrno(TST_RET), TST_RET);
+ tst_res(TPASS, "returned %s (%d)", tst_strerrno(TST_ERR), TST_ERR);
}
static struct tst_test test = {
.tcnt = ARRAY_SIZE(tcase),
.test = do_test,
+ .test_variants = ARRAY_SIZE(variants),
.setup = setup,
.forks_child = 1,
};
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c
index 68773d59e346..4cd95f087889 100644
--- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep03.c
@@ -19,33 +19,85 @@
#include "tst_safe_clocks.h"
#include "tst_timer.h"
#include "lapi/namespaces_constants.h"
-#include "tst_test.h"
+#include "lapi/abisize.h"
#define OFFSET_S 10
#define SLEEP_US 100000
+static struct test_variants {
+ int (*gettime)(clockid_t clk_id, struct tst_ts *spec);
+ int (*func)(clockid_t clock_id, int flags,
+ struct tst_ts *request,
+ struct tst_ts *remain);
+ enum tst_ts_type type;
+ char *desc;
+} variants[] = {
+#if defined(TST_ABI32)
+ { .gettime = libc_clock_gettime, .func = libc_clock_nanosleep, .type = TST_LIBC_TIMESPEC, .desc = "vDSO or syscall with libc spec"},
+ { .gettime = sys_clock_gettime, .func = sys_clock_nanosleep, .type = TST_LIBC_TIMESPEC, .desc = "syscall with libc spec"},
+ { .gettime = sys_clock_gettime, .func = sys_clock_nanosleep, .type = TST_KERN_OLD_TIMESPEC, .desc = "syscall with kernel spec32"},
+#endif
+
+#if defined(TST_ABI64)
+ { .gettime = sys_clock_gettime, .func = sys_clock_nanosleep, .type = TST_KERN_TIMESPEC, .desc = "syscall with kernel spec64"},
+#endif
+
+#if (__NR_clock_nanosleep_time64 != __LTP__NR_INVALID_SYSCALL)
+ { .gettime = sys_clock_gettime64, .func = sys_clock_nanosleep64, .type = TST_KERN_TIMESPEC, .desc = "syscall time64 with kernel spec64"},
+#endif
+};
+
static void verify_clock_nanosleep(void)
{
- struct timespec start, end, sleep_abs;
+ struct test_variants *tv = &variants[tst_variant];
+ struct tst_ts start, end, sleep_abs;
+
+ tst_res(TINFO, "Testing variant: %s", tv->desc);
+
+ start.type = end.type = sleep_abs.type = tv->type;
SAFE_UNSHARE(CLONE_NEWTIME);
SAFE_FILE_PRINTF("/proc/self/timens_offsets", "%d %d 0", CLOCK_MONOTONIC, OFFSET_S);
- SAFE_CLOCK_GETTIME(CLOCK_MONOTONIC, &start);
+ TEST(tv->gettime(CLOCK_MONOTONIC, &start));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "clock_gettime(2) failed for clock %s",
+ tst_clock_name(CLOCK_MONOTONIC));
+ return;
+ }
- sleep_abs = tst_timespec_add_us(start, 1000000 * OFFSET_S + SLEEP_US);
+ sleep_abs = tst_ts_add_us(start, 1000000 * OFFSET_S + SLEEP_US);
if (!SAFE_FORK()) {
- clock_nanosleep(CLOCK_MONOTONIC, TIMER_ABSTIME, &sleep_abs, NULL);
+ TEST(tv->func(CLOCK_MONOTONIC, TIMER_ABSTIME, &sleep_abs, NULL));
+ /*
+ * The return value and error number are differently set for
+ * libc syscall as compared to kernel syscall.
+ */
+ if ((tv->func == libc_clock_nanosleep) && TST_RET) {
+ TST_ERR = TST_RET;
+ TST_RET = -1;
+ }
+
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "clock_nanosleep(2) failed for clock %s",
+ tst_clock_name(CLOCK_MONOTONIC));
+ }
+
exit(0);
}
SAFE_WAIT(NULL);
- SAFE_CLOCK_GETTIME(CLOCK_MONOTONIC, &end);
+ TEST(tv->gettime(CLOCK_MONOTONIC, &end));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "clock_gettime(2) failed for clock %s",
+ tst_clock_name(CLOCK_MONOTONIC));
+ return;
+ }
- long long diff = tst_timespec_diff_us(end, start);
+ long long diff = tst_ts_diff_us(end, start);
if (diff > 5 * SLEEP_US) {
tst_res(TFAIL, "clock_nanosleep() slept too long %lli", diff);
@@ -62,11 +114,11 @@ static void verify_clock_nanosleep(void)
static struct tst_test test = {
.test_all = verify_clock_nanosleep,
+ .test_variants = ARRAY_SIZE(variants),
.needs_root = 1,
.forks_child = 1,
.needs_kconfigs = (const char *[]) {
"CONFIG_TIME_NS=y",
NULL
}
-
};
diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep04.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep04.c
new file mode 100644
index 000000000000..9d69773d65f7
--- /dev/null
+++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep04.c
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) M. Koehrer <mathias_koehrer@arcor.de>, 2009
+ * Copyright (C) 2017 Cyril Hrubis <chrubis@suse.cz>
+ */
+
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
+#include "tst_safe_clocks.h"
+#include "tst_timer.h"
+#include "lapi/abisize.h"
+
+#define NSEC_IN_SEC 1000000000
+
+static clockid_t tcase[] = {
+ CLOCK_MONOTONIC,
+ CLOCK_REALTIME,
+};
+
+static struct test_variants {
+ int (*gettime)(clockid_t clk_id, struct tst_ts *spec);
+ int (*func)(clockid_t clock_id, int flags,
+ struct tst_ts *request,
+ struct tst_ts *remain);
+ enum tst_ts_type type;
+ char *desc;
+} variants[] = {
+#if defined(TST_ABI32)
+ { .gettime = libc_clock_gettime, .func = libc_clock_nanosleep, .type = TST_LIBC_TIMESPEC, .desc = "vDSO or syscall with libc spec"},
+ { .gettime = sys_clock_gettime, .func = sys_clock_nanosleep, .type = TST_LIBC_TIMESPEC, .desc = "syscall with libc spec"},
+ { .gettime = sys_clock_gettime, .func = sys_clock_nanosleep, .type = TST_KERN_OLD_TIMESPEC, .desc = "syscall with kernel spec32"},
+#endif
+
+#if defined(TST_ABI64)
+ { .gettime = sys_clock_gettime, .func = sys_clock_nanosleep, .type = TST_KERN_TIMESPEC, .desc = "syscall with kernel spec64"},
+#endif
+
+#if (__NR_clock_nanosleep_time64 != __LTP__NR_INVALID_SYSCALL)
+ { .gettime = sys_clock_gettime64, .func = sys_clock_nanosleep64, .type = TST_KERN_TIMESPEC, .desc = "syscall time64 with kernel spec64"},
+#endif
+};
+
+void setup(void)
+{
+ tst_res(TINFO, "Testing variant: %s", variants[tst_variant].desc);
+}
+
+static void do_test(unsigned int i)
+{
+ struct test_variants *tv = &variants[tst_variant];
+ struct tst_ts ts = {.type = tv->type};
+ long long sec, nsec;
+
+ TEST(tv->gettime(tcase[i], &ts));
+ if (TST_RET == -1) {
+ tst_res(TFAIL | TTERRNO, "clock_gettime(2) failed for clock %s",
+ tst_clock_name(tcase[i]));
+ return;
+ }
+
+ sec = tst_ts_get_sec(ts);
+ nsec = tst_ts_get_nsec(ts);
+
+ nsec += NSEC_IN_SEC/10;
+ if (nsec >= NSEC_IN_SEC) {
+ sec += 1;
+ nsec %= NSEC_IN_SEC;
+ }
+
+ tst_ts_set_sec(&ts, sec);
+ tst_ts_set_nsec(&ts, nsec);
+
+ TEST(tv->func(tcase[i], TIMER_ABSTIME, &ts, NULL));
+
+ if (TST_RET) {
+ tst_res(TFAIL | TTERRNO, "clock_nanosleep(2) failed for clock %s",
+ tst_clock_name(tcase[i]));
+ }
+
+ tst_res(TPASS, "clock_nanosleep(2) passed for clock %s",
+ tst_clock_name(tcase[i]));
+}
+
+static struct tst_test test = {
+ .tcnt = ARRAY_SIZE(tcase),
+ .test = do_test,
+ .test_variants = ARRAY_SIZE(variants),
+ .setup = setup,
+};
diff --git a/testcases/kernel/syscalls/clock_nanosleep2/.gitignore b/testcases/kernel/syscalls/clock_nanosleep2/.gitignore
deleted file mode 100644
index 5be9cd0e8a8d..000000000000
--- a/testcases/kernel/syscalls/clock_nanosleep2/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/clock_nanosleep2_01
diff --git a/testcases/kernel/syscalls/clock_nanosleep2/Makefile b/testcases/kernel/syscalls/clock_nanosleep2/Makefile
deleted file mode 100644
index 262eef71b02b..000000000000
--- a/testcases/kernel/syscalls/clock_nanosleep2/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (c) International Business Machines Corp., 2009
-
-top_srcdir ?= ../../../..
-
-include $(top_srcdir)/include/mk/testcases.mk
-
-LDLIBS += -lpthread -lrt
-
-include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
deleted file mode 100644
index d82d74d2d9fa..000000000000
--- a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Copyright (c) M. Koehrer <mathias_koehrer@arcor.de>, 2009
- * Copyright (C) 2017 Cyril Hrubis <chrubis@suse.cz>
- */
-
-#include <stdio.h>
-#include <time.h>
-#include <unistd.h>
-#include <sys/syscall.h>
-
-#include "tst_test.h"
-#include "lapi/syscalls.h"
-
-#define NSEC_IN_SEC 1000000000
-
-const clockid_t CLOCK_TO_USE = CLOCK_MONOTONIC;
-static int clock_nanosleep2(clockid_t clock_id, int flags,
- const struct timespec *req, struct timespec *rem)
-{
- return tst_syscall(__NR_clock_nanosleep, clock_id, flags, req, rem);
-}
-
-static void verify_clock_nanosleep2(void)
-{
- struct timespec ts;
-
- clock_gettime(CLOCK_TO_USE, &ts);
- ts.tv_nsec += NSEC_IN_SEC/10;
- if (ts.tv_nsec >= NSEC_IN_SEC) {
- ts.tv_sec += 1;
- ts.tv_nsec %= NSEC_IN_SEC;
- }
-
- TEST(clock_nanosleep2(CLOCK_TO_USE, TIMER_ABSTIME, &ts, NULL));
-
- if (TST_RET)
- tst_res(TFAIL | TTERRNO, "clock_nanosleep2() failed");
- else
- tst_res(TPASS, "clock_nanosleep2() passed");
-}
-
-static struct tst_test test = {
- .test_all = verify_clock_nanosleep2,
-};
--
2.25.0.rc1.19.g042ed3e048af
More information about the ltp
mailing list