lib: include SAFE_CLOCK_ADJTIME() macro
PATCH 1/2 lib: include SAFE_CLOCK_ADJTIME() macro
Adds SAFE_CLOCK_ADJTIME() macro to tst_safe_clocks.h.
--- include/tst_safe_clocks.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/tst_safe_clocks.h +16 -0
@@ -6,6 +6,8 @@#include <time.h> #include "tst_test.h" +#include <sys/timex.h> +#include "lapi/syscalls.h" static inline void safe_clock_getres (const char *file,const int lineno,clockid_t clk_id,struct timespec *res)
@@ -42,6 +44,17 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } +static inline void safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); + +if (rval !=0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed" , file, lineno); +}#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))
@@ -50,3 +63,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))
Signature · 1 line
2.20.1
PATCH 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
clock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests. clock_adjtime() syscall might have as execution path:
1) a regular POSIX clock (only REALTIME clock implements adjtime())
- will behave exactly like adjtimex() system call.
- only one being tested here.
2) a dynamic POSIX clock (which ops are implemented by PTP clocks)
- will trigger the PTP clock driver function "adjtime()"
- different implementations from one PTP clock to another
- might return EOPNOTSUPP (like ptp_kvm_caps, for example)
- no observed execution entry point for clock_adjtime()
--- runtest/syscalls | 3 + .../kernel/syscalls/clock_adjtime/.gitignore | 2 + .../kernel/syscalls/clock_adjtime/Makefile | 10 + .../syscalls/clock_adjtime/clock_adjtime01.c | 249 +++++++++++++++++ .../syscalls/clock_adjtime/clock_adjtime02.c | 261 ++++++++++++++++++ 5 files changed, 525 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_adjtime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_adjtime/Makefile create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c
runtest/syscalls +3 -0
@@ -74,6 +74,9 @@ chroot02 chroot02 chroot03 chroot03 chroot04 chroot04 +clock_adjtime01 clock_adjtime01 +clock_adjtime02 clock_adjtime02 + clock_getres01 clock_getres01 clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02
testcases/kernel/syscalls/clock_adjtime/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clock_adjtime01 +clock_adjtime02
testcases/kernel/syscalls/clock_adjtime/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# Copyright (c) 2019 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS+=-lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +249 -0
249 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +261 -0
261 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 18 lines · Rafael David Tinoco
Fixes 270clock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests.
clock_adjtime()syscall might have as execution path:1) a regular POSIX clock (only REALTIME clock implements
adjtime())(quoted diff) +0
-0- will behave exactly like adjtimex() system call. - only one being tested here. 2) a dynamic POSIX clock (which ops are implemented by PTP clocks) - will trigger the PTP clock driver function "adjtime()" - different implementations from one PTP clock to another - might return EOPNOTSUPP (like ptp_kvm_caps, for example) - no observed execution entry point for clock_adjtime()
Quoted 1 line
Signed-off-by Rafael David Tinoco <[email protected]>
Sorry, forgot to checkpatch before sending. Doing it now and submitting patchset as v2.
Thank you!
-Rafael
PATCH v2 1/2 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Rafael David TinocoAdds SAFE_CLOCK_ADJTIME() macro to tst_safe_clocks.h.
--- include/tst_safe_clocks.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/tst_safe_clocks.h +16 -0
@@ -6,6 +6,8 @@#include <time.h> #include "tst_test.h" +#include <sys/timex.h> +#include "lapi/syscalls.h" static inline void safe_clock_getres (const char *file,const int lineno,clockid_t clk_id,struct timespec *res)
@@ -42,6 +44,17 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } +static inline void safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); + +if (rval !=0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed" , file, lineno); +}#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))
@@ -50,3 +63,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))
Signature · 1 line
2.20.1
PATCH v2 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
clock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests. clock_adjtime() syscall might have as execution path:
1) a regular POSIX clock (only REALTIME clock implements adjtime())
- will behave exactly like adjtimex() system call.
- only one being tested here.
2) a dynamic POSIX clock (which ops are implemented by PTP clocks)
- will trigger the PTP clock driver function "adjtime()"
- different implementations from one PTP clock to another
- might return EOPNOTSUPP (like ptp_kvm_caps, for example)
- no observed execution entry point for clock_adjtime()
--- runtest/syscalls | 3 + .../kernel/syscalls/clock_adjtime/.gitignore | 2 + .../kernel/syscalls/clock_adjtime/Makefile | 10 + .../syscalls/clock_adjtime/clock_adjtime01.c | 249 +++++++++++++++++ .../syscalls/clock_adjtime/clock_adjtime02.c | 261 ++++++++++++++++++ 5 files changed, 525 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_adjtime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_adjtime/Makefile create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c
runtest/syscalls +3 -0
@@ -74,6 +74,9 @@ chroot02 chroot02 chroot03 chroot03 chroot04 chroot04 +clock_adjtime01 clock_adjtime01 +clock_adjtime02 clock_adjtime02 + clock_getres01 clock_getres01 clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02
testcases/kernel/syscalls/clock_adjtime/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clock_adjtime01 +clock_adjtime02
testcases/kernel/syscalls/clock_adjtime/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# Copyright (c) 2019 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS+=-lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +249 -0
249 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +261 -0
261 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi Rafael,
Quoted 3 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +0
-0
...
Quoted 5 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +5
-0+SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &ttxc); +timex_show ("SET" , ttxc); + +if (tc[i].ptr) { +
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 199
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +10
-0+/* adjtimex field being tested so we can verify later */ + + ptroff = (long ) tc[i].ptr - (long ) &ttxc; + ptr = (void *) &verify + ptroff; + } + +TEST (sys_clock_adjtime (CLOCK_REALTIME , &verify)); +timex_show ("VERIFY" , verify); + +if (tc[i].ptr && *tc[i].ptr != *ptr) {
Can you please fix this compiler error:clock_adjtime01.c: In function ‘verify_clock_adjtime’:
clock_adjtime01.c:199:33: warning: ‘ptr’ may be used uninitialized in this function [-Wmaybe-uninitialized]
if (tc[i].ptr && *tc[i].ptr != *ptr) {
Kind regards,
Petr
PATCH v2 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 22 lines · Petr Vorel
Hi Rafael,
Quoted 3 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +0
-0...
Quoted 11 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +11
-0+SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &ttxc); +timex_show ("SET" , ttxc); + +if (tc[i].ptr) { + +/* adjtimex field being tested so we can verify later */ + + ptroff = (long ) tc[i].ptr - (long ) &ttxc; + ptr = (void *) &verify + ptroff; + } +
Quoted 8 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 199
Quoted 4 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +4
-0+TEST (sys_clock_adjtime (CLOCK_REALTIME , &verify)); +timex_show ("VERIFY" , verify); + +if (tc[i].ptr && *tc[i].ptr != *ptr) {Can you please fix this compiler error:
clock_adjtime01.c: In function ‘verify_clock_adjtime’:
clock_adjtime01.c:199:33: warning: ‘ptr’ may be used uninitialized in this function [-Wmaybe-uninitialized]
if (tc[i].ptr && *tc[i].ptr != *ptr) {
Wow. That’s a really dumb, tautologically impossible compiler error :(… -Enji
PATCH v3 1/2 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Petr VorelAdds SAFE_CLOCK_ADJTIME() macro to tst_safe_clocks.h.
--- include/tst_safe_clocks.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
include/tst_safe_clocks.h +16 -0
@@ -6,6 +6,8 @@#include <time.h> #include "tst_test.h" +#include <sys/timex.h> +#include "lapi/syscalls.h" static inline void safe_clock_getres (const char *file,const int lineno,clockid_t clk_id,struct timespec *res)
@@ -42,6 +44,17 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } +static inline void safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); + +if (rval !=0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed" , file, lineno); +}#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))
@@ -50,3 +63,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))
Signature · 1 line
2.20.1
PATCH v3 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
clock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests. clock_adjtime() syscall might have as execution path:
1) a regular POSIX clock (only REALTIME clock implements adjtime())
- will behave exactly like adjtimex() system call.
- only one being tested here.
2) a dynamic POSIX clock (which ops are implemented by PTP clocks)
- will trigger the PTP clock driver function "adjtime()"
- different implementations from one PTP clock to another
- might return EOPNOTSUPP (like ptp_kvm_caps, for example)
- no observed execution entry point for clock_adjtime()
--- runtest/syscalls | 3 + .../kernel/syscalls/clock_adjtime/.gitignore | 2 + .../kernel/syscalls/clock_adjtime/Makefile | 10 + .../syscalls/clock_adjtime/clock_adjtime01.c | 249 +++++++++++++++++ .../syscalls/clock_adjtime/clock_adjtime02.c | 261 ++++++++++++++++++ 5 files changed, 525 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_adjtime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_adjtime/Makefile create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c
runtest/syscalls +3 -0
@@ -74,6 +74,9 @@ chroot02 chroot02 chroot03 chroot03 chroot04 chroot04 +clock_adjtime01 clock_adjtime01 +clock_adjtime02 clock_adjtime02 + clock_getres01 clock_getres01 clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02
testcases/kernel/syscalls/clock_adjtime/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clock_adjtime01 +clock_adjtime02
testcases/kernel/syscalls/clock_adjtime/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# Copyright (c) 2019 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS+=-lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +249 -0
249 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +261 -0
261 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi!
I finally had time to read the manual page for adjtime and look into these tests. They look more or less fine, the only problem here is that we merely scratch the surface here, i.e. most of the STA_* constants are not tested etc. I guess that with CLOCK_MONOTONIC_RAW we should be even able measure that the time has been adjusted, leap second inserted, etc. However such tests would require quite a lot of effort. Even triggering leap second insertion/deletion requires fiddling with system time and sleeping till the kernel state machine does it job.
Quoted 89 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +83
-0@@ -0,0 +1,249 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linaro Limited. All rights reserved. +* Author: Rafael David Tinoco <[email protected]> +*/ + +/* +* clock_adjtime() syscall might have as execution path: +* +* 1) a regular POSIX clock (only REALTIME clock implements adjtime()) +* - will behave exactly like adjtimex() system call. +* - only one being tested here. +* +* 2) a dynamic POSIX clock (which ops are implemented by PTP clocks) +* - will trigger the PTP clock driver function "adjtime()" +* - different implementations from one PTP clock to another +* - might return EOPNOTSUPP (like ptp_kvm_caps, for example) +* - no entry point for clock_adjtime(), missing "CLOCK_PTP" model +* +* so it is sane to check possible adjustments: +* +* - ADJ_OFFSET - usec or nsec, kernel adjusts time gradually by offset +* (-512000 < offset < 512000) +* - ADJ_FREQUENCY - system clock frequency offset +* - ADJ_MAXERROR - maximum error (usec) +* - ADJ_ESTERROR - estimated time error in us +* - ADJ_STATUS - clock command/status of ntp implementation +* - ADJ_TIMECONST - PLL stiffness (jitter dependent) + poll int for PLL +* - ADJ_TICK - us between clock ticks +* (>= 900000/HZ, <= 1100000/HZ) +* +* and also the standalone ones (using .offset variable): +* +* - ADJ_OFFSET_SINGLESHOT - behave like adjtime() +* - ADJ_OFFSET_SS_READ - ret remaining time for completion after SINGLESHOT +* +* For ADJ_STATUS, consider the following flags: +* +* rw STA_PLL - enable phase-locked loop updates (ADJ_OFFSET) +* rw STA_PPSFREQ - enable PPS (pulse-per-second) freq discipline +* rw STA_PPSTIME - enable PPS time discipline +* rw STA_FLL - select freq-locked loop mode. +* rw STA_INS - ins leap sec after the last sec of UTC day (all days) +* rw STA_DEL - del leap sec at last sec of UTC day (all days) +* rw STA_UNSYNC - clock unsynced +* rw STA_FREQHOLD - hold freq. ADJ_OFFSET made w/out auto small adjs +* ro STA_PPSSIGNAL - valid PPS (pulse-per-second) signal is present +* ro STA_PPSJITTER - PPS signal jitter exceeded. +* ro STA_PPSWANDER - PPS signal wander exceeded. +* ro STA_PPSERROR - PPS signal calibration error. +* ro STA_CLOKERR - clock HW fault. +* ro STA_NANO - 0 = us, 1 = ns (set = ADJ_NANO, cl = ADJ_MICRO) +* rw STA_MODE - mode: 0 = phased locked loop. 1 = freq locked loop +* ro STA_CLK - clock source. unused. +*/ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" +#include "lapi/posix_clocks.h" +#include "tst_timer.h" +#include "tst_safe_clocks.h" +#include <sys/timex.h> + +static long hz; +static struct timex saved, ttxc; + +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | \ + ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK) + +struct test_case { +unsigned int modes; +long highlimit; +long *ptr; +long delta; +}; + +struct test_case tc[] = { + { + .modes =ADJ_OFFSET_SINGLESHOT , + }, + { + .modes =ADJ_OFFSET_SS_READ ,
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 93
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +10
-0+ }, + { + .modes = ADJ_ALL, + }, + { + .modes = ADJ_OFFSET, + .highlimit = 512000, + .ptr = &ttxc.offset, + .delta = 10000, + },
I wonder what we should do with STA_NANO vs STA_MICRO if a ntp daemon set STA_NANO this limit would be three orders of magnitude off, maybe we should check for this in the setup as well.
Also manual states that the limit is -0.5, +0.5 range, we should really set the limit to 500000 then, then we can just clamp the value instead of decreasing by 2 * delta (why do we do even do that) donw in the test function.
Quoted 79 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +79
-0+ { + .modes = ADJ_FREQUENCY, + .ptr = &ttxc.freq, + .delta = 100, + }, + { + .modes = ADJ_MAXERROR, + .ptr = &ttxc.maxerror, + .delta = 100, + }, + { + .modes = ADJ_ESTERROR, + .ptr = &ttxc.esterror, + .delta = 100, + }, + { + .modes = ADJ_TIMECONST, + .ptr = &ttxc.constant, + .delta = 1, + }, + { + .modes = ADJ_TICK, + .highlimit = 1100000, + .ptr = &ttxc.tick, + .delta = 1000, + }, +}; + +/* + * bad pointer w/ libc causes SIGSEGV signal, call syscall directly + */ +static int sys_clock_adjtime(clockid_t clk_id, struct timex *txc) +{ + return tst_syscall(__NR_clock_adjtime, clk_id, txc); +} + +static void timex_show(char *given, struct timex txc) +{ + tst_res(TINFO, "%s\n" + " mode: %d\n" + " offset: %ld\n" + " frequency: %ld\n" + " maxerror: %ld\n" + " esterror: %ld\n" + " status: %d (0x%x)\n" + " time_constant: %ld\n" + " precision: %ld\n" + " tolerance: %ld\n" + " tick: %ld\n" + " raw time: %d(s) %d(us)", + given, + txc.modes, + txc.offset, + txc.freq, + txc.maxerror, + txc.esterror, + txc.status, + txc.status, + txc.constant, + txc.precision, + txc.tolerance, + txc.tick, + (int)txc.time.tv_sec, + (int)txc.time.tv_usec); +} + +static void verify_clock_adjtime(unsigned int i) +{ + long ptroff, *ptr = NULL; + struct timex verify; + + memset(&ttxc, 0, sizeof(struct timex)); + memset(&verify, 0, sizeof(struct timex)); + + SAFE_CLOCK_ADJTIME(CLOCK_REALTIME, &ttxc); + timex_show("GET", ttxc); + + ttxc.modes = tc[i].modes; +
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 182
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +10
-0+if (tc[i].ptr && tc[i].delta) { + + *tc[i].ptr += tc[i].delta; + +/* fix limits, if existent, so no errors occur */ + +if (tc[i].highlimit) { +if (*tc[i].ptr >= tc[i].highlimit) + *tc[i].ptr -= (2 * tc[i].delta); + }
Here if we had the highlimit correct we can just do:
if (tc[i].highlimit) {
if (*tc[i].ptr > tc[i].highlimit)
*tc[i].ptr = tc[i].highlimit;
}Or is there a reason why this cannot work?
Quoted 57 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +57
-0+ } + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &ttxc); +timex_show ("SET" , ttxc); + +if (tc[i].ptr) { + +/* adjtimex field being tested so we can verify later */ + + ptroff = (long ) tc[i].ptr - (long ) &ttxc; + ptr = (void *) &verify + ptroff; + } + +TEST (sys_clock_adjtime (CLOCK_REALTIME , &verify)); +timex_show ("VERIFY" , verify); + +if (tc[i].ptr && *tc[i].ptr != *ptr) { + +tst_res (TFAIL ,"clock_adjtime(): could not set value (mode=%x)" , + tc[i].modes); + } + +if (TST_RET <0 ) { +tst_res (TFAIL |TTERRNO ,"clock_adjtime(): mode=%x, returned " +"error" , tc[i].modes); + } + +tst_res (TPASS ,"clock_adjtime(): success (mode=%x)" , tc[i].modes); +} + +static void setup (void ) +{ +size_t i; + + hz =SAFE_SYSCONF (_SC_CLK_TCK); + +/* fix high and low limits by dividing it per HZ value */ +for (i =0 ; i <ARRAY_SIZE (tc); i++) { +if (tc[i].modes ==ADJ_TICK ) + tc[i].highlimit /= hz; + } + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static void cleanup (void ) +{ + saved.modes =ADJ_ALL ; + +/* restore clock resolution based on original status flag */ + +if (saved.status &STA_NANO ) + saved.modes |=ADJ_NANO ; +else + saved.modes |=ADJ_MICRO ; + +/* restore original clock flags */
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 248
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +10
-0+ +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static struct tst_test test = { + .test = verify_clock_adjtime, + .setup = setup, + .cleanup = cleanup, + .tcnt =ARRAY_SIZE (tc), + .needs_root =1 ,
I wonder if we should set .restore_wallclock here, is the wallclock significantly distorted by fiddling with adjtimex.
Quoted 72 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +1
-0+};testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +65
-0@@ -0,0 +1,261 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linaro Limited. All rights reserved. +* Author: Rafael David Tinoco <[email protected]> +*/ + +/* +* clock_adjtime() syscall might have as execution path: +* +* 1) a regular POSIX clock (only REALTIME clock implements adjtime()) +* - will behave exactly like adjtimex() system call. +* - only one being tested here. +* +* 2) a dynamic POSIX clock (which ops are implemented by PTP clocks) +* - will trigger the PTP clock driver function "adjtime()" +* - different implementations from one PTP clock to another +* - might return EOPNOTSUPP (like ptp_kvm_caps, for example) +* - no entry point for clock_adjtime(), missing "CLOCK_PTP" model +* +* so it is sane to check for the following errors: +* +* EINVAL - clock id being used does not exist +* +* EFAULT - (struct timex *) does not point to valid memory +* +* EINVAL - ADJ_OFFSET + .offset outside range -512000 < x < 512000 +* (after 2.6.26, kernels normalize to the limit if outside range) +* +* EINVAL - ADJ_FREQUENCY + .freq outside range -32768000 < x < 3276800 +* (after 2.6.26, kernels normalize to the limit if outside range) +* +* EINVAL - .tick outside permitted range (900000/HZ < .tick < 1100000/HZ) +* +* EPERM - .modes is neither 0 nor ADJ_OFFSET_SS_READ (CAP_SYS_TIME required) +* +* EINVAL - .status other than those listed bellow +* +* For ADJ_STATUS, consider the following flags: +* +* rw STA_PLL - enable phase-locked loop updates (ADJ_OFFSET) +* rw STA_PPSFREQ - enable PPS (pulse-per-second) freq discipline +* rw STA_PPSTIME - enable PPS time discipline +* rw STA_FLL - select freq-locked loop mode. +* rw STA_INS - ins leap sec after the last sec of UTC day (all days) +* rw STA_DEL - del leap sec at last sec of UTC day (all days) +* rw STA_UNSYNC - clock unsynced +* rw STA_FREQHOLD - hold freq. ADJ_OFFSET made w/out auto small adjs +* ro STA_PPSSIGNAL - valid PPS (pulse-per-second) signal is present +* ro STA_PPSJITTER - PPS signal jitter exceeded. +* ro STA_PPSWANDER - PPS signal wander exceeded. +* ro STA_PPSERROR - PPS signal calibration error. +* ro STA_CLOKERR - clock HW fault. +* ro STA_NANO - 0 = us, 1 = ns (set = ADJ_NANO, cl = ADJ_MICRO) +* rw STA_MODE - mode: 0 = phased locked loop. 1 = freq locked loop +* ro STA_CLK - clock source. unused. +*/ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" +#include "lapi/posix_clocks.h" +#include "tst_timer.h" +#include "tst_safe_clocks.h" +#include <sys/timex.h> +#include <pwd.h>
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 75
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +10
-0+ +#include <stdio.h> + +static long hz; +static struct timex saved, ttxc; + +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | \ + ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK) + +#define MAX_CLOCKS 16
Can we put this into include/lapi/posix_clocks.h and use that in all clock testcases?
Otherwise we will end up adjusting five different places once kernel devs happen to add a few more clocks.
Quoted 75 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +75
-0+struct test_case { +clockid_t clktype; +unsigned int modes; +long lowlimit; +long highlimit; +long *ptr; +long delta; +int exp_err; +int droproot; +}; + +struct test_case tc[] = { + { + .clktype =MAX_CLOCKS , + .exp_err =EINVAL , + }, + { + .clktype =MAX_CLOCKS +1 , + .exp_err =EINVAL , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_ALL , + .exp_err =EFAULT , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_TICK , + .lowlimit =900000 , + .ptr = &ttxc.tick, + .delta =1 , + .exp_err =EINVAL , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_TICK , + .highlimit =1100000 , + .ptr = &ttxc.tick, + .delta =1 , + .exp_err =EINVAL , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_ALL , + .exp_err =EPERM , + .droproot =1 , + }, +}; + +/* +* bad pointer w/ libc causes SIGSEGV signal, call syscall directly +*/ +static int sys_clock_adjtime (clockid_t clk_id,struct timex *txc) +{ +return tst_syscall (__NR_clock_adjtime, clk_id, txc); +} + +static void timex_show (char *given,struct timex txc) +{ + tst_res(TINFO, "%s\n" + " mode: 0x%x\n" + " offset: %ld\n" + " frequency: %ld\n" + " maxerror: %ld\n" + " esterror: %ld\n" + " status: 0x%x\n" + " time_constant: %ld\n" + " precision: %ld\n" + " tolerance: %ld\n" + " tick: %ld\n" + " raw time: %d(s) %d(us)", + given, + txc.modes, + txc.offset, + txc.freq,
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 161
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +10
-0+ txc.maxerror, + txc.esterror, + txc.status, + txc.constant, + txc.precision, + txc.tolerance, + txc.tick, + (int )txc.time.tv_sec, + (int)txc.time.tv_usec); +}
You should really put this into a header in the clock_adjtime directory and include it in both test.
Quoted 24 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +24
-0+static void verify_clock_adjtime (unsigned int i) +{ +uid_t whoami =0 ; +struct timex *txcptr; +struct passwd *nobody; +static const char name[] ="nobody" ; + + txcptr = &ttxc; + +memset (txcptr,0 ,sizeof (struct timex )); + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , txcptr); +timex_show ("GET" , *txcptr); + +if (tc[i].droproot) { + nobody =SAFE_GETPWNAM (name); + whoami = nobody->pw_uid; +SAFE_SETEUID (whoami); + } + + txcptr->modes = tc[i].modes; + +if (tc[i].ptr) { +
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 196
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +10
-0+if (tc[i].lowlimit) + *tc[i].ptr = tc[i].lowlimit - tc[i].delta; + +if (tc[i].highlimit) + *tc[i].ptr = tc[i].highlimit + tc[i].delta; + } + +/* special case - if txcptr != NULL, SIGSEGV is throwed */ +if (tc[i].exp_err ==EFAULT ) + txcptr =NULL ;
Please use tst_get_bad_addr()
Quoted 70 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +64
-0+TEST (sys_clock_adjtime (tc[i].clktype, txcptr)); +if (txcptr) +timex_show ("TEST" , *txcptr); + +if (TST_RET >=0 ) { +tst_res (TFAIL ,"clock_adjtime(): passed unexpectedly (mode=%x, " +"uid=%d)" , tc[i].modes, whoami); +return ; + } + +if (tc[i].exp_err !=TST_ERR ) { +tst_res (TFAIL |TTERRNO ,"clock_adjtime(): expected %d but " +"failed with %d (mode=%x, uid=%d)" , + tc[i].exp_err,TST_ERR , tc[i].modes, whoami); +return ; + } + +tst_res (TPASS ,"clock_adjtime(): failed as expected (mode=0x%x, " +"uid=%d)" , tc[i].modes, whoami); + +if (tc[i].droproot) +SAFE_SETEUID (0 ); +} + +static void setup (void ) +{ +size_t i; + + hz =SAFE_SYSCONF (_SC_CLK_TCK); + +/* fix high and low limits by dividing it per HZ value */ +for (i =0 ; i <ARRAY_SIZE (tc); i++) { +if (tc[i].modes ==ADJ_TICK ) { + tc[i].highlimit /= hz; + tc[i].lowlimit /= hz; + } + } + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static void cleanup (void ) +{ + saved.modes =ADJ_ALL ; + +/* restore clock resolution based on original status flag */ + +if (saved.status &STA_NANO ) + saved.modes |=ADJ_NANO ; +else + saved.modes |=ADJ_MICRO ; + +/* restore original clock flags */ + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static struct tst_test test = { + .test = verify_clock_adjtime, + .setup = setup, + .cleanup = cleanup, + .tcnt =ARRAY_SIZE (tc), + .needs_root =1 , +};Signature · 5 lines
2.20.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 2/2 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 8 lines · Cyril Hrubis
Hi!
I finally had time to read the manual page for adjtime and look into these tests. They look more or less fine, the only problem here is that we merely scratch the surface here, i.e. most of the STA_* constants are not tested etc. I guess that withCLOCK_MONOTONIC_RAWwe should be even able measure that the time has been adjusted, leap second inserted, etc.
adjtime() is only implemented by clock_realtime (time/posix-timers.c) and clock_posix_dynamic (time/posix-clock.c). monotonic clocks don’t implement clock_adj() (time/posix-timers.h) and would return EOPNOTSUPP (time/posix-timers.c).
Quoted 3 lines
However such tests would require quite a lot of effort. Even triggering leap second insertion/deletion requires fiddling with system time and sleeping till the kernel state machine does it job.
Yes =( … its not *trivial* but, definitely, could be done as test 03 in a near future.
Quoted 95 lines
Quoted 95 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +89
-0@@ -0,0 +1,249 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linaro Limited. All rights reserved. +* Author: Rafael David Tinoco <[email protected]> +*/ + +/* +* clock_adjtime() syscall might have as execution path: +* +* 1) a regular POSIX clock (only REALTIME clock implements adjtime()) +* - will behave exactly like adjtimex() system call. +* - only one being tested here. +* +* 2) a dynamic POSIX clock (which ops are implemented by PTP clocks) +* - will trigger the PTP clock driver function "adjtime()" +* - different implementations from one PTP clock to another +* - might return EOPNOTSUPP (like ptp_kvm_caps, for example) +* - no entry point for clock_adjtime(), missing "CLOCK_PTP" model +* +* so it is sane to check possible adjustments: +* +* - ADJ_OFFSET - usec or nsec, kernel adjusts time gradually by offset +* (-512000 < offset < 512000) +* - ADJ_FREQUENCY - system clock frequency offset +* - ADJ_MAXERROR - maximum error (usec) +* - ADJ_ESTERROR - estimated time error in us +* - ADJ_STATUS - clock command/status of ntp implementation +* - ADJ_TIMECONST - PLL stiffness (jitter dependent) + poll int for PLL +* - ADJ_TICK - us between clock ticks +* (>= 900000/HZ, <= 1100000/HZ) +* +* and also the standalone ones (using .offset variable): +* +* - ADJ_OFFSET_SINGLESHOT - behave like adjtime() +* - ADJ_OFFSET_SS_READ - ret remaining time for completion after SINGLESHOT +* +* For ADJ_STATUS, consider the following flags: +* +* rw STA_PLL - enable phase-locked loop updates (ADJ_OFFSET) +* rw STA_PPSFREQ - enable PPS (pulse-per-second) freq discipline +* rw STA_PPSTIME - enable PPS time discipline +* rw STA_FLL - select freq-locked loop mode. +* rw STA_INS - ins leap sec after the last sec of UTC day (all days) +* rw STA_DEL - del leap sec at last sec of UTC day (all days) +* rw STA_UNSYNC - clock unsynced +* rw STA_FREQHOLD - hold freq. ADJ_OFFSET made w/out auto small adjs +* ro STA_PPSSIGNAL - valid PPS (pulse-per-second) signal is present +* ro STA_PPSJITTER - PPS signal jitter exceeded. +* ro STA_PPSWANDER - PPS signal wander exceeded. +* ro STA_PPSERROR - PPS signal calibration error. +* ro STA_CLOKERR - clock HW fault. +* ro STA_NANO - 0 = us, 1 = ns (set = ADJ_NANO, cl = ADJ_MICRO) +* rw STA_MODE - mode: 0 = phased locked loop. 1 = freq locked loop +* ro STA_CLK - clock source. unused. +*/ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" +#include "lapi/posix_clocks.h" +#include "tst_timer.h" +#include "tst_safe_clocks.h" +#include <sys/timex.h> + +static long hz; +static struct timex saved, ttxc; + +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | \ + ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK) + +struct test_case { +unsigned int modes; +long highlimit; +long *ptr; +long delta; +}; + +struct test_case tc[] = { + { + .modes =ADJ_OFFSET_SINGLESHOT , + }, + { + .modes =ADJ_OFFSET_SS_READ , + }, + { + .modes =ADJ_ALL , + }, + { + .modes =ADJ_OFFSET ,
Quoted 8 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 93
Quoted 4 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +4
-0+ .highlimit = 512000, + .ptr = &ttxc.offset, + .delta = 10000, + },I wonder what we should do with
STA_NANOvsSTA_MICROif a ntp daemon setSTA_NANOthis limit would be three orders of magnitude off, maybe we should check for this in the setup as well.
Nice catch!
Quoted 4 lines
Also manual states that the limit is -0.5, +0.5 range, we should really set the limit to 500000 then, then we can just clamp the value instead of decreasing by 2 * delta (why do we do even do that) donw in the test function.
Okay.
Quoted 94 lines
Quoted 80 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +79
-0+ { + .modes = ADJ_FREQUENCY, + .ptr = &ttxc.freq, + .delta = 100, + }, + { + .modes = ADJ_MAXERROR, + .ptr = &ttxc.maxerror, + .delta = 100, + }, + { + .modes = ADJ_ESTERROR, + .ptr = &ttxc.esterror, + .delta = 100, + }, + { + .modes = ADJ_TIMECONST, + .ptr = &ttxc.constant, + .delta = 1, + }, + { + .modes = ADJ_TICK, + .highlimit = 1100000, + .ptr = &ttxc.tick, + .delta = 1000, + }, +}; + +/* + * bad pointer w/ libc causes SIGSEGV signal, call syscall directly + */ +static int sys_clock_adjtime(clockid_t clk_id, struct timex *txc) +{ + return tst_syscall(__NR_clock_adjtime, clk_id, txc); +} + +static void timex_show(char *given, struct timex txc) +{ + tst_res(TINFO, "%s\n" + " mode: %d\n" + " offset: %ld\n" + " frequency: %ld\n" + " maxerror: %ld\n" + " esterror: %ld\n" + " status: %d (0x%x)\n" + " time_constant: %ld\n" + " precision: %ld\n" + " tolerance: %ld\n" + " tick: %ld\n" + " raw time: %d(s) %d(us)", + given, + txc.modes, + txc.offset, + txc.freq, + txc.maxerror, + txc.esterror, + txc.status, + txc.status, + txc.constant, + txc.precision, + txc.tolerance, + txc.tick, + (int)txc.time.tv_sec, + (int)txc.time.tv_usec); +} + +static void verify_clock_adjtime(unsigned int i) +{ + long ptroff, *ptr = NULL; + struct timex verify; + + memset(&ttxc, 0, sizeof(struct timex)); + memset(&verify, 0, sizeof(struct timex)); + + SAFE_CLOCK_ADJTIME(CLOCK_REALTIME, &ttxc); + timex_show("GET", ttxc); + + ttxc.modes = tc[i].modes; +testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 182
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +10
-0+if (tc[i].ptr && tc[i].delta) { + + *tc[i].ptr += tc[i].delta; + +/* fix limits, if existent, so no errors occur */ + +if (tc[i].highlimit) { +if (*tc[i].ptr >= tc[i].highlimit) + *tc[i].ptr -= (2 * tc[i].delta); + }Here if we had the highlimit correct we can just do:
Quoted 6 lines
if (tc[i].highlimit) { if (*tc[i].ptr > tc[i].highlimit) *tc[i].ptr = tc[i].highlimit; }Or is there a reason why this cannot work?
Nope, having subtracting 2 * delta is a leftover from previous idea that “kept working” I guess, will review.
Quoted 62 lines
Quoted 62 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +62
-0+ } + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &ttxc); +timex_show ("SET" , ttxc); + +if (tc[i].ptr) { + +/* adjtimex field being tested so we can verify later */ + + ptroff = (long ) tc[i].ptr - (long ) &ttxc; + ptr = (void *) &verify + ptroff; + } + +TEST (sys_clock_adjtime (CLOCK_REALTIME , &verify)); +timex_show ("VERIFY" , verify); + +if (tc[i].ptr && *tc[i].ptr != *ptr) { + +tst_res (TFAIL ,"clock_adjtime(): could not set value (mode=%x)" , + tc[i].modes); + } + +if (TST_RET <0 ) { +tst_res (TFAIL |TTERRNO ,"clock_adjtime(): mode=%x, returned " +"error" , tc[i].modes); + } + +tst_res (TPASS ,"clock_adjtime(): success (mode=%x)" , tc[i].modes); +} + +static void setup (void ) +{ +size_t i; + + hz =SAFE_SYSCONF (_SC_CLK_TCK); + +/* fix high and low limits by dividing it per HZ value */ +for (i =0 ; i <ARRAY_SIZE (tc); i++) { +if (tc[i].modes ==ADJ_TICK ) + tc[i].highlimit /= hz; + } + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static void cleanup (void ) +{ + saved.modes =ADJ_ALL ; + +/* restore clock resolution based on original status flag */ + +if (saved.status &STA_NANO ) + saved.modes |=ADJ_NANO ; +else + saved.modes |=ADJ_MICRO ; + +/* restore original clock flags */ + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static struct tst_test test = {
Quoted 8 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c line 248
Quoted 5 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +5
-0+ .test = verify_clock_adjtime, + .setup = setup, + .cleanup = cleanup, + .tcnt = ARRAY_SIZE(tc), + .needs_root = 1,I wonder if we should set .restore_wallclock here, is the wallclock significantly distorted by fiddling with adjtimex.
I was also in doubt about this, if any deviation caused by playing with clock will jitter more than the monotonic clock resolution coming from the .restore_wallclock logic. I guess its safer to “guarantee” good clock status by using it, since its acceptable for other tests.
Quoted 86 lines
Quoted 72 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +1
-0+};testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +65
-0@@ -0,0 +1,261 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2019 Linaro Limited. All rights reserved. +* Author: Rafael David Tinoco <[email protected]> +*/ + +/* +* clock_adjtime() syscall might have as execution path: +* +* 1) a regular POSIX clock (only REALTIME clock implements adjtime()) +* - will behave exactly like adjtimex() system call. +* - only one being tested here. +* +* 2) a dynamic POSIX clock (which ops are implemented by PTP clocks) +* - will trigger the PTP clock driver function "adjtime()" +* - different implementations from one PTP clock to another +* - might return EOPNOTSUPP (like ptp_kvm_caps, for example) +* - no entry point for clock_adjtime(), missing "CLOCK_PTP" model +* +* so it is sane to check for the following errors: +* +* EINVAL - clock id being used does not exist +* +* EFAULT - (struct timex *) does not point to valid memory +* +* EINVAL - ADJ_OFFSET + .offset outside range -512000 < x < 512000 +* (after 2.6.26, kernels normalize to the limit if outside range) +* +* EINVAL - ADJ_FREQUENCY + .freq outside range -32768000 < x < 3276800 +* (after 2.6.26, kernels normalize to the limit if outside range) +* +* EINVAL - .tick outside permitted range (900000/HZ < .tick < 1100000/HZ) +* +* EPERM - .modes is neither 0 nor ADJ_OFFSET_SS_READ (CAP_SYS_TIME required) +* +* EINVAL - .status other than those listed bellow +* +* For ADJ_STATUS, consider the following flags: +* +* rw STA_PLL - enable phase-locked loop updates (ADJ_OFFSET) +* rw STA_PPSFREQ - enable PPS (pulse-per-second) freq discipline +* rw STA_PPSTIME - enable PPS time discipline +* rw STA_FLL - select freq-locked loop mode. +* rw STA_INS - ins leap sec after the last sec of UTC day (all days) +* rw STA_DEL - del leap sec at last sec of UTC day (all days) +* rw STA_UNSYNC - clock unsynced +* rw STA_FREQHOLD - hold freq. ADJ_OFFSET made w/out auto small adjs +* ro STA_PPSSIGNAL - valid PPS (pulse-per-second) signal is present +* ro STA_PPSJITTER - PPS signal jitter exceeded. +* ro STA_PPSWANDER - PPS signal wander exceeded. +* ro STA_PPSERROR - PPS signal calibration error. +* ro STA_CLOKERR - clock HW fault. +* ro STA_NANO - 0 = us, 1 = ns (set = ADJ_NANO, cl = ADJ_MICRO) +* rw STA_MODE - mode: 0 = phased locked loop. 1 = freq locked loop +* ro STA_CLK - clock source. unused. +*/ + +#include "config.h" +#include "tst_test.h" +#include "lapi/syscalls.h" +#include "lapi/posix_clocks.h" +#include "tst_timer.h" +#include "tst_safe_clocks.h" +#include <sys/timex.h> +#include <pwd.h> testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 75
Quoted 10 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +10
-0+ +#include <stdio.h> + +static long hz; +static struct timex saved, ttxc; + +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | ADJ_ESTERROR | \ + ADJ_STATUS | ADJ_TIMECONST | ADJ_TICK) + +#define MAX_CLOCKS 16Can we put this into
include/lapi/posix_clocks.hand use that in all clock testcases?
Quoted 2 lines
Otherwise we will end up adjusting five different places once kernel devs happen to add a few more clocks.
Yep!
Quoted 81 lines
Quoted 81 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +80
-0+struct test_case { +clockid_t clktype; +unsigned int modes; +long lowlimit; +long highlimit; +long *ptr; +long delta; +int exp_err; +int droproot; +}; + +struct test_case tc[] = { + { + .clktype =MAX_CLOCKS , + .exp_err =EINVAL , + }, + { + .clktype =MAX_CLOCKS +1 , + .exp_err =EINVAL , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_ALL , + .exp_err =EFAULT , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_TICK , + .lowlimit =900000 , + .ptr = &ttxc.tick, + .delta =1 , + .exp_err =EINVAL , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_TICK , + .highlimit =1100000 , + .ptr = &ttxc.tick, + .delta =1 , + .exp_err =EINVAL , + }, + { + .clktype =CLOCK_REALTIME , + .modes =ADJ_ALL , + .exp_err =EPERM , + .droproot =1 , + }, +}; + +/* +* bad pointer w/ libc causes SIGSEGV signal, call syscall directly +*/ +static int sys_clock_adjtime (clockid_t clk_id,struct timex *txc) +{ +return tst_syscall (__NR_clock_adjtime, clk_id, txc); +} + +static void timex_show (char *given,struct timex txc) +{ + tst_res(TINFO, "%s\n" + " mode: 0x%x\n" + " offset: %ld\n" + " frequency: %ld\n" + " maxerror: %ld\n" + " esterror: %ld\n" + " status: 0x%x\n" + " time_constant: %ld\n" + " precision: %ld\n" + " tolerance: %ld\n" + " tick: %ld\n" + " raw time: %d(s) %d(us)", + given, + txc.modes, + txc.offset, + txc.freq, + txc.maxerror, + txc.esterror, + txc.status, + txc.constant, + txc.precision,
Quoted 8 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 160
Quoted 5 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +5
-0+ txc.tolerance, + txc.tick, + (int )txc.time.tv_sec, + (int)txc.time.tv_usec); +}You should really put this into a header in the
clock_adjtimedirectory and include it in both test.
Yep!
Quoted 29 lines
Quoted 29 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +28
-0+static void verify_clock_adjtime (unsigned int i) +{ +uid_t whoami =0 ; +struct timex *txcptr; +struct passwd *nobody; +static const char name[] ="nobody" ; + + txcptr = &ttxc; + +memset (txcptr,0 ,sizeof (struct timex )); + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , txcptr); +timex_show ("GET" , *txcptr); + +if (tc[i].droproot) { + nobody =SAFE_GETPWNAM (name); + whoami = nobody->pw_uid; +SAFE_SETEUID (whoami); + } + + txcptr->modes = tc[i].modes; + +if (tc[i].ptr) { + +if (tc[i].lowlimit) + *tc[i].ptr = tc[i].lowlimit - tc[i].delta; + +if (tc[i].highlimit)
Quoted 8 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 196
Quoted 6 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +6
-0+ *tc[i].ptr = tc[i].highlimit + tc[i].delta; + } + +/* special case - if txcptr != NULL, SIGSEGV is throwed */ +if (tc[i].exp_err ==EFAULT ) + txcptr =NULL ;Please use
tst_get_bad_addr()
I used it and had problems, will re-check.
Quoted 69 lines
Quoted 69 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +64
-0+TEST (sys_clock_adjtime (tc[i].clktype, txcptr)); +if (txcptr) +timex_show ("TEST" , *txcptr); + +if (TST_RET >=0 ) { +tst_res (TFAIL ,"clock_adjtime(): passed unexpectedly (mode=%x, " +"uid=%d)" , tc[i].modes, whoami); +return ; + } + +if (tc[i].exp_err !=TST_ERR ) { +tst_res (TFAIL |TTERRNO ,"clock_adjtime(): expected %d but " +"failed with %d (mode=%x, uid=%d)" , + tc[i].exp_err,TST_ERR , tc[i].modes, whoami); +return ; + } + +tst_res (TPASS ,"clock_adjtime(): failed as expected (mode=0x%x, " +"uid=%d)" , tc[i].modes, whoami); + +if (tc[i].droproot) +SAFE_SETEUID (0 ); +} + +static void setup (void ) +{ +size_t i; + + hz =SAFE_SYSCONF (_SC_CLK_TCK); + +/* fix high and low limits by dividing it per HZ value */ +for (i =0 ; i <ARRAY_SIZE (tc); i++) { +if (tc[i].modes ==ADJ_TICK ) { + tc[i].highlimit /= hz; + tc[i].lowlimit /= hz; + } + } + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static void cleanup (void ) +{ + saved.modes =ADJ_ALL ; + +/* restore clock resolution based on original status flag */ + +if (saved.status &STA_NANO ) + saved.modes |=ADJ_NANO ; +else + saved.modes |=ADJ_MICRO ; + +/* restore original clock flags */ + +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +} + +static struct tst_test test = { + .test = verify_clock_adjtime, + .setup = setup, + .cleanup = cleanup, + .tcnt =ARRAY_SIZE (tc), + .needs_root =1 , +};Signature · 1 line
2.20.1
Quoted 6 lines
Quoted 2 lines
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltpSignature · 2 lines
Cyril Hrubis [email protected]
Thanks, will post a v2.
PATCH v2 1/3 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Cyril HrubisAdds SAFE_CLOCK_ADJTIME() macro to tst_safe_clocks.h.
--- include/tst_safe_clocks.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/tst_safe_clocks.h +17 -0
@@ -6,7 +6,9 @@*/ #include <time.h> +#include <sys/timex.h> #include "tst_test.h" +#include "lapi/syscalls.h" #include "lapi/posix_clocks.h" static inline void safe_clock_getres(const char *file, const int lineno,
@@ -44,6 +46,18 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } +static inline void safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); + +if (rval !=0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed" , file, lineno); +} +#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))
@@ -52,3 +66,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))
Signature · 1 line
2.20.1
PATCH v2 2/3 lapi/posix_clocks.h: add MAX_CLOCKS definition
Used by clock_XXXtime() tests, defining MAX_CLOCKS in common header.
--- include/lapi/posix_clocks.h | 2 ++ testcases/kernel/syscalls/clock_gettime/clock_gettime02.c | 2 -- testcases/kernel/syscalls/clock_settime/clock_settime02.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
include/lapi/posix_clocks.h +2 -0
@@ -9,6 +9,8 @@#ifndef POSIX_CLOCKS_H__ #define POSIX_CLOCKS_H__ +#define MAX_CLOCKS 16 +#ifndef CLOCK_MONOTONIC_RAW # define CLOCK_MONOTONIC_RAW 4#endif
testcases/kernel/syscalls/clock_gettime/clock_gettime02.c +0 -2
@@ -24,8 +24,6 @@#include "tst_timer.h" #include "tst_safe_clocks.h" -#define MAX_CLOCKS 16 -struct test_case {clockid_t clktype;int exp_err;
testcases/kernel/syscalls/clock_settime/clock_settime02.c +0 -1
@@ -16,7 +16,6 @@#define DELTA_SEC 10#define NSEC_PER_SEC (1000000000L) -#define MAX_CLOCKS 16struct test_case {clockid_t type;
Signature · 1 line
2.20.1
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
In reply to Rafael David Tinococlock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests. clock_adjtime() syscall might have as execution path:
1) a regular POSIX clock (only REALTIME clock implements adjtime())
- will behave exactly like adjtimex() system call.
- only one being tested here.
2) a dynamic POSIX clock (which ops are implemented by PTP clocks)
- will trigger the PTP clock driver function "adjtime()"
- different implementations from one PTP clock to another
- might return EOPNOTSUPP (like ptp_kvm_caps, for example)
- no observed execution entry point for clock_adjtime()
--- include/lapi/posix_clocks.h | 4 + runtest/syscalls | 3 + .../kernel/syscalls/clock_adjtime/.gitignore | 2 + .../kernel/syscalls/clock_adjtime/Makefile | 10 + .../syscalls/clock_adjtime/clock_adjtime.h | 57 +++++ .../syscalls/clock_adjtime/clock_adjtime01.c | 216 +++++++++++++++++ .../syscalls/clock_adjtime/clock_adjtime02.c | 218 ++++++++++++++++++ 7 files changed, 510 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_adjtime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_adjtime/Makefile create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c
include/lapi/posix_clocks.h +4 -0
@@ -11,6 +11,10 @@#define MAX_CLOCKS 16 +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | \ + ADJ_ESTERROR | ADJ_STATUS | ADJ_TIMECONST | \ + ADJ_TICK) +#ifndef CLOCK_MONOTONIC_RAW # define CLOCK_MONOTONIC_RAW 4#endif
runtest/syscalls +3 -0
@@ -74,6 +74,9 @@ chroot02 chroot02 chroot03 chroot03 chroot04 chroot04 +clock_adjtime01 clock_adjtime01 +clock_adjtime02 clock_adjtime02 + clock_getres01 clock_getres01 clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02
testcases/kernel/syscalls/clock_adjtime/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clock_adjtime01 +clock_adjtime02
testcases/kernel/syscalls/clock_adjtime/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# Copyright (c) 2019 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS+=-lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h new file +57 -0
57 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +216 -0
216 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +218 -0
218 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 151
Quoted 9 lines · Rafael David Tinoco
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +7
-0+/* +* special case: EFAULT for NULL pointers +* txcptr = tst_get_bad_addr() -> SIGSEGV is thrown (and not EFAULT) +*/ + +if (tc[i].exp_err ==EFAULT ) + txcptr =NULL ;
Cyril,
clock_adjtime() returns an EFAULT in case copy_from_user() returns errors.
Thing is that, using tst_get_bad_addr(), and having a page with no permissions, before getting an error from copy_from_user() and returning
- thus getting EFAULT back - we get a SIGSEGV from _copy_from_user() itself, because it tries to sanitize given address, with memset(0), before returning to userland (to avoid leaks of some sort ?).
With this, the EFAULT is only got when using NULL pointers, and not a *bad* pointer… So, right now, I can’tuse tst_get_bad_addr() like you suggested. Should I remove this test and send a v3 ?
Thanks for reviewing all this.
Best Regards
Rafael D. Tinoco
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi!
Quoted 19 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 151
Quoted 7 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +7
-0+/* +* special case: EFAULT for NULL pointers +* txcptr = tst_get_bad_addr() -> SIGSEGV is thrown (and not EFAULT) +*/ + +if (tc[i].exp_err ==EFAULT ) + txcptr =NULL ;Cyril,
clock_adjtime()returns an EFAULT in casecopy_from_user()returns errors.Thing is that, using
tst_get_bad_addr(), and having a page with no permissions, before getting an error fromcopy_from_user()and returning
- thus getting EFAULT back - we get a SIGSEGV from_copy_from_user()itself, because it tries to sanitize given address, with memset(0), before returning to userland (to avoid leaks of some sort ?).
Quoted 3 lines
With this, the EFAULT is only got when using NULL pointers, and not a *bad* pointer??? So, right now, I can???tuse
tst_get_bad_addr()like you suggested. Should I remove this test and send a v3 ?
Hmm that's strange, memseting the structure does not make much sense.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 22 lines · Cyril Hrubis
Hi!
Quoted 19 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c line 151
Quoted 7 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +7
-0+/* +* special case: EFAULT for NULL pointers +* txcptr = tst_get_bad_addr() -> SIGSEGV is thrown (and not EFAULT) +*/ + +if (tc[i].exp_err ==EFAULT ) + txcptr =NULL ;Cyril,
clock_adjtime()returns an EFAULT in casecopy_from_user()returns errors.Thing is that, using
tst_get_bad_addr(), and having a page with no permissions, before getting an error fromcopy_from_user()and returning
- thus getting EFAULT back - we get a SIGSEGV from_copy_from_user()itself, because it tries to sanitize given address, with memset(0), before returning to userland (to avoid leaks of some sort ?).
Quoted 5 lines
Quoted 3 lines
With this, the EFAULT is only got when using NULL pointers, and not a *bad* pointer??? So, right now, I can???tuse
tst_get_bad_addr()like you suggested. Should I remove this test and send a v3 ?Hmm that's strange, memseting the structure does not make much sense.
checking lib/usercopy.c -> _copy_from_user(), memset() is only done in kernel buffer if there was an error in raw_copy_from_user(), so.. you’re right. Since mmap’ed buffer has PROT_NONE, I guess the SIGSEGV is thrown during “raw_copy_from_user()” when referencing the user page with no permissions. This might not happen when a NULL is passed, making adjtime to ret EFAULT. Anyway, can’t use tst_get_bad_addr() as it seems...
Quoted 3 lines
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi!
Quoted 8 lines
Quoted 1 line
Hmm that's strange, memseting the structure does not make much sense.
checking
lib/usercopy.c->_copy_from_user(),memset()is only done in kernel buffer if there was an error inraw_copy_from_user(), so.. you???re right. Since mmap???ed buffer hasPROT_NONE, I guess the SIGSEGV is thrown during ???raw_copy_from_user()??? when referencing the user page with no permissions. This might not happen when a NULL is passed, making adjtime to ret EFAULT. Anyway, can???t usetst_get_bad_addr()as it seems...
Looking at strace of the test we manage to get -1 and EFAULT followed by the signal, which is strange. I do wonder why this is the only syscall that behaves that way.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi!
Quoted 10 lines
Quoted 6 lines
checking
lib/usercopy.c->_copy_from_user(),memset()is only done in kernel buffer if there was an error inraw_copy_from_user(), so.. you???re right. Since mmap???ed buffer hasPROT_NONE, I guess the SIGSEGV is thrown during ???raw_copy_from_user()??? when referencing the user page with no permissions. This might not happen when a NULL is passed, making adjtime to ret EFAULT. Anyway, can???t usetst_get_bad_addr()as it seems...Looking at strace of the test we manage to get -1 and EFAULT followed by the signal, which is strange. I do wonder why this is the only syscall that behaves that way.
Found the bug :-), the kernel is not the problem but rather the lines:
if (txcptr)
timex_show("TEST", *txcptr);You have to change these to something as:
if (tcxptr != bad_addr)
timex_show("TEST", *txcptr);Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 16 lines · Cyril Hrubis
Hi!
Quoted 10 lines
Quoted 6 lines
checking
lib/usercopy.c->_copy_from_user(),memset()is only done in kernel buffer if there was an error inraw_copy_from_user(), so.. you???re right. Since mmap???ed buffer hasPROT_NONE, I guess the SIGSEGV is thrown during ???raw_copy_from_user()??? when referencing the user page with no permissions. This might not happen when a NULL is passed, making adjtime to ret EFAULT. Anyway, can???t usetst_get_bad_addr()as it seems...Looking at strace of the test we manage to get -1 and EFAULT followed by the signal, which is strange. I do wonder why this is the only syscall that behaves that way.
Found the bug :-), the kernel is not the problem but rather the lines:
Quoted 8 lines
if (txcptr) timex_show("TEST", *txcptr);You have to change these to something as:
if (tcxptr != bad_addr) timex_show("TEST", *txcptr);
/me blushes for not having opened it in gdb :o)
tks
Quoted 4 lines
Signature · 3 lines
-- Cyril Hrubis [email protected]
PATCH v3 1/4 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Cyril HrubisAdds SAFE_CLOCK_ADJTIME() macro to tst_safe_clocks.h.
--- include/tst_safe_clocks.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
include/tst_safe_clocks.h +18 -0
@@ -6,7 +6,9 @@*/ #include <time.h> +#include <sys/timex.h> #include "tst_test.h" +#include "lapi/syscalls.h" #include "lapi/posix_clocks.h" static inline void safe_clock_getres(const char *file, const int lineno,
@@ -44,6 +46,19 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } +static inline int safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); +if (rval <0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed %i" , file, lineno, rval); + +return rval; +} +#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))
@@ -52,3 +67,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))
Signature · 1 line
2.20.1
PATCH v3 2/4 lib: Add include guard to tst_safe_clocks.h
When adding a common header to my tests I missed this include guard when accidentally including tst_safe_clocks.h from .c and .h files. Since other tst_safe_*.h files have guards I thought it would be good to add to this one as well.
--- include/tst_safe_clocks.h | 5 +++++ 1 file changed, 5 insertions(+)
include/tst_safe_clocks.h +5 -0
@@ -5,6 +5,9 @@* Email : [email protected] */ +#ifndef TST_SAFE_CLOCKS_H__ +#define TST_SAFE_CLOCKS_H__ +#include <time.h> #include <sys/timex.h> #include "tst_test.h"
@@ -70,3 +73,5 @@ static inline int safe_clock_adjtime(const char *file, const int lineno,#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc)) + +#endif /* SAFE_CLOCKS_H__ */
Signature · 1 line
2.20.1
PATCH v3 3/4 lapi/posix_clocks.h: add MAX_CLOCKS definition
In reply to Rafael David TinocoUsed by clock_XXXtime() tests, defining MAX_CLOCKS in common header.
--- include/lapi/posix_clocks.h | 2 ++ testcases/kernel/syscalls/clock_gettime/clock_gettime02.c | 2 -- testcases/kernel/syscalls/clock_settime/clock_settime02.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
include/lapi/posix_clocks.h +2 -0
@@ -9,6 +9,8 @@#ifndef POSIX_CLOCKS_H__ #define POSIX_CLOCKS_H__ +#define MAX_CLOCKS 16 +#ifndef CLOCK_MONOTONIC_RAW # define CLOCK_MONOTONIC_RAW 4#endif
testcases/kernel/syscalls/clock_gettime/clock_gettime02.c +0 -2
@@ -24,8 +24,6 @@#include "tst_timer.h" #include "tst_safe_clocks.h" -#define MAX_CLOCKS 16 -struct test_case {clockid_t clktype;int exp_err;
testcases/kernel/syscalls/clock_settime/clock_settime02.c +0 -1
@@ -16,7 +16,6 @@#define DELTA_SEC 10#define NSEC_PER_SEC (1000000000L) -#define MAX_CLOCKS 16struct test_case {clockid_t type;
Signature · 1 line
2.20.1
PATCH v3 4/4 syscalls/clock_adjtime: create clock_adjtime syscall tests
In reply to Rafael David Tinococlock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests. clock_adjtime() syscall might have as execution path:
1) a regular POSIX clock (only REALTIME clock implements adjtime())
- will behave exactly like adjtimex() system call.
- only one being tested here.
2) a dynamic POSIX clock (which ops are implemented by PTP clocks)
- will trigger the PTP clock driver function "adjtime()"
- different implementations from one PTP clock to another
- might return EOPNOTSUPP (like ptp_kvm_caps, for example)
- no observed execution entry point for clock_adjtime()
--- include/lapi/posix_clocks.h | 4 + runtest/syscalls | 3 + .../kernel/syscalls/clock_adjtime/.gitignore | 2 + .../kernel/syscalls/clock_adjtime/Makefile | 10 + .../syscalls/clock_adjtime/clock_adjtime.h | 57 +++++ .../syscalls/clock_adjtime/clock_adjtime01.c | 220 ++++++++++++++++++ .../syscalls/clock_adjtime/clock_adjtime02.c | 220 ++++++++++++++++++ 7 files changed, 516 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_adjtime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_adjtime/Makefile create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c
include/lapi/posix_clocks.h +4 -0
@@ -11,6 +11,10 @@#define MAX_CLOCKS 16 +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | \ + ADJ_ESTERROR | ADJ_STATUS | ADJ_TIMECONST | \ + ADJ_TICK) +#ifndef CLOCK_MONOTONIC_RAW # define CLOCK_MONOTONIC_RAW 4#endif
runtest/syscalls +3 -0
@@ -74,6 +74,9 @@ chroot02 chroot02 chroot03 chroot03 chroot04 chroot04 +clock_adjtime01 clock_adjtime01 +clock_adjtime02 clock_adjtime02 + clock_getres01 clock_getres01 clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02
testcases/kernel/syscalls/clock_adjtime/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clock_adjtime01 +clock_adjtime02
testcases/kernel/syscalls/clock_adjtime/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# Copyright (c) 2019 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS+=-lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h new file +57 -0
57 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +220 -0
220 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +220 -0
220 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v3 4/4 syscalls/clock_adjtime: create clock_adjtime syscall tests
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c
Quoted 12 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +11
-0+static void setup (void ) +{ +size_t i; +int rval; + +/* check if clock is TIME_OK and save original clock flags */ + + rval =SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); + +if (rval !=TIME_OK ) + tst_brk(TBROK | TTERRNO, "unsynced clock or on-going leap”);
I choose to break test if rval > 0 mainly because it could still have on-going leap operations, since clock_adjtime() is async, and also because doing the test with an unsynced clock seems weird.
Ran both or 10 seconds w/out any issue.
Same for clock_adtime02:
Quoted 12 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +12
-0+static void setup (void ) +{ +size_t i; +int rval; + +/* check if clock is TIME_OK and save original clock flags */ + + rval =SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); + +if (rval !=TIME_OK ) +tst_brk (TBROK |TTERRNO ,"unsynced clock or on-going leap" ); +
PATCH v3 4/4 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi!
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (rval != TIME_OK) + tst_brk(TBROK | TTERRNO, "unsynced clock or on-going leap???);I choose to break test if rval > 0 mainly because it could still have on-going leap operations, since
clock_adjtime()is async, and also because doing the test with an unsynced clock seems weird.
We should print the saved with timex_show() here and the rval at least.
It however it looks like kernel boots with STA_UNSYNC until NTP manges to sync the time and clears the flag but only if it manages to sync the clock.
See:
http://linuxelf.com/blog/2017/03/27/clock-status-unsync/
Which itself is an argument to run the test with unsynced clock, since not all environments have access to internet or ntp daemon running.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 4/4 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 11 lines · Cyril Hrubis
Hi!
Quoted 6 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (rval != TIME_OK) + tst_brk(TBROK | TTERRNO, "unsynced clock or on-going leap???);I choose to break test if rval > 0 mainly because it could still have on-going leap operations, since
clock_adjtime()is async, and also because doing the test with an unsynced clock seems weird.We should print the saved with
timex_show()here and the rval at least.
Alright. v4 on its way.
Quoted 11 lines
It however it looks like kernel boots with
STA_UNSYNCuntil NTP manges to sync the time and clears the flag but only if it manages to sync the clock.See:
http://linuxelf.com/blog/2017/03/27/clock-status-unsync/
Which itself is an argument to run the test with unsynced clock, since not all environments have access to internet or ntp daemon running.
Valid point. I’ll allow rval being 5 then.
Quoted 4 lines
Signature · 3 lines
-- Cyril Hrubis [email protected]
PATCH v4 1/4 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Cyril HrubisAdds SAFE_CLOCK_ADJTIME() macro to tst_safe_clocks.h.
--- include/tst_safe_clocks.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
include/tst_safe_clocks.h +18 -0
@@ -6,7 +6,9 @@*/ #include <time.h> +#include <sys/timex.h> #include "tst_test.h" +#include "lapi/syscalls.h" #include "lapi/posix_clocks.h" static inline void safe_clock_getres(const char *file, const int lineno,
@@ -44,6 +46,19 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } +static inline int safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); +if (rval <0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed %i" , file, lineno, rval); + +return rval; +} +#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))
@@ -52,3 +67,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))
Signature · 1 line
2.20.1
PATCH v4 2/4 lib: Add include guard to tst_safe_clocks.h
When adding a common header to my tests I missed this include guard when accidentally including tst_safe_clocks.h from .c and .h files. Since other tst_safe_*.h files have guards I thought it would be good to add to this one as well.
--- include/tst_safe_clocks.h | 5 +++++ 1 file changed, 5 insertions(+)
include/tst_safe_clocks.h +5 -0
@@ -5,6 +5,9 @@* Email : [email protected] */ +#ifndef TST_SAFE_CLOCKS_H__ +#define TST_SAFE_CLOCKS_H__ +#include <time.h> #include <sys/timex.h> #include "tst_test.h"
@@ -70,3 +73,5 @@ static inline int safe_clock_adjtime(const char *file, const int lineno,#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc)) + +#endif /* SAFE_CLOCKS_H__ */
Signature · 1 line
2.20.1
PATCH v4 3/4 lapi/posix_clocks.h: add MAX_CLOCKS definition
In reply to Rafael David TinocoUsed by clock_XXXtime() tests, defining MAX_CLOCKS in common header.
--- include/lapi/posix_clocks.h | 2 ++ testcases/kernel/syscalls/clock_gettime/clock_gettime02.c | 2 -- testcases/kernel/syscalls/clock_settime/clock_settime02.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-)
include/lapi/posix_clocks.h +2 -0
@@ -9,6 +9,8 @@#ifndef POSIX_CLOCKS_H__ #define POSIX_CLOCKS_H__ +#define MAX_CLOCKS 16 +#ifndef CLOCK_MONOTONIC_RAW # define CLOCK_MONOTONIC_RAW 4#endif
testcases/kernel/syscalls/clock_gettime/clock_gettime02.c +0 -2
@@ -24,8 +24,6 @@#include "tst_timer.h" #include "tst_safe_clocks.h" -#define MAX_CLOCKS 16 -struct test_case {clockid_t clktype;int exp_err;
testcases/kernel/syscalls/clock_settime/clock_settime02.c +0 -1
@@ -16,7 +16,6 @@#define DELTA_SEC 10#define NSEC_PER_SEC (1000000000L) -#define MAX_CLOCKS 16struct test_case {clockid_t type;
Signature · 1 line
2.20.1
PATCH v4 4/4 syscalls/clock_adjtime: create clock_adjtime syscall tests
In reply to Rafael David Tinococlock_adjtime{01,02} are created using the new API, based on existing adjtimex(2) tests. clock_adjtime() syscall might have as execution path:
1) a regular POSIX clock (only REALTIME clock implements adjtime())
- will behave exactly like adjtimex() system call.
- only one being tested here.
2) a dynamic POSIX clock (which ops are implemented by PTP clocks)
- will trigger the PTP clock driver function "adjtime()"
- different implementations from one PTP clock to another
- might return EOPNOTSUPP (like ptp_kvm_caps, for example)
- no observed execution entry point for clock_adjtime()
--- include/lapi/posix_clocks.h | 4 + runtest/syscalls | 3 + .../kernel/syscalls/clock_adjtime/.gitignore | 2 + .../kernel/syscalls/clock_adjtime/Makefile | 10 + .../syscalls/clock_adjtime/clock_adjtime.h | 57 +++++ .../syscalls/clock_adjtime/clock_adjtime01.c | 221 ++++++++++++++++++ .../syscalls/clock_adjtime/clock_adjtime02.c | 221 ++++++++++++++++++ 7 files changed, 518 insertions(+) create mode 100644 testcases/kernel/syscalls/clock_adjtime/.gitignore create mode 100644 testcases/kernel/syscalls/clock_adjtime/Makefile create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c create mode 100644 testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c
include/lapi/posix_clocks.h +4 -0
@@ -11,6 +11,10 @@#define MAX_CLOCKS 16 +#define ADJ_ALL (ADJ_OFFSET | ADJ_FREQUENCY | ADJ_MAXERROR | \ + ADJ_ESTERROR | ADJ_STATUS | ADJ_TIMECONST | \ + ADJ_TICK) +#ifndef CLOCK_MONOTONIC_RAW # define CLOCK_MONOTONIC_RAW 4#endif
runtest/syscalls +3 -0
@@ -74,6 +74,9 @@ chroot02 chroot02 chroot03 chroot03 chroot04 chroot04 +clock_adjtime01 clock_adjtime01 +clock_adjtime02 clock_adjtime02 + clock_getres01 clock_getres01 clock_nanosleep01 clock_nanosleep01 clock_nanosleep02 clock_nanosleep02
testcases/kernel/syscalls/clock_adjtime/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +clock_adjtime01 +clock_adjtime02
testcases/kernel/syscalls/clock_adjtime/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# Copyright (c) 2019 - Linaro Limited. All rights reserved. +# SPDX-License-Identifier: GPL-2.0-or-later + +top_srcdir ?= ../../../.. + +include $(top_srcdir)/include/mk/testcases.mk + +LDLIBS+=-lrt + +include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/clock_adjtime/clock_adjtime.h new file +57 -0
57 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c new file +221 -0
221 lines not on this page · raw message
testcases/kernel/syscalls/clock_adjtime/clock_adjtime02.c new file +221 -0
221 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH v4 1/4 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Rafael David TinocoHi!
Pushed, thanks.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
In reply to Rafael David TinocoHi!
This test fails for me and clock_adjtime() returns 5 (TIME_ERROR) for me.
Looks like the SAFE_ADJTIME() should fail only on rval < 0 and return the rval too so that we can possibly make use of the return value, the test passes for me with:
include/tst_safe_clocks.h +5 -3
@@ -46,16 +46,18 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } -static inline void safe_clock_adjtime (const char *file,const int lineno, +static inline int safe_clock_adjtime (const char *file,const int lineno,clockid_t clk_id,struct timex *txc) {int rval; rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); -if (rval !=0 ) +if (rval <0 )tst_brk (TBROK |TERRNO , -"%s:%d clock_adjtime() failed" , file, lineno); +"%s:%d clock_adjtime() failed %i" , file, lineno, rval); + +return rval; }
Also we should restore the adjtimex only if we actually managed to save it, with something as:
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c +7 -2
@@ -58,6 +58,7 @@static long hz;static struct timex saved, ttxc; +static int clock_saved;struct test_case {unsigned int modes;
@@ -165,10 +166,13 @@ static void verify_clock_adjtime(unsigned int i)static void setup (void ) {size_t i; +int rval;/* save original clock flags */ -SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); + rval =SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); + clock_saved =1 ; +tst_res (TINFO ,"clock_adjtime() = %i" , rval); hz =SAFE_SYSCONF (_SC_CLK_TCK);
@@ -203,7 +207,8 @@ static void cleanup(void)/* restore original clock flags */ -SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +if (clock_saved) +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); }static struct tst_test test = {
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Quoted 66 lines · Cyril Hrubis
Hi!
This test fails for me andclock_adjtime()returns 5 (TIME_ERROR) for me.Looks like the
SAFE_ADJTIME()should fail only on rval < 0 and return the rval too so that we can possibly make use of the return value, the test passes for me with:include/tst_safe_clocks.h +5
-3@@ -46,16 +46,18 @@ static inline void safe_clock_settime(const char *file, const int lineno, "%s:%d clock_gettime() failed", file, lineno); } -static inline void safe_clock_adjtime (const char *file,const int lineno, +static inline int safe_clock_adjtime (const char *file,const int lineno,clockid_t clk_id,struct timex *txc) {int rval; rval =tst_syscall (__NR_clock_adjtime, clk_id, txc); -if (rval !=0 ) +if (rval <0 )tst_brk (TBROK |TERRNO , -"%s:%d clock_adjtime() failed" , file, lineno); +"%s:%d clock_adjtime() failed %i" , file, lineno, rval); + +return rval; }Also we should restore the adjtimex only if we actually managed to save it, with something as:
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c +5
-1@@ -58,6 +58,7 @@static long hz;static struct timex saved, ttxc; +static int clock_saved;struct test_case {unsigned int modes;@@ -165,10 +166,13 @@ static void verify_clock_adjtime(unsigned int i)static void setup (void ) {size_t i; +int rval;/* save original clock flags */ -SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); + rval =SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); + clock_saved =1 ; +tst_res (TINFO ,"clock_adjtime() = %i" , rval); hz =SAFE_SYSCONF (_SC_CLK_TCK);
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c static void cleanup(void) · line 214
Quoted 9 lines
testcases/kernel/syscalls/clock_adjtime/clock_adjtime01.c +2
-1@@ -203,7 +207,8 @@ static void cleanup(void)/* restore original clock flags */ -SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); +if (clock_saved) +SAFE_CLOCK_ADJTIME (CLOCK_REALTIME , &saved); }static struct tst_test test = {
Alright, will send a v3, sorry about that.
PATCH v2 3/3 syscalls/clock_adjtime: create clock_adjtime syscall tests
Hi!
Quoted 1 line
Alright, will send a v3, sorry about that.
No problem :-) I'm happy to help.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 1/2 lib: include SAFE_CLOCK_ADJTIME() macro
In reply to Rafael David TinocoHi!
include/tst_safe_clocks.h static inline void safe_clock_settime(const char *file, const int lineno, · line 52
Quoted 6 lines
include/tst_safe_clocks.h +6
-0+static inline void safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc);
Any reason why we don't use clock_adjtime() here?
Or is the glibc wrapper missing?
Quoted 20 lines
include/tst_safe_clocks.h +7
-0+if (rval !=0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed" , file, lineno); +}#define SAFE_CLOCK_GETRES (clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))@@ -50,3 +63,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))Signature · 5 lines
2.20.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 1/2 lib: include SAFE_CLOCK_ADJTIME() macro
Quoted 12 lines · On 13 Mar 2019, at 13:09, Cyril Hrubis <[email protected]…
Hi!
include/tst_safe_clocks.h static inline void safe_clock_settime(const char *file, const int lineno, · line 52
Quoted 6 lines
include/tst_safe_clocks.h +6
-0+static inline void safe_clock_adjtime (const char *file,const int lineno, +clockid_t clk_id,struct timex *txc) +{ +int rval; + + rval =tst_syscall (__NR_clock_adjtime, clk_id, txc);Any reason why we don't use
clock_adjtime()here?
Quoted 1 line
Or is the glibc wrapper missing?
Yes, it is missing. It was added in glibc NEWS in a “new Linux interfaces” list and put into the syscalls list, but, at the moment, there is nothing wrapping it.
Quoted 19 lines
Quoted 19 lines
include/tst_safe_clocks.h +4
-0+if (rval !=0 ) +tst_brk (TBROK |TERRNO , +"%s:%d clock_adjtime() failed" , file, lineno); +}#define SAFE_CLOCK_GETRES(clk_id, res)\ safe_clock_getres(__FILE__, __LINE__, (clk_id), (res))include/tst_safe_clocks.h +3
-0@@ -50,3 +63,6 @@ static inline void safe_clock_settime(const char *file, const int lineno,#define SAFE_CLOCK_SETTIME (clk_id, tp)\ safe_clock_settime(__FILE__, __LINE__, (clk_id), (tp)) + +#define SAFE_CLOCK_ADJTIME (clk_id, txc)\ + safe_clock_adjtime(__FILE__, __LINE__, (clk_id), (txc))Signature · 1 line
2.20.1
Quoted 5 lines
Quoted 2 lines
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp <https://lists.linux.it/listinfo/ltp>Signature · 2 lines
Cyril Hrubis [email protected] <mailto:[email protected]>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.linux.it/pipermail/ltp/attachments/20190313/40e5e580/attachment.html>