tst_timer: Add support for kernel's 64 bit timespec

The Linux kernel defined a new 64bit timespec some time back and this
patch makes necessary changes to tst_timer.h in order to prepare for
supporting changes in syscalls testcases.

A new enum is introduced to keep a list of all timespec variants we need
to support and all the timespec routines are updated to support the
listed variants.

In order to not do unnecessary changes to other syscall tests, the name
of the earlier routines are kept as is.

The LTP testsuite is build tested with this patch and nothing fails to
compile.

Signed-off-by: Viresh Kumar <[email protected]>
Signed-off-by: Cyril Hrubis <[email protected]>

Author: vireshk

include/tst_timer.h

@@ -25,6 +25,7 @@ test18
 test19
 test20
 tst_expiration_timer
+test_timer
 test_exec
 test_exec_child
 test_kconfig

lib/newlib_tests/.gitignore

@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2020 Cyril Hrubis <[email protected]>
+ */
+
+/*
+ * Tests for include/tst_timer.h
+ */
+
+#include "tst_test.h"
+#include "tst_timer.h"
+
+#define VAL_MS 1001
+#define VAL_US 1001000
+
+static void test_diff(enum tst_ts_type type)
+{
+	struct tst_ts ts1, ts2;
+	long long diff;
+
+	ts1 = tst_ts_from_ms(type, VAL_MS);
+	ts2 = tst_ts_from_us(type, VAL_US);
+
+	diff = tst_ts_diff_ns(ts1, ts2);
+
+	if (diff == 0)
+		tst_res(TPASS, "ns_diff = 0");
+	else
+		tst_res(TFAIL, "ns_diff = %lli", diff);
+
+	diff = tst_ts_diff_ns(ts1, ts2);
+
+	if (diff == 0)
+		tst_res(TPASS, "us_diff = 0");
+	else
+		tst_res(TFAIL, "us_diff = %lli", diff);
+
+	diff = tst_ts_diff_ms(ts1, ts2);
+
+	if (diff == 0)
+		tst_res(TPASS, "ms_diff = 0");
+	else
+		tst_res(TFAIL, "ms_diff = %lli", diff);
+}
+
+static void test_lt(enum tst_ts_type type)
+{
+	struct tst_ts ts1, ts2;
+
+	ts1 = tst_ts_from_ms(type, VAL_MS);
+	ts2 = tst_ts_from_us(type, VAL_US + 1);
+
+	if (tst_ts_lt(ts1, ts2))
+		tst_res(TPASS, "ts1 < ts2");
+	else
+		tst_res(TFAIL, "ts1 >= ts2");
+
+	ts1 = tst_ts_add_us(ts1, 1);
+
+	if (tst_ts_lt(ts1, ts2))
+		tst_res(TFAIL, "ts1 < ts2");
+	else
+		tst_res(TPASS, "ts1 >= ts2");
+
+	ts1 = tst_ts_add_us(ts1, 1);
+
+	if (tst_ts_lt(ts1, ts2))
+		tst_res(TFAIL, "ts1 < ts2");
+	else
+		tst_res(TPASS, "ts1 >= ts2");
+}
+
+static void test_add_sub(enum tst_ts_type type)
+{
+	struct tst_ts ts;
+
+	ts = tst_ts_from_ns(type, 999999000);
+	ts = tst_ts_add_us(ts, 1);
+
+	long long sec = tst_ts_get_sec(ts);
+	long long nsec = tst_ts_get_nsec(ts);
+
+	/* Check that result was normalized */
+	if (sec != 1 || nsec != 0)
+		tst_res(TFAIL, "sec = %lli, nsec = %lli", sec, nsec);
+	else
+		tst_res(TPASS, "sec = %lli, nsec = %lli", sec, nsec);
+
+	ts = tst_ts_from_ms(type, 1000);
+	ts = tst_ts_sub_us(ts, 1);
+
+	sec = tst_ts_get_sec(ts);
+	nsec = tst_ts_get_nsec(ts);
+
+	/* Check that result was normalized */
+	if (sec != 0 || nsec != 999999000)
+		tst_res(TFAIL, "sec = %lli, nsec = %lli", sec, nsec);
+	else
+		tst_res(TPASS, "sec = %lli, nsec = %lli", sec, nsec);
+}
+
+static void do_test(unsigned int n)
+{
+	tst_res(TINFO, "Testing with type = %i", n);
+	test_diff(n);
+	test_lt(n);
+	test_add_sub(n);
+}
+
+static struct tst_test test = {
+	.test = do_test,
+	.tcnt = 3,
+};

lib/newlib_tests/test_timer.c

@@ -14,7 +14,7 @@
 
 int sample_fn(int clk_id, long long usec)
 {
-	struct timespec t = tst_us_to_timespec(usec);
+	struct timespec t = tst_timespec_from_us(usec);
 
 	tst_timer_start(clk_id);
 	TEST(clock_nanosleep(clk_id, 0, &t, NULL));

testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep02.c

@@ -45,7 +45,7 @@ static struct tcase {
 static void do_child(void)
 {
 	int slept_for_ms = 0;
-	struct timespec usec = tst_ms_to_timespec(max_sleep_ms);
+	struct timespec usec = tst_timespec_from_ms(max_sleep_ms);
 	int pid = getpid();
 	int ret = 0;
 

testcases/kernel/syscalls/futex/futex_cmp_requeue01.c

@@ -15,7 +15,7 @@
 
 int sample_fn(int clk_id, long long usec)
 {
-	struct timespec to = tst_us_to_timespec(usec);
+	struct timespec to = tst_timespec_from_us(usec);
 	futex_t futex = FUTEX_INITIALIZER;
 
 	tst_timer_start(clk_id);

testcases/kernel/syscalls/futex/futex_wait05.c

@@ -16,7 +16,7 @@
 
 int sample_fn(int clk_id, long long usec)
 {
-	struct timespec t = tst_us_to_timespec(usec);
+	struct timespec t = tst_timespec_from_us(usec);
 
 	tst_timer_start(clk_id);
 	TEST(nanosleep(&t, NULL));

testcases/kernel/syscalls/nanosleep/nanosleep01.c

@@ -16,7 +16,7 @@
 
 int sample_fn(int clk_id, long long usec)
 {
-	struct timespec t = tst_us_to_timespec(usec);
+	struct timespec t = tst_timespec_from_us(usec);
 
 	tst_timer_start(clk_id);
 	TEST(nanosleep(&t, NULL));

testcases/kernel/syscalls/prctl/prctl09.c

@@ -12,7 +12,7 @@
 int sample_fn(int clk_id, long long usec)
 {
 	fd_set readfds;
-	struct timespec tv = tst_us_to_timespec(usec);
+	struct timespec tv = tst_timespec_from_us(usec);
 
 	FD_ZERO(&readfds);
 	FD_SET(0, &readfds);

testcases/kernel/syscalls/pselect/pselect01.c

@@ -44,8 +44,8 @@ static unsigned long long getustime(int clockid)
 static void settime(int tfd, struct itimerspec *tmr, int tflags,
                     unsigned long long tvalue, int tinterval)
 {
-	tmr->it_value = tst_us_to_timespec(tvalue);
-	tmr->it_interval = tst_us_to_timespec(tinterval);
+	tmr->it_value = tst_timespec_from_us(tvalue);
+	tmr->it_interval = tst_timespec_from_us(tinterval);
 
 	SAFE_TIMERFD_SETTIME(tfd, tflags, tmr, NULL);
 }