Syscalls: Add support for time64 variants
v4 cover Syscalls: Add support for time64 variants
Hi,
This updates the pending syscall tests that lacked the time64 updates.
V4:
- Pass timer_t type to timer_gettime/settime syscalls instead of kernel_timer_t.
- Some part of timer_settime() patch was merged in timerfd_gettime() earlier by mistake, fixed that.
V3:
- Fix issues related to passing incorrect timespec type to syscalls.
- Take care of futex and semtimedop tests where the architecture provides the syscall number, but doesn't implement it.
- Other improvements and cleanups.
Viresh Kumar (17):
syscalls/timer_gettime: Add support for time64 tests syscalls/timer_settime: Add support for time64 tests syscalls/timerfd: Add support for time64 tests syscalls/sched_rr_get_interval: Add support for time64 tests syscalls/futex: Merge futex_wait_bitset tests syscalls/futex: Add support for time64 tests syscalls/io_pgetevents: Add support for time64 tests syscalls/sigwaitinfo: Migrate to new test framework syscalls/rt_sigtimedwait: Add support for time64 tests syscalls/mq_timed{send|receive}: Add support for time64 tests syscalls/recvmmsg: Add support for time64 tests syscalls/ppoll: Add support for time64 tests syscalls/select6: Add support for time64 tests syscalls/semop: Migrate to new test framework syscalls/semtimedop: Add support for semtimedop and its time64 version syscalls/utimensat: Migrate to new test framework syscalls/utimensat: Add support for time64 tests
include/lapi/io_pgetevents.h | 15 +- include/tst_timer.h | 196 +++++++ runtest/syscalls | 3 +- testcases/kernel/syscalls/futex/.gitignore | 1 - testcases/kernel/syscalls/futex/Makefile | 1 - .../syscalls/futex/futex_cmp_requeue01.c | 34 +- .../syscalls/futex/futex_cmp_requeue02.c | 24 +- testcases/kernel/syscalls/futex/futex_utils.h | 52 +- .../kernel/syscalls/futex/futex_wait01.c | 79 +-- .../kernel/syscalls/futex/futex_wait02.c | 102 ++-- .../kernel/syscalls/futex/futex_wait03.c | 87 ++- .../kernel/syscalls/futex/futex_wait04.c | 81 +-- .../kernel/syscalls/futex/futex_wait05.c | 2 +- .../kernel/syscalls/futex/futex_wait_bitset.h | 75 --- .../syscalls/futex/futex_wait_bitset01.c | 101 +++- .../syscalls/futex/futex_wait_bitset02.c | 18 - .../kernel/syscalls/futex/futex_wake01.c | 67 ++- .../kernel/syscalls/futex/futex_wake02.c | 95 ++-- .../kernel/syscalls/futex/futex_wake03.c | 109 ++-- .../kernel/syscalls/futex/futex_wake04.c | 146 +++-- testcases/kernel/syscalls/futex/futextest.h | 122 +++-- .../syscalls/io_pgetevents/io_pgetevents01.c | 33 +- .../syscalls/io_pgetevents/io_pgetevents02.c | 51 +- testcases/kernel/syscalls/ipc/semop/Makefile | 2 +- testcases/kernel/syscalls/ipc/semop/semop.h | 55 ++ testcases/kernel/syscalls/ipc/semop/semop01.c | 148 +++-- testcases/kernel/syscalls/ipc/semop/semop02.c | 156 +++--- testcases/kernel/syscalls/ipc/semop/semop03.c | 162 +++--- testcases/kernel/syscalls/ipc/semop/semop04.c | 177 +++--- testcases/kernel/syscalls/ipc/semop/semop05.c | 313 +++++------ .../mq_timedreceive/mq_timedreceive01.c | 92 +++- .../syscalls/mq_timedsend/mq_timedsend01.c | 96 ++-- testcases/kernel/syscalls/ppoll/ppoll01.c | 71 ++- .../sched_rr_get_interval01.c | 116 ++-- .../sched_rr_get_interval02.c | 122 ++--- .../sched_rr_get_interval03.c | 146 +++-- testcases/kernel/syscalls/select/select_var.h | 25 +- .../kernel/syscalls/sendmmsg/sendmmsg01.c | 40 +- .../kernel/syscalls/sendmmsg/sendmmsg_var.h | 55 +- .../syscalls/sigwaitinfo/sigwaitinfo01.c | 311 ++++++----- .../syscalls/timer_gettime/timer_gettime01.c | 124 ++--- .../syscalls/timer_settime/timer_settime01.c | 48 +- .../syscalls/timer_settime/timer_settime02.c | 66 ++- testcases/kernel/syscalls/timerfd/timerfd01.c | 53 +- testcases/kernel/syscalls/timerfd/timerfd04.c | 51 +- .../syscalls/timerfd/timerfd_gettime01.c | 133 ++--- .../syscalls/timerfd/timerfd_settime01.c | 136 +++-- .../syscalls/timerfd/timerfd_settime02.c | 28 +- testcases/kernel/syscalls/utils/mq_timed.h | 42 +- testcases/kernel/syscalls/utimensat/Makefile | 4 - .../kernel/syscalls/utimensat/utimensat01.c | 472 ++++++++-------- .../syscalls/utimensat/utimensat_tests.sh | 517 ------------------ 52 files changed, 2566 insertions(+), 2689 deletions(-) delete mode 100644 testcases/kernel/syscalls/futex/futex_wait_bitset.h delete mode 100644 testcases/kernel/syscalls/futex/futex_wait_bitset02.c create mode 100644 testcases/kernel/syscalls/ipc/semop/semop.h delete mode 100755 testcases/kernel/syscalls/utimensat/utimensat_tests.sh
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 1/17 syscalls/timer_gettime: Add support for time64 tests
This adds support for time64 tests to the existing timer_gettime() syscall tests.
--- include/tst_timer.h | 45 +++++++ .../syscalls/timer_gettime/timer_gettime01.c | 124 ++++++++---------- 2 files changed, 97 insertions(+), 72 deletions(-)
include/tst_timer.h +45 -0
@@ -15,6 +15,7 @@#include <sys/time.h> #include <time.h> #include "tst_test.h" +#include "lapi/common_timers.h" #include "lapi/syscalls.h" /*
@@ -112,6 +113,16 @@ struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ long long tv_nsec;/* nanoseconds */ }; + +struct __kernel_old_itimerspec { +struct __kernel_old_timespec it_interval;/* timer period */ +struct __kernel_old_timespec it_value;/* timer expiration */ +}; + +struct __kernel_itimerspec { +struct __kernel_timespec it_interval;/* timer period */ +struct __kernel_timespec it_value;/* timer expiration */ +};#endif enum tst_ts_type {
@@ -129,6 +140,14 @@ struct tst_ts { } ts; }; +struct tst_its { +enum tst_ts_type type; +union { +struct __kernel_itimerspec kern_old_its; +struct __kernel_itimerspec kern_its; + } ts; +}; +static inline void *tst_ts_get (struct tst_ts *t) {if (!t)
@@ -147,6 +166,22 @@ static inline void *tst_ts_get(struct tst_ts *t) } } +static inline void *tst_its_get (struct tst_its *t) +{ +if (!t) +return NULL ; + +switch (t->type) { +case TST_KERN_OLD_TIMESPEC : +return &t->ts.kern_old_its; +case TST_KERN_TIMESPEC : +return &t->ts.kern_its; +default : +tst_brk (TBROK ,"Invalid type: %d" , t->type); +return NULL ; + } +} +static inline int libc_clock_getres (clockid_t clk_id,void *ts) {return clock_getres (clk_id, ts);
@@ -212,6 +247,16 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int sys_timer_gettime (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime, timerid, its); +} + +static inline int sys_timer_gettime64 (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime64, timerid, its); +} +/* * Returns tst_ts seconds. */
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +52 -72
147 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 2/17 syscalls/timer_settime: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing timer_settime() syscall tests.
--- include/tst_timer.h | 34 ++++++++++ .../syscalls/timer_settime/timer_settime01.c | 48 ++++++++++---- .../syscalls/timer_settime/timer_settime02.c | 66 +++++++++++++------ 3 files changed, 116 insertions(+), 32 deletions(-)
include/tst_timer.h +34 -0
@@ -257,6 +257,40 @@ static inline int sys_timer_gettime64(timer_t timerid, void *its)return tst_syscall (__NR_timer_gettime64, timerid, its); } +static inline int sys_timer_settime (timer_t timerid,int flags,void *its, +void *old_its) +{ +return tst_syscall (__NR_timer_settime, timerid, flags, its, old_its); +} + +static inline int sys_timer_settime64 (timer_t timerid,int flags,void *its, +void *old_its) +{ +return tst_syscall (__NR_timer_settime64, timerid, flags, its, old_its); +} + +static inline void tst_its_set_time (struct tst_its *its,long long value_sec, +long long value_nsec,long long interval_sec, +long long interval_nsec) +{ +switch (its->type) { +case TST_KERN_OLD_TIMESPEC : + its->ts.kern_old_its.it_value.tv_sec = value_sec; + its->ts.kern_old_its.it_value.tv_nsec = value_nsec; + its->ts.kern_old_its.it_interval.tv_sec = interval_sec; + its->ts.kern_old_its.it_interval.tv_nsec = interval_nsec; +break ; +case TST_KERN_TIMESPEC : + its->ts.kern_its.it_value.tv_sec = value_sec; + its->ts.kern_its.it_value.tv_nsec = value_nsec; + its->ts.kern_its.it_interval.tv_sec = interval_sec; + its->ts.kern_its.it_interval.tv_nsec = interval_nsec; +break ; +default : +tst_brk (TBROK ,"Invalid type: %d" , its->type); + } +} +/* * Returns tst_ts seconds. */
testcases/kernel/syscalls/timer_settime/timer_settime01.c +35 -13
93 lines not on this page · raw message
testcases/kernel/syscalls/timer_settime/timer_settime02.c +47 -19
100 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 3/17 syscalls/timerfd: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing timerfd_gettime() and timerfd_settime() syscall tests.
--- include/tst_timer.h | 48 +++++++ testcases/kernel/syscalls/timerfd/timerfd01.c | 53 +++++-- testcases/kernel/syscalls/timerfd/timerfd04.c | 51 +++++-- .../syscalls/timerfd/timerfd_gettime01.c | 133 ++++++++--------- .../syscalls/timerfd/timerfd_settime01.c | 136 ++++++++---------- .../syscalls/timerfd/timerfd_settime02.c | 28 +++- 6 files changed, 279 insertions(+), 170 deletions(-)
include/tst_timer.h +48 -0
@@ -269,6 +269,54 @@ static inline int sys_timer_settime64(timer_t timerid, int flags, void *its,return tst_syscall (__NR_timer_settime64, timerid, flags, its, old_its); } +static inline int sys_timerfd_gettime (int fd,void *its) +{ +return tst_syscall (__NR_timerfd_gettime, fd, its); +} + +static inline int sys_timerfd_gettime64 (int fd,void *its) +{ +return tst_syscall (__NR_timerfd_gettime64, fd, its); +} + +static inline int sys_timerfd_settime (int fd,int flags,void *its, +void *old_its) +{ +return tst_syscall (__NR_timerfd_settime, fd, flags, its, old_its); +} + +static inline int sys_timerfd_settime64 (int fd,int flags,void *its, +void *old_its) +{ +return tst_syscall (__NR_timerfd_settime64, fd, flags, its, old_its); +} + +static inline long long tst_its_get_val_sec (struct tst_its its) +{ +switch (its.type) { +case TST_KERN_OLD_TIMESPEC : +return its.ts.kern_old_its.it_value.tv_sec; +case TST_KERN_TIMESPEC : +return its.ts.kern_its.it_value.tv_sec; +default : +tst_brk (TBROK ,"Invalid type: %d" , its.type); +return -1 ; + } +} + +static inline long long tst_its_get_val_nsec (struct tst_its its) +{ +switch (its.type) { +case TST_KERN_OLD_TIMESPEC : +return its.ts.kern_old_its.it_value.tv_nsec; +case TST_KERN_TIMESPEC : +return its.ts.kern_its.it_value.tv_nsec; +default : +tst_brk (TBROK ,"Invalid type: %d" , its.type); +return -1 ; + } +} +static inline void tst_its_set_time (struct tst_its *its,long long value_sec,long long value_nsec,long long interval_sec,long long interval_nsec)
testcases/kernel/syscalls/timerfd/timerfd01.c +41 -12
102 lines not on this page · raw message
testcases/kernel/syscalls/timerfd/timerfd04.c +43 -8
91 lines not on this page · raw message
testcases/kernel/syscalls/timerfd/timerfd_gettime01.c +59 -74
178 lines not on this page · raw message
testcases/kernel/syscalls/timerfd/timerfd_settime01.c +63 -73
182 lines not on this page · raw message
testcases/kernel/syscalls/timerfd/timerfd_settime02.c +25 -3
@@ -15,8 +15,8 @@* timerfd: Protect the might cancel mechanism proper */ #include <unistd.h> +#include "tst_timer.h" #include "tst_safe_timerfd.h" -#include "tst_test.h" #include "tst_fuzzy_sync.h" #include "tst_taint.h"
@@ -27,11 +27,30 @@#endif static int fd =-1 ; -static struct itimerspec its; +static struct tst_its its;static struct tst_fzsync_pair fzsync_pair; +static struct test_variants { +int (*tfd_settime)(int fd,int flags,void *new_value,void *old_value); +enum tst_ts_type type; +char *desc; +} variants[] = { +#if (__NR_timerfd_settime != __LTP__NR_INVALID_SYSCALL) + { .tfd_settime = sys_timerfd_settime, .type =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_timerfd_settime64 != __LTP__NR_INVALID_SYSCALL) + { .tfd_settime = sys_timerfd_settime64, .type =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; +static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); + its.type = tv->type; +tst_taint_init (TST_TAINT_W |TST_TAINT_D ); fd =SAFE_TIMERFD_CREATE (CLOCK_REALTIME ,0 );
@@ -48,7 +67,9 @@ static void cleanup(void)static int punch_clock (int flags) { -return timerfd_settime (fd, flags, &its,NULL ); +return variants[tst_variant].tfd_settime (fd, flags,tst_its_get (&its), +NULL ); + }static void *thread_run (void *arg)
@@ -91,6 +112,7 @@ static void run(void)static struct tst_test test = { .test_all = run, + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .min_kver ="2.6.25" ,
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 4/17 syscalls/sched_rr_get_interval: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing sched_rr_get_interval() syscall tests.
--- include/tst_timer.h | 16 ++ .../sched_rr_get_interval01.c | 116 ++++++-------- .../sched_rr_get_interval02.c | 122 ++++++--------- .../sched_rr_get_interval03.c | 146 ++++++++---------- 4 files changed, 173 insertions(+), 227 deletions(-)
include/tst_timer.h +16 -0
@@ -12,6 +12,7 @@#ifndef TST_TIMER #define TST_TIMER +#include <sched.h> #include <sys/time.h> #include <time.h> #include "tst_test.h"
@@ -247,6 +248,21 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int libc_sched_rr_get_interval (pid_t pid,void *ts) +{ +return sched_rr_get_interval (pid, ts); +} + +static inline int sys_sched_rr_get_interval (pid_t pid,void *ts) +{ +return tst_syscall (__NR_sched_rr_get_interval, pid, ts); +} + +static inline int sys_sched_rr_get_interval64 (pid_t pid,void *ts) +{ +return tst_syscall (__NR_sched_rr_get_interval_time64, pid, ts); +} +static inline int sys_timer_gettime (timer_t timerid,void *its) {return tst_syscall (__NR_timer_gettime, timerid, its);
testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c +45 -71
146 lines not on this page · raw message
testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c +48 -74
152 lines not on this page · raw message
testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c +64 -82
188 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 5/17 syscalls/futex: Merge futex_wait_bitset tests
In reply to Viresh KumarWe can handle them easily in a single test, lets do it.
--- runtest/syscalls | 1 - testcases/kernel/syscalls/futex/.gitignore | 1 - testcases/kernel/syscalls/futex/Makefile | 1 - .../kernel/syscalls/futex/futex_wait_bitset.h | 75 ------------------- .../syscalls/futex/futex_wait_bitset01.c | 73 +++++++++++++++++- .../syscalls/futex/futex_wait_bitset02.c | 18 ----- 6 files changed, 71 insertions(+), 98 deletions(-) delete mode 100644 testcases/kernel/syscalls/futex/futex_wait_bitset.h delete mode 100644 testcases/kernel/syscalls/futex/futex_wait_bitset02.c
runtest/syscalls +0 -1
@@ -1664,7 +1664,6 @@ futex_wake02 futex_wake02 futex_wake03 futex_wake03 futex_wake04 futex_wake04 futex_wait_bitset01 futex_wait_bitset01 -futex_wait_bitset02 futex_wait_bitset02 memfd_create01 memfd_create01 memfd_create02 memfd_create02
testcases/kernel/syscalls/futex/.gitignore +0 -1
@@ -6,7 +6,6 @@ /futex_wait04 /futex_wait05 /futex_wait_bitset01 -/futex_wait_bitset02 /futex_wake01 /futex_wake02 /futex_wake03
testcases/kernel/syscalls/futex/Makefile +0 -1
@@ -12,7 +12,6 @@ futex_wake02: CFLAGS+=-pthread futex_wake04: CFLAGS+=-pthread futex_wait05: LDLIBS+=-lrt futex_wait_bitset01: LDLIBS+=-lrt -futex_wait_bitset02: LDLIBS+=-lrt include $(top_srcdir)/include/mk/testcases.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/futex/futex_wait_bitset.h deleted +0 -75
75 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait_bitset01.c +71 -2
78 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait_bitset02.c deleted +0 -18
@@ -1,18 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Copyright (C) 2015 Cyril Hrubis <[email protected]> -* -* 1. Block on a bitset futex and wait for timeout, the difference between -* normal futex and bitset futex is that that the later have absolute timeout. -* 2. Check that the futex waited for expected time. -*/ - -#include <errno.h> - -#include "tst_test.h" -#include "tst_timer.h" -#include "futextest.h" - -#define USE_CLOCK CLOCK_REALTIME - -#include "futex_wait_bitset.h"
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 6/17 syscalls/futex: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing futex() syscall tests.
--- include/tst_timer.h | 12 ++ .../syscalls/futex/futex_cmp_requeue01.c | 34 +++- .../syscalls/futex/futex_cmp_requeue02.c | 24 ++- testcases/kernel/syscalls/futex/futex_utils.h | 52 +++++-- .../kernel/syscalls/futex/futex_wait01.c | 79 +++++----- .../kernel/syscalls/futex/futex_wait02.c | 102 ++++++------ .../kernel/syscalls/futex/futex_wait03.c | 87 ++++++----- .../kernel/syscalls/futex/futex_wait04.c | 81 +++++----- .../kernel/syscalls/futex/futex_wait05.c | 2 +- .../syscalls/futex/futex_wait_bitset01.c | 48 ++++-- .../kernel/syscalls/futex/futex_wake01.c | 67 ++++---- .../kernel/syscalls/futex/futex_wake02.c | 95 ++++++------ .../kernel/syscalls/futex/futex_wake03.c | 109 +++++++------ .../kernel/syscalls/futex/futex_wake04.c | 146 +++++++++--------- testcases/kernel/syscalls/futex/futextest.h | 122 ++++++++++----- 15 files changed, 593 insertions(+), 467 deletions(-)
include/tst_timer.h +12 -0
@@ -248,6 +248,18 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int sys_futex (int *uaddr,int futex_op,int val,void *to, +int *uaddr2,int val3) +{ +return tst_syscall (__NR_futex, uaddr, futex_op, val, to, uaddr2, val3); +} + +static inline int sys_futex_time64 (int *uaddr,int futex_op,int val,void *to, +int *uaddr2,int val3) +{ +return tst_syscall (__NR_futex_time64, uaddr, futex_op, val, to, uaddr2, val3); +} +static inline int libc_sched_rr_get_interval (pid_t pid,void *ts) {return sched_rr_get_interval (pid, ts);
testcases/kernel/syscalls/futex/futex_cmp_requeue01.c +28 -6
@@ -42,14 +42,29 @@ static struct tcase { {1000, 300, 500}, }; +static struct test_variants { +enum futex_fn_type fntype; +enum tst_ts_type tstype; +char *desc; +} variants[] = { +#if (__NR_futex != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX , .tstype =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_futex_time64 != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX64 , .tstype =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; +static void do_child (void ) { +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts usec =tst_ts_from_ms (tv->tstype, max_sleep_ms);int slept_for_ms =0 ; -struct timespec usec =tst_timespec_from_ms (max_sleep_ms);int pid =getpid ();int ret =0 ; -if (futex_wait (&sd->futexes[0 ], sd->futexes[0 ], &usec,0 ) ==-1 ) { +if (futex_wait (tv->fntype, &sd->futexes[0 ], sd->futexes[0 ], &usec,0 ) ==-1 ) {if (errno ==EAGAIN ) {/* spurious wakeup or signal */ tst_atomic_inc (&sd->spurious);
@@ -72,6 +87,7 @@ static void do_child(void)static void verify_futex_cmp_requeue (unsigned int n) { +struct test_variants *tv = &variants[tst_variant];int num_requeues =0 , num_waits =0 , num_total =0 ;int i, status, spurious, woken_up;struct tcase *tc = &tcases[n];
@@ -104,8 +120,8 @@ static void verify_futex_cmp_requeue(unsigned int n)* specifies an upper limit on the number of waiters that are requeued. * Returns the total number of waiters that were woken up or requeued. */ -TEST (futex_cmp_requeue (&sd->futexes[0 ], sd->futexes[0 ], &sd->futexes[1 ], - tc->set_wakes, tc->set_requeues,0 )); +TEST (futex_cmp_requeue (tv->fntype, &sd->futexes[0 ], sd->futexes[0 ], + &sd->futexes[1 ], tc->set_wakes, tc->set_requeues,0 ));/* Fail if more than requested wakes + requeues were returned */ if (TST_RET > exp_ret) {
@@ -115,8 +131,8 @@ static void verify_futex_cmp_requeue(unsigned int n)tst_res (TINFO ,"futex_cmp_requeue() returned %ld" ,TST_RET ); } - num_requeues =futex_wake (&sd->futexes[1 ], tc->num_waiters,0 ); - num_waits =futex_wake (&sd->futexes[0 ], tc->num_waiters,0 ); + num_requeues =futex_wake (tv->fntype, &sd->futexes[1 ], tc->num_waiters,0 ); + num_waits =futex_wake (tv->fntype, &sd->futexes[0 ], tc->num_waiters,0 );tst_atomic_store (1 , &sd->test_done);for (i =0 ; i < tc->num_waiters; i++) {
@@ -178,6 +194,11 @@ static void verify_futex_cmp_requeue(unsigned int n)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +futex_supported_by_kernel (tv->fntype); + max_sleep_ms =tst_multiply_timeout (5000 ); sd = SAFE_MMAP(NULL, sizeof(*sd), PROT_READ | PROT_WRITE,
@@ -198,5 +219,6 @@ static struct tst_test test = { .cleanup = cleanup, .tcnt = ARRAY_SIZE(tcases), .test = verify_futex_cmp_requeue, + .test_variants = ARRAY_SIZE(variants), .forks_child = 1, };
testcases/kernel/syscalls/futex/futex_cmp_requeue02.c +22 -2
@@ -32,12 +32,26 @@ static struct tcase { {1, 1, FUTEX_INITIALIZER + 1, EAGAIN}, }; +static struct test_variants { +enum futex_fn_type fntype; +char *desc; +} variants[] = { +#if (__NR_futex != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_futex_time64 != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX64 , .desc ="syscall time64 with kernel spec" }, +#endif +}; +static void verify_futex_cmp_requeue (unsigned int n) { +struct test_variants *tv = &variants[tst_variant];struct tcase *tc = &tcases[n]; -TEST (futex_cmp_requeue (&futexes[0 ], tc->exp_val, &futexes[1 ], - tc->set_wakes, tc->set_requeues,0 )); +TEST (futex_cmp_requeue (tv->fntype, &futexes[0 ], tc->exp_val, + &futexes[1 ], tc->set_wakes, tc->set_requeues,0 ));if (TST_RET !=-1 ) {tst_res (TFAIL ,"futex_cmp_requeue() succeeded unexpectedly" );return ;
@@ -55,6 +69,11 @@ static void verify_futex_cmp_requeue(unsigned int n)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +futex_supported_by_kernel (tv->fntype); + futexes =SAFE_MMAP (NULL ,sizeof (futex_t) *2 ,PROT_READ |PROT_WRITE ,MAP_ANONYMOUS |MAP_SHARED ,-1 ,0 );
@@ -73,6 +92,7 @@ static struct tst_test test = { .cleanup = cleanup, .test = verify_futex_cmp_requeue, .tcnt = ARRAY_SIZE(tcases), + .test_variants = ARRAY_SIZE(variants), .tags = (const struct tst_tag []) { {"CVE" ,"2018-6927" }, {"linux-git" ,"fbe0e839d1e2" },
testcases/kernel/syscalls/futex/futex_utils.h +42 -10
86 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait01.c +40 -39
122 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait02.c +45 -57
150 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait03.c +43 -44
130 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait04.c +41 -40
106 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait05.c +1 -1
@@ -19,7 +19,7 @@ int sample_fn(int clk_id, long long usec)futex_t futex =FUTEX_INITIALIZER ;tst_timer_start (clk_id); -TEST (futex_wait (&futex, futex, &to,0 )); +TEST (syscall (SYS_futex, &futex,FUTEX_WAIT , futex, &to,NULL ,0 ));tst_timer_stop ();tst_timer_sample ();
testcases/kernel/syscalls/futex/futex_wait_bitset01.c +38 -10
89 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake01.c +31 -36
96 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake02.c +46 -49
174 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake03.c +52 -57
171 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake04.c +72 -74
253 lines not on this page · raw message
testcases/kernel/syscalls/futex/futextest.h +80 -42
225 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 7/17 syscalls/io_pgetevents: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing io_pgetevents() syscall tests.
While at it, also pass mode to SAFE_OPEN() to avoid any errors when the tests are run for multiple variants together.
Also get rid of an extra copy of local fd variable, which is incorrect.
--- include/lapi/io_pgetevents.h | 15 ++++-- .../syscalls/io_pgetevents/io_pgetevents01.c | 33 +++++++++++- .../syscalls/io_pgetevents/io_pgetevents02.c | 51 +++++++++++++++---- 3 files changed, 83 insertions(+), 16 deletions(-)
include/lapi/io_pgetevents.h +10 -5
@@ -16,15 +16,20 @@#ifdef HAVE_LIBAIO #include <libaio.h> -#ifndef HAVE_IO_PGETEVENTS -int io_pgetevents (io_context_t ctx,long min_nr,long max_nr, -struct io_event *events,struct timespec *timeout, -sigset_t *sigmask) +static inline int sys_io_pgetevents (io_context_t ctx,long min_nr,long max_nr, +struct io_event *events,void *timeout,sigset_t *sigmask) {return tst_syscall (__NR_io_pgetevents, ctx, min_nr, max_nr, events, timeout, sigmask); } -#endif /* HAVE_IO_PGETEVENTS */ + +static inline int sys_io_pgetevents_time64 (io_context_t ctx,long min_nr,long max_nr, +struct io_event *events,void *timeout,sigset_t *sigmask) +{ +return tst_syscall (__NR_io_pgetevents_time64, ctx, min_nr, max_nr, + events, timeout, sigmask); +} +#endif /* HAVE_LIBAIO */ #endif /* IO_PGETEVENTS_H */
testcases/kernel/syscalls/io_pgetevents/io_pgetevents01.c +31 -2
@@ -6,11 +6,32 @@* Basic io_pgetevents() test to receive 1 event successfully. */ #include "tst_test.h" +#include "tst_timer.h" #include "lapi/io_pgetevents.h" #ifdef HAVE_LIBAIO static int fd; +static struct test_variants { +int (*io_pgetevents)(io_context_t ctx,long min_nr,long max_nr, +struct io_event *events,void *timeout,sigset_t *sigmask); +enum tst_ts_type type; +char *desc; +} variants[] = { +#if (__NR_io_pgetevents != __LTP__NR_INVALID_SYSCALL) + { .io_pgetevents = sys_io_pgetevents, .type =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_io_pgetevents_time64 != __LTP__NR_INVALID_SYSCALL) + { .io_pgetevents = sys_io_pgetevents_time64, .type =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; + +static void setup (void ) +{ +tst_res (TINFO ,"Testing variant: %s" , variants[tst_variant].desc); +} +static void cleanup (void ) {if (fd >0 )
@@ -19,12 +40,18 @@ static void cleanup(void)static void run (void ) { +struct test_variants *tv = &variants[tst_variant];struct io_event events[1 ];struct iocb cb, *cbs[1 ];io_context_t ctx =0 ; +struct tst_ts to;sigset_t sigmask;char data[4096 ]; -int ret, fd; +int ret; + + to.type = tv->type; +tst_ts_set_sec (&to,0 ); +tst_ts_set_nsec (&to,10000 ); cbs[0 ] = &cb;sigemptyset (&sigmask);
@@ -41,7 +68,7 @@ static void run(void)tst_brk (TBROK |TERRNO ,"io_submit() failed" );/* get the reply */ - ret =io_pgetevents (ctx,1 ,1 , events,NULL , &sigmask); + ret = tv->io_pgetevents (ctx,1 ,1 , events,tst_ts_get (&to), &sigmask);if (ret ==1 )tst_res (TPASS ,"io_pgetevents() works as expected" );
@@ -55,8 +82,10 @@ static void run(void)static struct tst_test test = { .min_kver ="4.18" , .test_all = run, + .test_variants =ARRAY_SIZE (variants), .needs_tmpdir =1 , .cleanup = cleanup, + .setup = setup, };#else
testcases/kernel/syscalls/io_pgetevents/io_pgetevents02.c +42 -9
94 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 8/17 syscalls/sigwaitinfo: Migrate to new test framework
In reply to Viresh KumarThis migrates the sigwaitinfo tests to use the new test framework.
--- .../syscalls/sigwaitinfo/sigwaitinfo01.c | 209 +++++++----------- 1 file changed, 84 insertions(+), 125 deletions(-)
testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c +84 -125
@@ -1,93 +1,58 @@ -/* -* Copyright (c) Jiri Palecek<[email protected]>, 2009 -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it would be useful, but -* WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -* -* Further, this software is distributed without any warranty that it is -* free of the rightful claim of any third person regarding infringement -* or the like. Any license provided herein, whether implied or -* otherwise, applies only to this software file. Patent licenses, if -* any, provided herein do not apply to combinations of this program with -* other software, or any other product whatsoever. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ -#include "test.h" +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (c) Jiri Palecek<[email protected]>, 2009 */ + +#include "tst_test.h" #include <errno.h> +#include <stdlib.h> #include <signal.h> -#include "../utils/include_j_h.h" -#include "../utils/common_j_h.c" #include <limits.h> #include "lapi/syscalls.h" +#include "tst_sig_proc.h" #define SUCCEED_OR_DIE (syscall, message, ...) \ (errno = 0, \ ({int ret=syscall(__VA_ARGS__); \ if (ret==-1) \ - tst_brkm(TBROK|TERRNO, cleanup, message);\ + tst_brk(TBROK|TERRNO, message);\ ret;})) -/* Report success iff TEST_RETURN and TEST_ERRNO are equal to +/* Report success iff TST_RET and TST_ERR are equal to exp_return and exp_errno, resp., and cond is true. If cond is not true, report condition_errmsg */ -static void report_success_cond (const char *func,const char *file,int line, +static void report_success_cond (const char *func,int line,long exp_return,int exp_errno,int condition,char *condition_errmsg) { -if (exp_return ==TEST_RETURN - && (exp_return !=-1 || exp_errno ==TEST_ERRNO )) +if (exp_return ==TST_RET + && (exp_return !=-1 || exp_errno ==TST_ERR ))if (condition) -tst_resm (TPASS ,"Test passed" ); +tst_res (TPASS ,"%s (%d): Test passed" , func, line);else -tst_resm (TFAIL ,"%s (%s: %d): %s" , func, file, line, +tst_res (TFAIL ,"%s (%d): %s" , func, line, condition_errmsg); -else if (TEST_RETURN !=-1 ) -tst_resm (TFAIL , -"%s (%s: %d): Unexpected return value; expected %ld, got %ld" , - func, file, line, exp_return,TEST_RETURN ); +else if (TST_RET !=-1 ) +tst_res (TFAIL , +"%s (%d): Unexpected return value; expected %ld, got %ld" , + func, line, exp_return,TST_RET );else -tst_resm (TFAIL |TTERRNO ,"%s (%s: %d): Unexpected failure" , - func, file, line); +tst_res (TFAIL |TTERRNO ,"%s (%d): Unexpected failure" , + func, line); }#define REPORT_SUCCESS_COND (exp_return, exp_errno, condition, condition_errmsg) \ - report_success_cond(__FUNCTION__, __FILE__, __LINE__, exp_return, exp_errno, condition, condition_errmsg); + report_success_cond(__FUNCTION__, __LINE__, exp_return, exp_errno, condition, condition_errmsg); -/* Report success iff TEST_RETURN and TEST_ERRNO are equal to +/* Report success iff TST_RET and TST_ERR are equal to exp_return and exp_errno, resp. */ #define REPORT_SUCCESS (exp_return, exp_errno) \ REPORT_SUCCESS_COND(exp_return, exp_errno, 1, ""); -static void cleanup (void ); -static void empty_handler (int sig) { } -static void setup (void ) -{ -tst_sig (FORK ,DEF_HANDLER , cleanup); -signal (SIGUSR1 , empty_handler); -signal (SIGALRM , empty_handler); -signal (SIGUSR2 ,SIG_IGN ); - -TEST_PAUSE ; -} - -static void cleanup (void ) -{ -} -typedef int (*swi_func ) (const sigset_t * set,siginfo_t * info,struct timespec * timeout);typedef void (*test_func ) (swi_func ,int );
@@ -110,7 +75,6 @@ static int my_sigwait(const sigset_t * set, siginfo_t * info,static int my_sigwaitinfo (const sigset_t * set,siginfo_t * info,struct timespec *timeout) { -return sigwaitinfo (set, info); }#endif
@@ -119,7 +83,6 @@ static int my_sigwaitinfo(const sigset_t * set, siginfo_t * info,static int my_sigtimedwait (const sigset_t * set,siginfo_t * info,struct timespec *timeout) { -return sigtimedwait (set, info, timeout); }#endif
@@ -129,7 +92,7 @@ static int my_rt_sigtimedwait(const sigset_t * set, siginfo_t * info, struct timespec *timeout) {/* _NSIG is always the right number of bits of signal map for all arches */ -return ltp_syscall (__NR_rt_sigtimedwait, set, info, timeout, _NSIG/8 ); +return tst_syscall (__NR_rt_sigtimedwait, set, info, timeout, _NSIG/8 ); }#endif
@@ -141,12 +104,13 @@ void test_empty_set(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigemptyset,"sigemptyset failed" , &sigs);/* Run a child that will wake us up */ - child =create_sig_proc (100000 , signo,UINT_MAX ); + child =create_sig_proc (signo,INT_MAX ,100000 );TEST (sigwaitinfo (&sigs, &si,NULL ));REPORT_SUCCESS (-1 ,EINTR ); -kill (child,SIGTERM ); +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }void test_timeout (swi_func sigwaitinfo,int signo)
@@ -159,12 +123,13 @@ void test_timeout(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigemptyset,"sigemptyset failed" , &sigs);/* Run a child that will wake us up */ - child =create_sig_proc (100000 , signo,UINT_MAX ); + child =create_sig_proc (signo,INT_MAX ,100000 );TEST (sigwaitinfo (&sigs, &si, &ts));REPORT_SUCCESS (-1 ,EAGAIN ); -kill (child,SIGTERM ); +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }/* Note: sigwait-ing for a signal that is not blocked is unspecified
@@ -180,14 +145,15 @@ void test_unmasked_matching(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigaddset,"sigaddset failed" , &sigs, signo);/* Run a child that will wake us up */ - child =create_sig_proc (100000 , signo,UINT_MAX ); + child =create_sig_proc (signo,INT_MAX ,100000 );TEST (sigwaitinfo (&sigs, &si,NULL ));REPORT_SUCCESS_COND (signo,0 , si.si_pid == child && si.si_code ==SI_USER && si.si_signo == signo,"Struct siginfo mismatch" ); -kill (child,SIGTERM ); +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }void test_unmasked_matching_noinfo (swi_func sigwaitinfo,int signo)
@@ -198,12 +164,13 @@ void test_unmasked_matching_noinfo(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigemptyset,"sigemptyset failed" , &sigs);SUCCEED_OR_DIE (sigaddset,"sigaddset failed" , &sigs, signo);/* Run a child that will wake us up */ - child =create_sig_proc (100000 , signo,UINT_MAX ); + child =create_sig_proc (signo,INT_MAX ,100000 );TEST (sigwaitinfo (&sigs,NULL ,NULL ));REPORT_SUCCESS (signo,0 ); -kill (child,SIGTERM ); +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }void test_masked_matching (swi_func sigwaitinfo,int signo)
@@ -224,7 +191,7 @@ void test_masked_matching(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigdelset,"sigaddset failed" , &sigs,SIGCHLD );/* Run a child that will wake us up */ - child =create_sig_proc (0 , signo,1 ); + child =create_sig_proc (signo,1 ,0 );TEST (sigwaitinfo (&sigs, &si,NULL )); REPORT_SUCCESS_COND(signo, 0, si.si_pid == child
@@ -234,13 +201,14 @@ void test_masked_matching(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigprocmask,"restoring original signal mask failed" ,SIG_SETMASK , &oldmask, &oldmask); - tst_count--; -if (sigismember (&oldmask, signo)) -tst_resm (TPASS ,"sigwaitinfo restored the original mask" ); +tst_res (TPASS ,"sigwaitinfo restored the original mask" );else -tst_resm (TFAIL , +tst_res (TFAIL ,"sigwaitinfo failed to restore the original mask" ); + +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }void test_masked_matching_rt (swi_func sigwaitinfo,int signo)
@@ -265,12 +233,12 @@ void test_masked_matching_rt(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigdelset,"sigdelset failed" , &sigs,SIGCHLD );/* Run a child that will wake us up */ - child[0 ] =create_sig_proc (0 , signo,1 ); - child[1 ] =create_sig_proc (0 , signo +1 ,1 ); + child[0 ] =create_sig_proc (signo,1 ,0 ); + child[1 ] =create_sig_proc (signo +1 ,1 ,0 );/* Ensure that the signals have been sent */ -waitpid (child[0 ], &status,0 ); -waitpid (child[1 ], &status,0 ); +SAFE_WAITPID (child[0 ], &status,0 ); +SAFE_WAITPID (child[1 ], &status,0 );TEST (sigwaitinfo (&sigs, &si,NULL )); REPORT_SUCCESS_COND(signo, 0, si.si_pid == child[0]
@@ -278,7 +246,6 @@ void test_masked_matching_rt(swi_func sigwaitinfo, int signo) && si.si_signo == signo, "Struct siginfo mismatch");/* eat the other signal */ - tst_count--;TEST (sigwaitinfo (&sigs, &si,NULL ));REPORT_SUCCESS_COND (signo +1 ,0 , si.si_pid == child[1 ] && si.si_code == SI_USER
@@ -288,12 +255,10 @@ void test_masked_matching_rt(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigprocmask,"restoring original signal mask failed" ,SIG_SETMASK , &oldmask, &oldmask); - tst_count--; -if (sigismember (&oldmask, signo)) -tst_resm (TPASS ,"sigwaitinfo restored the original mask" ); +tst_res (TPASS ,"sigwaitinfo restored the original mask" );else -tst_resm (TFAIL , +tst_res (TFAIL ,"sigwaitinfo failed to restore the original mask" ); }
@@ -314,7 +279,7 @@ void test_masked_matching_noinfo(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigdelset,"sigaddset failed" , &sigs,SIGCHLD );/* Run a child that will wake us up */ - child =create_sig_proc (0 , signo,1 ); + child =create_sig_proc (signo,1 ,0 );TEST (sigwaitinfo (&sigs,NULL ,NULL ));REPORT_SUCCESS (signo,0 );
@@ -322,14 +287,14 @@ void test_masked_matching_noinfo(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigprocmask,"restoring original signal mask failed" ,SIG_SETMASK , &oldmask, &oldmask); - tst_count--; -if (sigismember (&oldmask, signo)) -tst_resm (TPASS ,"sigwaitinfo restored the original mask" ); +tst_res (TPASS ,"sigwaitinfo restored the original mask" );else -tst_resm (TFAIL , +tst_res (TFAIL ,"sigwaitinfo failed to restore the original mask" ); +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }void test_bad_address (swi_func sigwaitinfo,int signo)
@@ -349,7 +314,7 @@ void test_bad_address(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigdelset,"sigaddset failed" , &sigs,SIGCHLD );/* Run a child that will wake us up */ - child =create_sig_proc (0 , signo,1 ); + child =create_sig_proc (signo,1 ,0 );TEST (sigwaitinfo (&sigs, (void *)1 ,NULL ));REPORT_SUCCESS (-1 ,EFAULT );
@@ -357,7 +322,8 @@ void test_bad_address(swi_func sigwaitinfo, int signo)SUCCEED_OR_DIE (sigprocmask,"sigprocmask failed" ,SIG_SETMASK , &oldmask, &oldmask); -kill (child,SIGTERM ); +SAFE_KILL (child,SIGTERM ); +SAFE_WAIT (NULL ); }void test_bad_address2 (swi_func sigwaitinfo,int signo)
@@ -367,7 +333,7 @@ void test_bad_address2(swi_func sigwaitinfo, int signo)switch (pid =fork ()) {case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); +tst_brk (TBROK |TERRNO ,"fork() failed" );case 0 :signal (SIGSEGV ,SIG_DFL );
@@ -377,31 +343,31 @@ void test_bad_address2(swi_func sigwaitinfo, int signo)*/ TEST (sigwaitinfo ((void *)1 ,NULL ,NULL )); -if (TEST_RETURN ==-1 &&TEST_ERRNO ==EFAULT ) +if (TST_RET ==-1 &&TST_ERR ==EFAULT )_exit (0 ); -tst_resm (TINFO |TTERRNO ,"swi_func returned: %ld" , -TEST_RETURN ); +tst_res (TINFO |TTERRNO ,"swi_func returned: %ld" , +TST_RET );_exit (1 );break ;default :break ; } -SUCCEED_OR_DIE (waitpid,"waitpid failed" , pid, &status,0 ); +SAFE_WAITPID (pid, &status,0 );if ((WIFSIGNALED (status) &&WTERMSIG (status) ==SIGSEGV ) || (WIFEXITED (status) &&WEXITSTATUS (status) ==0 )) { -tst_resm (TPASS ,"Test passed" ); +tst_res (TPASS ,"Test passed" );return ; }if (WIFEXITED (status)) { -tst_resm (TFAIL ,"Unrecognised child exit code: %d" , +tst_res (TFAIL ,"Unrecognised child exit code: %d" ,WEXITSTATUS (status)); }if (WIFSIGNALED (status)) { -tst_resm (TFAIL ,"Unrecognised child termsig: %d" , +tst_res (TFAIL ,"Unrecognised child termsig: %d" ,WTERMSIG (status)); } }
@@ -474,38 +440,31 @@ struct test_desc {#endif }; -#if definedTEST_SIGWAITINFO -const char *TCID ="sigwaitinfo01" ; -#elif definedTEST_RT_SIGTIMEDWAIT -const char *TCID ="rt_sigtimedwait01" ; -#elif definedTEST_SIGTIMEDWAIT -const char *TCID ="sigtimedwait01" ; -#elif definedTEST_SIGWAIT -const char *TCID ="sigwait01" ; -#endif - -int TST_TOTAL =ARRAY_SIZE (tests); - -int main (int argc,char **argv) +static void run (unsigned int i) { -unsigned i; -int lc; - -tst_parse_opts (argc, argv,NULL ,NULL ); +struct test_desc *tc = &tests[i]; -setup (); + tc->tf (tc->swi, tc->signo); +} -for (lc =0 ;TEST_LOOPING (lc); ++lc) { - tst_count =0 ; +static void setup (void ) +{ +signal (SIGUSR1 , empty_handler); +signal (SIGALRM , empty_handler); +signal (SIGUSR2 ,SIG_IGN ); -for (i =0 ; i <ARRAY_SIZE (tests); i++) { -alarm (10 );/* arrange a 10 second timeout */ -tst_resm (TINFO ,"%p, %d" , tests[i].swi, tests[i].signo); - tests[i].tf (tests[i].swi, tests[i].signo); - } -alarm (0 ); - } +alarm (10 );/* arrange a 10 second timeout */ +} -cleanup (); -tst_exit (); +static void cleanup (void ) +{ +alarm (0 ); } + +static struct tst_test test = { + .test= run, + .tcnt =ARRAY_SIZE (tests), + .setup = setup, + .cleanup = cleanup, + .forks_child =1 , +};
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 9/17 syscalls/rt_sigtimedwait: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing rt_sigtimedwait() syscall tests.
--- .../syscalls/sigwaitinfo/sigwaitinfo01.c | 112 +++++++++++++----- 1 file changed, 80 insertions(+), 32 deletions(-)
testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c +80 -32
@@ -2,6 +2,7 @@/* Copyright (c) Jiri Palecek<[email protected]>, 2009 */ #include "tst_test.h" +#include "tst_timer.h" #include <errno.h> #include <stdlib.h> #include <signal.h>
@@ -54,12 +55,12 @@ static void empty_handler(int sig) }typedef int (*swi_func ) (const sigset_t * set,siginfo_t * info, -struct timespec * timeout); -typedef void (*test_func ) (swi_func ,int ); +void * timeout); +typedef void (*test_func ) (swi_func ,int ,enum tst_ts_type type);#ifdef TEST_SIGWAIT static int my_sigwait (const sigset_t * set,siginfo_t * info, -struct timespec *timeout) +void *timeout) {int ret;int err =sigwait (set, &ret);
@@ -73,7 +74,7 @@ static int my_sigwait(const sigset_t * set, siginfo_t * info,#ifdef TEST_SIGWAITINFO static int my_sigwaitinfo (const sigset_t * set,siginfo_t * info, -struct timespec *timeout) +void *timeout) {return sigwaitinfo (set, info); }
@@ -81,7 +82,7 @@ static int my_sigwaitinfo(const sigset_t * set, siginfo_t * info,#ifdef TEST_SIGTIMEDWAIT static int my_sigtimedwait (const sigset_t * set,siginfo_t * info, -struct timespec *timeout) +void *timeout) {return sigtimedwait (set, info, timeout); }
@@ -89,14 +90,23 @@ static int my_sigtimedwait(const sigset_t * set, siginfo_t * info,#ifdef TEST_RT_SIGTIMEDWAIT static int my_rt_sigtimedwait (const sigset_t * set,siginfo_t * info, -struct timespec *timeout) +void *timeout) {/* _NSIG is always the right number of bits of signal map for all arches */ return tst_syscall (__NR_rt_sigtimedwait, set, info, timeout, _NSIG/8 ); } + +#if (__NR_rt_sigtimedwait_time64 != __LTP__NR_INVALID_SYSCALL) +static int my_rt_sigtimedwait_time64 (const sigset_t * set,siginfo_t * info, +void *timeout) +{ +/* _NSIG is always the right number of bits of signal map for all arches */ +return tst_syscall (__NR_rt_sigtimedwait_time64, set, info, timeout, _NSIG/8 ); +} +#endif #endif -void test_empty_set (swi_func sigwaitinfo,int signo) +void test_empty_set (swi_func sigwaitinfo,int signo,enum tst_ts_type type) {sigset_t sigs;siginfo_t si;
@@ -113,19 +123,23 @@ void test_empty_set(swi_func sigwaitinfo, int signo)SAFE_WAIT (NULL ); } -void test_timeout (swi_func sigwaitinfo,int signo) +void test_timeout (swi_func sigwaitinfo,int signo,enum tst_ts_type type) {sigset_t sigs;siginfo_t si;pid_t child; -struct timespec ts = {.tv_sec =1 }; +struct tst_ts ts; + + ts.type = type; +tst_ts_set_sec (&ts,1 ); +tst_ts_set_nsec (&ts,0 );SUCCEED_OR_DIE (sigemptyset,"sigemptyset failed" , &sigs);/* Run a child that will wake us up */ child =create_sig_proc (signo,INT_MAX ,100000 ); -TEST (sigwaitinfo (&sigs, &si, &ts)); +TEST (sigwaitinfo (&sigs, &si,tst_ts_get (&ts)));REPORT_SUCCESS (-1 ,EAGAIN );SAFE_KILL (child,SIGTERM );
@@ -135,7 +149,8 @@ void test_timeout(swi_func sigwaitinfo, int signo)/* Note: sigwait-ing for a signal that is not blocked is unspecified * by POSIX; but works for non-ignored signals under Linux */ -void test_unmasked_matching (swi_func sigwaitinfo,int signo) +void test_unmasked_matching (swi_func sigwaitinfo,int signo, +enum tst_ts_type type) {sigset_t sigs;siginfo_t si;
@@ -156,7 +171,8 @@ void test_unmasked_matching(swi_func sigwaitinfo, int signo)SAFE_WAIT (NULL ); } -void test_unmasked_matching_noinfo (swi_func sigwaitinfo,int signo) +void test_unmasked_matching_noinfo (swi_func sigwaitinfo,int signo, +enum tst_ts_type type) {sigset_t sigs;pid_t child;
@@ -173,7 +189,8 @@ void test_unmasked_matching_noinfo(swi_func sigwaitinfo, int signo)SAFE_WAIT (NULL ); } -void test_masked_matching (swi_func sigwaitinfo,int signo) +void test_masked_matching (swi_func sigwaitinfo,int signo, +enum tst_ts_type type) {sigset_t sigs, oldmask;siginfo_t si;
@@ -211,7 +228,8 @@ void test_masked_matching(swi_func sigwaitinfo, int signo)SAFE_WAIT (NULL ); } -void test_masked_matching_rt (swi_func sigwaitinfo,int signo) +void test_masked_matching_rt (swi_func sigwaitinfo,int signo, +enum tst_ts_type type) {sigset_t sigs, oldmask;siginfo_t si;
@@ -262,7 +280,8 @@ void test_masked_matching_rt(swi_func sigwaitinfo, int signo) "sigwaitinfo failed to restore the original mask"); } -void test_masked_matching_noinfo (swi_func sigwaitinfo,int signo) +void test_masked_matching_noinfo (swi_func sigwaitinfo,int signo, +enum tst_ts_type type) {sigset_t sigs, oldmask;pid_t child;
@@ -297,7 +316,7 @@ void test_masked_matching_noinfo(swi_func sigwaitinfo, int signo)SAFE_WAIT (NULL ); } -void test_bad_address (swi_func sigwaitinfo,int signo) +void test_bad_address (swi_func sigwaitinfo,int signo,enum tst_ts_type type) {sigset_t sigs, oldmask;pid_t child;
@@ -326,7 +345,7 @@ void test_bad_address(swi_func sigwaitinfo, int signo)SAFE_WAIT (NULL ); } -void test_bad_address2 (swi_func sigwaitinfo,int signo) +void test_bad_address2 (swi_func sigwaitinfo,int signo,enum tst_ts_type type) {pid_t pid;int status;
@@ -372,7 +391,7 @@ void test_bad_address2(swi_func sigwaitinfo, int signo) } } -void test_bad_address3 (swi_func sigwaitinfo,int signo) +void test_bad_address3 (swi_func sigwaitinfo,int signo,enum tst_ts_type type) {sigset_t sigs;SUCCEED_OR_DIE (sigemptyset,"sigemptyset failed" , &sigs);
@@ -388,28 +407,28 @@ struct test_desc { } tests[] = {#ifdef TEST_RT_SIGTIMEDWAIT { - test_empty_set, my_rt_sigtimedwait, SIGUSR1}, { - test_unmasked_matching, my_rt_sigtimedwait, SIGUSR1}, { - test_masked_matching, my_rt_sigtimedwait, SIGUSR1}, { - test_unmasked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, { - test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, { - test_bad_address, my_rt_sigtimedwait, SIGUSR1}, { - test_bad_address2, my_rt_sigtimedwait, SIGUSR1}, { - test_bad_address3, my_rt_sigtimedwait, SIGUSR1}, { - test_timeout, my_rt_sigtimedwait, 0}, + test_empty_set, NULL, SIGUSR1}, { + test_unmasked_matching, NULL, SIGUSR1}, { + test_masked_matching, NULL, SIGUSR1}, { + test_unmasked_matching_noinfo, NULL, SIGUSR1}, { + test_masked_matching_noinfo, NULL, SIGUSR1}, { + test_bad_address, NULL, SIGUSR1}, { + test_bad_address2, NULL, SIGUSR1}, { + test_bad_address3, NULL, SIGUSR1}, { + test_timeout, NULL, 0},/* Special cases */ /* 1: sigwaitinfo does respond to ignored signal */ { - test_masked_matching, my_rt_sigtimedwait, SIGUSR2}, + test_masked_matching, NULL, SIGUSR2},/* 2: An ignored signal doesn't cause sigwaitinfo to return EINTR */ { - test_timeout, my_rt_sigtimedwait, SIGUSR2}, + test_timeout, NULL, SIGUSR2},/* 3: The handler is not called when the signal is waited for by sigwaitinfo */ { - test_masked_matching, my_rt_sigtimedwait, SIGTERM}, + test_masked_matching, NULL, SIGTERM},/* 4: Simultaneous realtime signals are delivered in the order of increasing signal number */ { - test_masked_matching_rt, my_rt_sigtimedwait, -1}, + test_masked_matching_rt, NULL, -1}, #endif #if defined TEST_SIGWAIT {
@@ -440,15 +459,43 @@ struct test_desc {#endif }; +static struct test_variants { +swi_func swi; +enum tst_ts_type type; +char *desc; +} variants[] = { +#ifdef TEST_RT_SIGTIMEDWAIT + +#if (__NR_rt_sigtimedwait != __LTP__NR_INVALID_SYSCALL) + { .swi = my_rt_sigtimedwait, .type =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_rt_sigtimedwait_time64 != __LTP__NR_INVALID_SYSCALL) + { .swi = my_rt_sigtimedwait_time64, .type =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif + +#else /* !TEST_RT_SIGTIMEDWAIT */ + + { .swi =NULL , .type =TST_LIBC_TIMESPEC , .desc ="syscall with libc spec" }, + +#endif /* TEST_RT_SIGTIMEDWAIT */ +}; +static void run (unsigned int i) { +struct test_variants *tv = &variants[tst_variant];struct test_desc *tc = &tests[i]; +swi_func swi; - tc->tf (tc->swi, tc->signo); + swi = tv->swi ? tv->swi : tc->swi; + + tc->tf (swi, tc->signo, tv->type); }static void setup (void ) { +tst_res (TINFO ,"Testing variant: %s" , variants[tst_variant].desc); +signal (SIGUSR1 , empty_handler);signal (SIGALRM , empty_handler);signal (SIGUSR2 ,SIG_IGN );
@@ -464,6 +511,7 @@ static void cleanup(void)static struct tst_test test = { .test= run, .tcnt =ARRAY_SIZE (tests), + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .forks_child =1 ,
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 10/17 syscalls/mq_timed{send|receive}: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing mq_timed{send|receive}() syscall tests.
--- include/tst_timer.h | 41 ++++++++ .../mq_timedreceive/mq_timedreceive01.c | 92 ++++++++++++------ .../syscalls/mq_timedsend/mq_timedsend01.c | 96 +++++++++++++------ testcases/kernel/syscalls/utils/mq_timed.h | 42 +++----- 4 files changed, 182 insertions(+), 89 deletions(-)
include/tst_timer.h +41 -0
@@ -14,6 +14,7 @@#include <sched.h> #include <sys/time.h> +#include <mqueue.h> #include <time.h> #include "tst_test.h" #include "lapi/common_timers.h"
@@ -260,6 +261,46 @@ static inline int sys_futex_time64(int *uaddr, int futex_op, int val, void *to,return tst_syscall (__NR_futex_time64, uaddr, futex_op, val, to, uaddr2, val3); } +static inline int libc_mq_timedsend (mqd_t mqdes,const char *msg_ptr, +size_t msg_len,unsigned int msg_prio,void *abs_timeout) +{ +return mq_timedsend (mqdes, msg_ptr, msg_len, msg_prio, abs_timeout); +} + +static inline int sys_mq_timedsend (mqd_t mqdes,const char *msg_ptr, +size_t msg_len,unsigned int msg_prio,void *abs_timeout) +{ +return tst_syscall (__NR_mq_timedsend, mqdes, msg_ptr, msg_len, msg_prio, + abs_timeout); +} + +static inline int sys_mq_timedsend64 (mqd_t mqdes,const char *msg_ptr, +size_t msg_len,unsigned int msg_prio,void *abs_timeout) +{ +return tst_syscall (__NR_mq_timedsend_time64, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); +} + +static inline ssize_t libc_mq_timedreceive (mqd_t mqdes,char *msg_ptr, +size_t msg_len,unsigned int *msg_prio,void *abs_timeout) +{ +return mq_timedreceive (mqdes, msg_ptr, msg_len, msg_prio, abs_timeout); +} + +static inline ssize_t sys_mq_timedreceive (mqd_t mqdes,char *msg_ptr, +size_t msg_len,unsigned int *msg_prio,void *abs_timeout) +{ +return tst_syscall (__NR_mq_timedreceive, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); +} + +static inline ssize_t sys_mq_timedreceive64 (mqd_t mqdes,char *msg_ptr, +size_t msg_len,unsigned int *msg_prio,void *abs_timeout) +{ +return tst_syscall (__NR_mq_timedreceive_time64, mqdes, msg_ptr, msg_len, + msg_prio, abs_timeout); +} +static inline int libc_sched_rr_get_interval (pid_t pid,void *ts) {return sched_rr_get_interval (pid, ts);
testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c +63 -29
182 lines not on this page · raw message
testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c +65 -31
207 lines not on this page · raw message
testcases/kernel/syscalls/utils/mq_timed.h +13 -29
70 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 11/17 syscalls/recvmmsg: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing recvmmsg() syscall tests.
--- .../kernel/syscalls/sendmmsg/sendmmsg01.c | 40 ++++++++++---- .../kernel/syscalls/sendmmsg/sendmmsg_var.h | 55 ++++++++----------- 2 files changed, 53 insertions(+), 42 deletions(-)
testcases/kernel/syscalls/sendmmsg/sendmmsg01.c +30 -10
@@ -14,7 +14,6 @@#include "tst_test.h" #include "lapi/socket.h" #include "tst_safe_macros.h" -#include "sendmmsg_var.h" #define BUFSIZE 16
@@ -25,27 +24,48 @@ static int receive_sockfd;static struct mmsghdr *snd_msg, *rcv_msg;static struct iovec *snd1, *snd2, *rcv1, *rcv2; +static struct test_variants { +int (*receive)(int sockfd,struct mmsghdr *msgvec,unsigned int vlen, +unsigned int flags,void *timeout); +int (*send)(int sockfd,struct mmsghdr *msgvec,unsigned int vlen, +unsigned int flags); +enum tst_ts_type type; +char *desc; +} variants[] = { + { .receive = libc_recvmmsg, .send = libc_sendmmsg, .type =TST_LIBC_TIMESPEC , .desc ="vDSO or syscall with libc spec" }, + +#if (__NR_recvmmsg != __LTP__NR_INVALID_SYSCALL) + { .receive = sys_recvmmsg, .send = sys_sendmmsg, .type =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_recvmmsg_time64 != __LTP__NR_INVALID_SYSCALL) + { .receive = sys_recvmmsg64, .send = sys_sendmmsg, .type =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; +static void run (void ) { -struct timespec timeout; +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts timeout;int retval; - retval =do_sendmmsg (send_sockfd, snd_msg,VLEN ,0 ); + retval = tv->send (send_sockfd, snd_msg,VLEN ,0 );if (retval <0 || snd_msg[0 ].msg_len !=6 || snd_msg[1 ].msg_len !=6 ) { -tst_res (TFAIL |TTERRNO ,"sendmmsg failed" ); +tst_res (TFAIL |TTERRNO ,"sendmmsg() failed" );return ; }memset (rcv1->iov_base,0 , rcv1->iov_len);memset (rcv2->iov_base,0 , rcv2->iov_len); - timeout.tv_sec =1 ; - timeout.tv_nsec =0 ; + timeout.type = tv->type; +tst_ts_set_sec (&timeout,1 ); +tst_ts_set_nsec (&timeout,0 ); - retval =do_recvmmsg (receive_sockfd, rcv_msg,VLEN ,0 , &timeout); + retval = tv->receive (receive_sockfd, rcv_msg,VLEN ,0 ,tst_ts_get (&timeout));if (retval ==-1 ) { -tst_res (TFAIL |TTERRNO ,"recvmmsg failed" ); +tst_res (TFAIL |TTERRNO ,"recvmmsg() failed" );return ; }if (retval !=2 ) {
@@ -96,7 +116,7 @@ static void setup(void) rcv_msg[1 ].msg_hdr.msg_iov = rcv2; rcv_msg[1 ].msg_hdr.msg_iovlen =1 ; -test_info (); +tst_res (TINFO ,"Testing variant: %s" , variants[tst_variant].desc); }static void cleanup (void )
@@ -111,7 +131,7 @@ static struct tst_test test = { .test_all = run, .setup = setup, .cleanup = cleanup, - .test_variants = TEST_VARIANTS, + .test_variants = ARRAY_SIZE(variants), .bufs = (struct tst_buffers []) { {&snd1, .iov_sizes = (int []){3 ,3 ,-1 }}, {&snd2, .iov_sizes = (int []){6 ,-1 }},
testcases/kernel/syscalls/sendmmsg/sendmmsg_var.h +23 -32
78 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 12/17 syscalls/ppoll: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing ppoll() syscall tests.
Note that the O_EXCL flag is removed from SAFE_OPEN() calls as it made the tests failed when run for the second variant as the file existed.
--- testcases/kernel/syscalls/ppoll/ppoll01.c | 71 ++++++++++++++++++----- 1 file changed, 55 insertions(+), 16 deletions(-)
testcases/kernel/syscalls/ppoll/ppoll01.c +55 -16
@@ -21,6 +21,7 @@#include "ltp_signal.h" #include "tst_sig_proc.h" #include "tst_test.h" +#include "tst_timer.h" /* Older versions of glibc don't publish this constant's value. */ #ifndef POLLRDHUP
@@ -38,7 +39,7 @@ struct test_case {unsigned int nfds;/* nfds ppoll parameter */ sigset_t *sigmask;/* sigmask ppoll parameter */ sigset_t *sigmask_cur;/* sigmask set for current process */ -struct timespec *ts;/* ts ppoll parameter */ +struct tst_ts *ts;/* ts ppoll parameter */ struct pollfd *fds;/* fds ppoll parameter */ int sigint_count;/* if > 0, spawn process to send SIGINT */ /* 'count' times to current process */
@@ -60,14 +61,7 @@ static int fd1 = -1;static sigset_t sigmask_empty, sigmask_sigint;static struct pollfd fds_good[1 ], fds_already_closed[1 ]; -static struct timespec ts_short = { - .tv_sec =0 , - .tv_nsec =200000000 , -}; -static struct timespec ts_long = { - .tv_sec =2 , - .tv_nsec =0 , -}; +static struct tst_ts ts_short, ts_long;/* Test cases *
@@ -160,14 +154,53 @@ static struct test_case tcase[] = { }, }; +static inline int libc_ppoll (struct pollfd *fds,nfds_t nfds,void *tmo_p, +const sigset_t *sigmask,size_t sigsetsize) +{ +return ppoll (fds, nfds, tmo_p, sigmask); +} + +static inline int sys_ppoll (struct pollfd *fds,nfds_t nfds,void *tmo_p, +const sigset_t *sigmask,size_t sigsetsize) +{ +return tst_syscall (__NR_ppoll, fds, nfds, tmo_p, sigmask, sigsetsize); +} + +static inline int sys_ppoll_time64 (struct pollfd *fds,nfds_t nfds,void *tmo_p, +const sigset_t *sigmask,size_t sigsetsize) +{ +return tst_syscall (__NR_ppoll_time64, fds, nfds, tmo_p, sigmask, + sigsetsize); +} + +static struct test_variants { +int (*ppoll)(struct pollfd *fds,nfds_t nfds,void *tmo_p, +const sigset_t *sigmask,size_t sigsetsize); + +enum tst_ts_type type; +char *desc; +} variants[] = { + { .ppoll = libc_ppoll, .type =TST_LIBC_TIMESPEC , .desc ="vDSO or syscall with libc spec" }, + +#if (__NR_ppoll != __LTP__NR_INVALID_SYSCALL) + { .ppoll = sys_ppoll, .type =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_ppoll_time64 != __LTP__NR_INVALID_SYSCALL) + { .ppoll = sys_ppoll_time64, .type =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; + static void sighandler(int sig LTP_ATTRIBUTE_UNUSED) { }static void setup (void ) { +struct test_variants *tv = &variants[tst_variant];int fd2; +tst_res (TINFO ,"Testing variant: %s" , tv->desc);SAFE_SIGNAL (SIGINT , sighandler);if (sigemptyset (&sigmask_empty) ==-1 )
@@ -177,18 +210,22 @@ static void setup(void)if (sigaddset (&sigmask_sigint,SIGINT ) ==-1 )tst_brk (TBROK |TERRNO ,"sigaddset" ); - fd1 =SAFE_OPEN ("testfile1" ,O_CREAT |O_EXCL |O_RDWR , -S_IRUSR |S_IWUSR ); + fd1 =SAFE_OPEN ("testfile1" ,O_CREAT |O_RDWR ,S_IRUSR |S_IWUSR ); fds_good[0 ].fd = fd1; fds_good[0 ].events =POLLIN |POLLPRI |POLLOUT |POLLRDHUP ; fds_good[0 ].revents =0 ; - fd2 =SAFE_OPEN ("testfile2" ,O_CREAT |O_EXCL |O_RDWR , -S_IRUSR |S_IWUSR ); + fd2 =SAFE_OPEN ("testfile2" ,O_CREAT |O_RDWR ,S_IRUSR |S_IWUSR ); fds_already_closed[0 ].fd = fd2; fds_already_closed[0 ].events =POLLIN |POLLPRI |POLLOUT |POLLRDHUP ; fds_already_closed[0 ].revents =0 ;SAFE_CLOSE (fd2); + + ts_short.type = ts_long.type = tv->type; +tst_ts_set_sec (&ts_short,0 ); +tst_ts_set_nsec (&ts_short,200000000 ); +tst_ts_set_sec (&ts_long,2 ); +tst_ts_set_nsec (&ts_long,0 ); }static void cleanup (void )
@@ -199,10 +236,11 @@ static void cleanup(void)static void do_test (unsigned int i) { +struct test_variants *tv = &variants[tst_variant];pid_t pid =0 ;int sys_ret, sys_errno =0 , dummy;struct test_case *tc = &tcase[i]; -struct timespec ts, *tsp =NULL ; +struct tst_ts ts, *tsp =NULL ;if (tc->ts) {memcpy (&ts, tc->ts,sizeof (ts));
@@ -223,8 +261,8 @@ static void do_test(unsigned int i)/* test */ errno =0 ; - sys_ret =tst_syscall (__NR_ppoll, tc->fds, tc->nfds, tsp, - tc->sigmask,SIGSETSIZE ); + sys_ret = tv->ppoll (tc->fds, tc->nfds,tst_ts_get (tsp), tc->sigmask, +SIGSETSIZE ); sys_errno = errno;/* cleanup */
@@ -261,6 +299,7 @@ static void do_test(unsigned int i)static struct tst_test test = { .tcnt =ARRAY_SIZE (tcase), .test = do_test, + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .forks_child =1 ,
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 13/17 syscalls/select6: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing select6() syscall tests.
--- testcases/kernel/syscalls/select/select_var.h | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/select/select_var.h +22 -3
@@ -6,6 +6,7 @@#define SELECT_VAR__ #include "lapi/syscalls.h" +#include "tst_timer.h" struct compat_sel_arg_struct {long _n;
@@ -38,7 +39,7 @@ static int do_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except }case 2 : {int ret; -struct timespec ts = { +struct __kernel_old_timespec ts = { .tv_sec = timeout->tv_sec, .tv_nsec = timeout->tv_usec *1000 , };
@@ -47,7 +48,22 @@ static int do_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *except timeout->tv_usec = ts.tv_nsec /1000 ;return ret; } -case 3 : +case 3 : { +int ret =0 ; +#if (__NR_clock_settime64 != __LTP__NR_INVALID_SYSCALL) +struct __kernel_timespec ts = { + .tv_sec = timeout->tv_sec, + .tv_nsec = timeout->tv_usec *1000 , + }; + ret =tst_syscall (__NR_pselect6_time64, nfds, readfds, writefds, exceptfds, &ts,NULL ); + timeout->tv_sec = ts.tv_sec; + timeout->tv_usec = ts.tv_nsec /1000 ; +#else +tst_brk (TCONF ,"__NR_pselect6 time64 variant not supported" ); +#endif +return ret; + } +case 4 :#ifdef __NR__newselectreturn tst_syscall (__NR__newselect, nfds, readfds, writefds, exceptfds, timeout);#else
@@ -72,11 +88,14 @@ static void select_info(void)tst_res (TINFO ,"Testing SYS_pselect6 syscall" );break ;case 3 : +tst_res (TINFO ,"Testing SYS_pselect6 time64 syscall" ); +break ; +case 4 :tst_res (TINFO ,"Testing SYS__newselect syscall" ); break; } } -#define TEST_VARIANTS 4 +#define TEST_VARIANTS 5#endif /* SELECT_VAR__ */
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 14/17 syscalls/semop: Migrate to new test framework
In reply to Viresh KumarThis migrates the semop tests to the new test framework.
--- testcases/kernel/syscalls/ipc/semop/Makefile | 2 +- testcases/kernel/syscalls/ipc/semop/semop01.c | 140 ++++---- testcases/kernel/syscalls/ipc/semop/semop02.c | 145 +++------ testcases/kernel/syscalls/ipc/semop/semop03.c | 150 +++------ testcases/kernel/syscalls/ipc/semop/semop04.c | 165 ++++------ testcases/kernel/syscalls/ipc/semop/semop05.c | 303 ++++++++---------- 6 files changed, 347 insertions(+), 558 deletions(-)
testcases/kernel/syscalls/ipc/semop/Makefile +1 -1
@@ -4,5 +4,5 @@ top_srcdir ?= ../../../../.. include $(top_srcdir)/include/mk/testcases.mk -include $(abs_srcdir)/../Makefile.inc +include $(abs_srcdir)/../Makefile2.inc include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/ipc/semop/semop01.c +57 -83
181 lines not on this page · raw message
testcases/kernel/syscalls/ipc/semop/semop02.c +53 -92
204 lines not on this page · raw message
testcases/kernel/syscalls/ipc/semop/semop03.c +50 -100
180 lines not on this page · raw message
testcases/kernel/syscalls/ipc/semop/semop04.c +54 -111
201 lines not on this page · raw message
testcases/kernel/syscalls/ipc/semop/semop05.c +132 -171
367 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 15/17 syscalls/semtimedop: Add support for semtimedop and its time64 version
In reply to Viresh KumarThis adds support for semtimedop() and its time64 variant to the existing semop() syscall tests.
--- testcases/kernel/syscalls/ipc/semop/semop.h | 55 +++++++++++++++++++ testcases/kernel/syscalls/ipc/semop/semop01.c | 14 ++++- testcases/kernel/syscalls/ipc/semop/semop02.c | 15 ++++- testcases/kernel/syscalls/ipc/semop/semop03.c | 16 +++++- testcases/kernel/syscalls/ipc/semop/semop04.c | 16 +++++- testcases/kernel/syscalls/ipc/semop/semop05.c | 16 +++++- 6 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 testcases/kernel/syscalls/ipc/semop/semop.h
testcases/kernel/syscalls/ipc/semop/semop.h new file +55 -0
@@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#ifndef SEMOP_VAR__ +#define SEMOP_VAR__ + +#include <sys/sem.h> +#include "tst_timer.h" + +static inline int sys_semtimedop (int semid,struct sembuf *sops,size_t nsops, +void *timeout) +{ +return tst_syscall (__NR_semtimedop, semid, sops, nsops, timeout); +} + +static inline int sys_semtimedop_time64 (int semid,struct sembuf *sops, +size_t nsops,void *timeout) +{ +return tst_syscall (__NR_semtimedop_time64, semid, sops, nsops, timeout); +} + +struct test_variants { +int (*semop)(int semid,struct sembuf *sops,size_t nsops); +int (*semtimedop)(int semid,struct sembuf *sops,size_t nsops,void *timeout); +enum tst_ts_type type; +char *desc; +} variants[] = { + { .semop = semop, .type =TST_LIBC_TIMESPEC , .desc ="semop: vDSO or syscall" }, + +#if (__NR_semtimedop != __LTP__NR_INVALID_SYSCALL) + { .semtimedop = sys_semtimedop, .type =TST_KERN_OLD_TIMESPEC , .desc ="semtimedop: syscall with old kernel spec" }, +#endif + +#if (__NR_semtimedop_time64 != __LTP__NR_INVALID_SYSCALL) + { .semtimedop = sys_semtimedop_time64, .type =TST_KERN_TIMESPEC , .desc ="semtimedop: syscall time64 with kernel spec" }, +#endif +}; + +static inline int call_semop (struct test_variants *tv,int semid, +struct sembuf *sops,size_t nsops,struct tst_ts *timeout) +{ +if (tv->semop) +return tv->semop (semid, sops, nsops); + +return tv->semtimedop (semid, sops, nsops,tst_ts_get (timeout)); +} + +static inline void semop_supported_by_kernel (struct test_variants *tv) +{ +/* Check if the syscall is implemented on the platform */ +TEST (call_semop (tv,0 ,NULL ,0 ,NULL )); +if (TST_RET ==-1 &&TST_ERR ==ENOSYS ) +tst_brk (TCONF ,"Test not supported on kernel/platform" ); +} + +#endif /* SEMOP_VAR__ */
testcases/kernel/syscalls/ipc/semop/semop01.c +13 -1
@@ -41,6 +41,7 @@#include "tst_test.h" #include "libnewipc.h" #include "lapi/semun.h" +#include "semop.h" #define NSEMS 4/* the number of primitive semaphores to test */
@@ -52,11 +53,17 @@ static struct sembuf sops[PSEMS];static void run (void ) { +struct test_variants *tv = &variants[tst_variant];union semun arr = { .val =0 }; +struct tst_ts timeout;int fail =0 ;int i; -TEST (semop (sem_id, sops,NSEMS )); + timeout.type = tv->type; +tst_ts_set_sec (&timeout,1 ); +tst_ts_set_nsec (&timeout,10000 ); + +TEST (call_semop (tv, sem_id, sops,NSEMS , &timeout));if (TST_RET ==-1 ) {tst_res (TFAIL |TTERRNO ,"semop() failed" );
@@ -92,8 +99,12 @@ static void run(void)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant];int i; +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +semop_supported_by_kernel (tv); + get_arr.array =malloc (sizeof (unsigned short int ) *PSEMS );if (get_arr.array ==NULL )tst_brk (TBROK ,"malloc failed" );
@@ -124,6 +135,7 @@ static void cleanup(void)static struct tst_test test = { .test_all = run, + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .needs_tmpdir =1 ,
testcases/kernel/syscalls/ipc/semop/semop02.c +14 -1
@@ -20,6 +20,7 @@#include "tst_test.h" #include "libnewipc.h" #include "lapi/semun.h" +#include "semop.h" static int sem_id_1 =-1 ;/* a semaphore set with read & alter permissions */ static int sem_id_2 =-1 ;/* a semaphore set without read & alter permissions */
@@ -46,12 +47,16 @@ static struct test_case_t {static void setup (void ) { +struct test_variants *tv = &variants[tst_variant];char nobody_uid[] ="nobody" ;struct passwd *ltpuser;key_t semkey2;struct seminfo ipc_buf;union semun arr; +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +semop_supported_by_kernel (tv); + ltpuser =SAFE_GETPWNAM (nobody_uid);SAFE_SETUID (ltpuser->pw_uid);
@@ -84,7 +89,14 @@ static void setup(void)static void run (unsigned int i) { -TEST (semop (*(tc[i].semid), tc[i].t_sbuf, tc[i].t_ops)); +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts timeout; + + timeout.type = tv->type; +tst_ts_set_sec (&timeout,1 ); +tst_ts_set_nsec (&timeout,10000 ); + +TEST (call_semop (tv, *(tc[i].semid), tc[i].t_sbuf, tc[i].t_ops, &timeout));if (TST_RET !=-1 ) {tst_res (TFAIL |TTERRNO ,"call succeeded unexpectedly" );
@@ -117,6 +129,7 @@ static void cleanup(void)static struct tst_test test = { .test = run, .tcnt =ARRAY_SIZE (tc), + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .needs_tmpdir =1 ,
testcases/kernel/syscalls/ipc/semop/semop03.c +15 -1
@@ -38,6 +38,7 @@#include "tst_test.h" #include "libnewipc.h" #include "lapi/semun.h" +#include "semop.h" static key_t semkey;static int sem_id =-1 ;
@@ -47,6 +48,13 @@ static int tc[] = { -1, PSEMS + 1 }; /* negative and too many "primitive" semasstatic void run (unsigned int i) { +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts timeout; + + timeout.type = tv->type; +tst_ts_set_sec (&timeout,1 ); +tst_ts_set_nsec (&timeout,10000 ); +/* initialize two fields in the sembuf structure here */ s_buf.sem_op =1 ;/* add this value to struct sem.semval */ s_buf.sem_flg =SEM_UNDO ;/* undo when process exits */
@@ -61,7 +69,7 @@ static void run(unsigned int i)* use the TEST macro to make the call */ -TEST (semop (sem_id, &s_buf,1 )); +TEST (call_semop (tv, sem_id, &s_buf,1 , &timeout));if (TST_RET !=-1 ) {tst_res (TFAIL |TTERRNO ,"call succeeded unexpectedly" );
@@ -80,6 +88,11 @@ static void run(unsigned int i)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +semop_supported_by_kernel (tv); +/* get an IPC resource key */ semkey =GETIPCKEY ();
@@ -102,6 +115,7 @@ static void cleanup(void)static struct tst_test test = { .test = run, .tcnt =ARRAY_SIZE (tc), + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .needs_tmpdir =1 ,
testcases/kernel/syscalls/ipc/semop/semop04.c +15 -1
@@ -38,6 +38,7 @@#include "tst_test.h" #include "libnewipc.h" #include "lapi/semun.h" +#include "semop.h" static int sem_id =-1 ;static int val;/* value for SETVAL */
@@ -62,6 +63,13 @@ static struct test_case_t {static void run (unsigned int i) { +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts timeout; + + timeout.type = tv->type; +tst_ts_set_sec (&timeout,1 ); +tst_ts_set_nsec (&timeout,10000 ); +/* initialize the s_buf buffer */ s_buf.sem_op = tc[i].op; s_buf.sem_flg = tc[i].flg;
@@ -72,7 +80,7 @@ static void run(unsigned int i)if (semctl (sem_id, tc[i].num,SETVAL , tc[i].get_arr) ==-1 )tst_brk (TBROK |TERRNO ,"semctl() failed" ); -TEST (semop (sem_id, &s_buf,1 )); +TEST (call_semop (tv, sem_id, &s_buf,1 , &timeout));if (TST_RET !=-1 ) {tst_res (TFAIL ,"call succeeded unexpectedly" );return ;
@@ -86,6 +94,11 @@ static void run(unsigned int i)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +semop_supported_by_kernel (tv); + val =1 ;/* get an IPC resource key */
@@ -114,6 +127,7 @@ static void cleanup(void)static struct tst_test test = { .test = run, .tcnt =ARRAY_SIZE (tc), + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .needs_tmpdir =1 ,
testcases/kernel/syscalls/ipc/semop/semop05.c +15 -1
@@ -52,6 +52,7 @@#include "tst_test.h" #include "libnewipc.h" #include "lapi/semun.h" +#include "semop.h" static key_t semkey;static int sem_id =-1 ;
@@ -115,7 +116,14 @@ static inline int process_state_wait2(pid_t pid, const char state)static void do_child (int i) { -TEST (semop (sem_id, &s_buf,1 )); +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts timeout; + + timeout.type = tv->type; +tst_ts_set_sec (&timeout,1 ); +tst_ts_set_nsec (&timeout,10000 ); + +TEST (call_semop (tv, sem_id, &s_buf,1 , &timeout));if (TST_RET !=-1 ) {tst_res (TFAIL ,"call succeeded when error expected" );exit (-1 );
@@ -137,6 +145,11 @@ static void sighandler(int sig)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +semop_supported_by_kernel (tv); +SAFE_SIGNAL (SIGHUP , sighandler);/* get an IPC resource key */
@@ -238,6 +251,7 @@ static void do_child_uclinux(void)static struct tst_test test = { .test = run, .tcnt =ARRAY_SIZE (tc), + .test_variants =ARRAY_SIZE (variants), .setup = setup, .cleanup = cleanup, .needs_tmpdir =1 ,
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 16/17 syscalls/utimensat: Migrate to new test framework
In reply to Viresh KumarThis gets rid of the test script and updates the utimensat01.c file to handle most of the tests covered earlier (apart from testing the same for files owned by root, as the test is run as root right now).
--- .../kernel/syscalls/utimensat/utimensat01.c | 424 ++++++-------- .../syscalls/utimensat/utimensat_tests.sh | 517 ------------------ 2 files changed, 179 insertions(+), 762 deletions(-) delete mode 100755 testcases/kernel/syscalls/utimensat/utimensat_tests.sh
testcases/kernel/syscalls/utimensat/utimensat01.c +179 -245
@@ -1,282 +1,216 @@ -/*************************************************************************************/ -/* */ -/* Copyright (C) 2008, Michael Kerrisk <[email protected]>, */ -/* Copyright (C) 2008, Linux Foundation */ -/* */ -/* This program is free software; you can redistribute it and/or modify */ -/* it under the terms of the GNU General Public License as published by */ -/* the Free Software Foundation; either version 2 of the License, or */ -/* (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See */ -/* the GNU General Public License for more details. */ -/* */ -/* You should have received a copy of the GNU General Public License */ -/* along with this program; if not, write to the Free Software */ -/* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/*************************************************************************************/ -/* */ -/* File: utimnsat01.c */ -/* Description: A command-line interface for testing the utimensat() system call. */ -/* Author: Michael Kerrisk <[email protected]> */ -/* History: */ -/* 17 Mar 2008 Initial creation, */ -/* 31 May 2008 Reworked for easier test automation, */ -/* 2 June 2008 Renamed from t_utimensat.c to test_utimensat.c, */ -/* 05 June 2008 Submitted to LTP by Subrata Modak <[email protected]> */ -/*************************************************************************************/ - -#define _GNU_SOURCE -#define _ATFILE_SOURCE +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2008 Michael Kerrisk <[email protected]> +* Copyright (c) 2008 Subrata Modak <[email protected]> +* Copyright (c) 2020 Viresh Kumar <[email protected]> +* +* Basic utimnsat() test. +*/ +#include <stdio.h> #include <time.h> #include <errno.h> #include <stdlib.h> #include <unistd.h> -#include <sys/syscall.h> #include <fcntl.h> #include <string.h> #include <sys/stat.h> -#include "test.h" +#include "lapi/fs.h" +#include "tst_test.h" #include "lapi/syscalls.h" -char *TCID ="utimensat01" ; -int TST_TOTAL =0 ; - -#define cleanup tst_exit +#define UTIME_NOW ((1l << 30) - 1l) +#define UTIME_OMIT ((1l << 30) - 2l) + +#define TEST_FILE "test_file" +#define TEST_DIR "test_dir" + +static void *bad_addr; + +struct mytime { +long access_tv_sec; +long access_tv_nsec; +long mod_tv_sec; +long mod_tv_nsec; +}; + +static struct mytime tnn = {0 ,UTIME_NOW ,0 ,UTIME_NOW }, *time_nn = &tnn; +static struct mytime too = {0 ,UTIME_OMIT ,0 ,UTIME_OMIT }, *time_oo = &too; +static struct mytime tno = {0 ,UTIME_NOW ,0 ,UTIME_OMIT }, *time_no = &tno; +static struct mytime ton = {0 ,UTIME_OMIT ,0 ,UTIME_NOW }, *time_on = &ton; +static struct mytime t11 = {1 ,1 ,1 ,1 }, *time_11 = &t11; + +struct test_case { +int dirfd; +char *pathname; +struct mytime **mytime; +int flags; +int oflags; +int attr; +int mode; +int exp_err; +} tcase[] = { +/* Testing read-only file */ + {AT_FDCWD ,TEST_FILE ,NULL ,0 ,O_RDONLY ,0 ,0400 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_nn,0 ,O_RDONLY ,0 ,0400 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_oo,0 ,O_RDONLY ,0 ,0400 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_no,0 ,O_RDONLY ,0 ,0400 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_on,0 ,O_RDONLY ,0 ,0400 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_11,0 ,O_RDONLY ,0 ,0400 ,0 }, + +/* Testing writable file */ + {AT_FDCWD ,TEST_FILE ,NULL ,0 ,O_RDONLY ,0 ,0666 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_nn,0 ,O_RDONLY ,0 ,0666 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_oo,0 ,O_RDONLY ,0 ,0666 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_no,0 ,O_RDONLY ,0 ,0666 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_on,0 ,O_RDONLY ,0 ,0666 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_11,0 ,O_RDONLY ,0 ,0666 ,0 }, + +/* Testing append-only file */ + {AT_FDCWD ,TEST_FILE ,NULL ,0 ,O_RDONLY ,FS_APPEND_FL ,0600 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_nn,0 ,O_RDONLY ,FS_APPEND_FL ,0600 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_oo,0 ,O_RDONLY ,FS_APPEND_FL ,0600 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_no,0 ,O_RDONLY ,FS_APPEND_FL ,0600 ,EPERM }, + {AT_FDCWD ,TEST_FILE , &time_on,0 ,O_RDONLY ,FS_APPEND_FL ,0600 ,EPERM }, + {AT_FDCWD ,TEST_FILE , &time_11,0 ,O_RDONLY ,FS_APPEND_FL ,0600 ,EPERM }, + +/* Testing immutable file */ + {AT_FDCWD ,TEST_FILE ,NULL ,0 ,O_RDONLY ,FS_IMMUTABLE_FL ,0600 ,-1 }, + {AT_FDCWD ,TEST_FILE , &time_nn,0 ,O_RDONLY ,FS_IMMUTABLE_FL ,0600 ,-1 }, + {AT_FDCWD ,TEST_FILE , &time_oo,0 ,O_RDONLY ,FS_IMMUTABLE_FL ,0600 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_no,0 ,O_RDONLY ,FS_IMMUTABLE_FL ,0600 ,EPERM }, + {AT_FDCWD ,TEST_FILE , &time_on,0 ,O_RDONLY ,FS_IMMUTABLE_FL ,0600 ,EPERM }, + {AT_FDCWD ,TEST_FILE , &time_11,0 ,O_RDONLY ,FS_IMMUTABLE_FL ,0600 ,EPERM }, + +/* Testing immutable-append-only file */ + {AT_FDCWD ,TEST_FILE ,NULL ,0 ,O_RDONLY ,FS_APPEND_FL |FS_IMMUTABLE_FL ,0600 ,-1 }, + {AT_FDCWD ,TEST_FILE , &time_nn,0 ,O_RDONLY ,FS_APPEND_FL |FS_IMMUTABLE_FL ,0600 ,-1 }, + {AT_FDCWD ,TEST_FILE , &time_oo,0 ,O_RDONLY ,FS_APPEND_FL |FS_IMMUTABLE_FL ,0600 ,0 }, + {AT_FDCWD ,TEST_FILE , &time_no,0 ,O_RDONLY ,FS_APPEND_FL |FS_IMMUTABLE_FL ,0600 ,EPERM }, + {AT_FDCWD ,TEST_FILE , &time_on,0 ,O_RDONLY ,FS_APPEND_FL |FS_IMMUTABLE_FL ,0600 ,EPERM }, + {AT_FDCWD ,TEST_FILE , &time_11,0 ,O_RDONLY ,FS_APPEND_FL |FS_IMMUTABLE_FL ,0600 ,EPERM }, + +/* Other failure tests */ + {AT_FDCWD ,TEST_FILE ,NULL ,0 ,O_RDONLY ,0 ,0400 ,EFAULT }, + {AT_FDCWD ,NULL , &time_nn,0 ,O_RDONLY ,0 ,0400 ,EFAULT }, + {-1 ,NULL , &time_nn,AT_SYMLINK_NOFOLLOW ,O_RDONLY ,0 ,0400 ,EINVAL }, + {-1 ,TEST_FILE , &time_nn,0 ,O_RDONLY ,0 ,0400 ,ENOENT }, +}; + +static inline int sys_utimensat (int dirfd,const char *pathname, +const struct timespec times[2 ],int flags) +{ +return tst_syscall (__NR_utimensat, dirfd, pathname, times, flags); +} -/* We use EXIT_FAILURE for an expected failure from utimensat() -(e.g., EACCES and EPERM), and one of the following for unexpected -failures (i.e., something broke in our test setup). */ +static void setup (void ) +{ + bad_addr =tst_get_bad_addr (NULL ); +} -#ifndef AT_FDCWD -#define AT_FDCWD -100 -#endif -#ifndef AT_SYMLINK_NOFOLLOW -#define AT_SYMLINK_NOFOLLOW 0x100 -#endif +static void update_error (struct test_case *tc) +{ +if (tc->exp_err !=-1 ) +return ; + +/* +* Starting with 4.8.0 operations on immutable files return EPERM +* instead of EACCES. +* This patch has also been merged to stable 4.4 with +* b3b4283 ("vfs: move permission checking into notify_change() for utimes(NULL)") +*/ +if (tst_kvercmp (4 ,4 ,27 ) <0 ) + tc->exp_err =EACCES ; +else + tc->exp_err =EPERM ; +} -#define EXIT_bad_usage 3 -#define EXIT_failed_syscall 3 +static void change_attr (struct test_case *tc,int fd,int set) +{ +int attr; -#define errExit (msg) do { perror(msg); exit(EXIT_failed_syscall); \ - } while (0) +if (!tc->attr) +return ; -#define UTIME_NOW ((1l << 30) - 1l) -#define UTIME_OMIT ((1l << 30) - 2l) +SAFE_IOCTL (fd,FS_IOC_GETFLAGS , &attr); -static inline int -utimensat_sc (int dirfd,const char *pathname, -const struct timespec times[2 ],int flags) -{ -return ltp_syscall (__NR_utimensat, dirfd, pathname, times, flags); -} +if (set) + attr |= tc->attr; +else + attr &= ~tc->attr; -static void usageError (char *progName) -{ -fprintf (stderr,"Usage: %s pathname [atime-sec " -"atime-nsec mtime-sec mtime-nsec]\n\n" , progName); -fprintf (stderr,"Permitted options are:\n" ); -fprintf (stderr," [-d path] " -"open a directory file descriptor" -" (instead of using AT_FDCWD)\n" ); -fprintf (stderr," -q Quiet\n" ); -fprintf (stderr," -w Open directory file " -"descriptor with O_RDWR|O_APPEND\n" -" (instead of O_RDONLY)\n" ); -fprintf (stderr," -n Use AT_SYMLINK_NOFOLLOW\n" ); -fprintf (stderr,"\n" ); - -fprintf (stderr,"pathname can be \"NULL\" to use NULL " -"argument in call\n" ); -fprintf (stderr,"\n" ); - -fprintf (stderr,"Either nsec field can be\n" ); -fprintf (stderr," 'n' for UTIME_NOW\n" ); -fprintf (stderr," 'o' for UTIME_OMIT\n" ); -fprintf (stderr,"\n" ); - -fprintf (stderr,"If the time fields are omitted, " -"then a NULL 'times' argument is used\n" ); -fprintf (stderr,"\n" ); - -exit (EXIT_bad_usage); +SAFE_IOCTL (fd,FS_IOC_SETFLAGS , &attr); } -int main (int argc,char *argv[]) +static void run (unsigned int i) { -int flags, dirfd, opt, oflag; +struct test_case *tc = &tcase[i];struct timespec ts[2 ]; -struct timespec *tsp; -char *pathname, *dirfdPath; +void *tsp =NULL ; +char *pathname =NULL ; +int dfd =AT_FDCWD , fd =0 ;struct stat sb; -int verbose; - -/* Command-line argument parsing */ - - flags =0 ; - verbose =1 ; - dirfd =AT_FDCWD ; - dirfdPath =NULL ; - oflag =O_RDONLY ; - -while ((opt =getopt (argc, argv,"d:nqw" )) !=-1 ) { -switch (opt) { -case 'd' : - dirfdPath = optarg; -break ; - -case 'n' : - flags |=AT_SYMLINK_NOFOLLOW ; -if (verbose) -printf ("Not following symbolic links\n" ); -break ; - -case 'q' : - verbose =0 ; -break ; - -case 'w' : - oflag =O_RDWR |O_APPEND ; -break ; - -default : -usageError (argv[0 ]); - } - } - -if ((optind +5 != argc) && (optind +1 != argc)) -usageError (argv[0 ]); - -if (dirfdPath !=NULL ) { - dirfd =open (dirfdPath, oflag); -if (dirfd ==-1 ) -errExit ("open" ); - -if (verbose) { -printf ("Opened dirfd %d" , oflag); -if ((oflag &O_ACCMODE ) ==O_RDWR ) -printf (" O_RDWR" ); -if (oflag &O_APPEND ) -printf (" O_APPEND" ); -printf (": %s\n" , dirfdPath); - } - } - pathname = (strcmp (argv[optind],"NULL" ) ==0 ) ?NULL : argv[optind]; +SAFE_MKDIR (TEST_DIR ,0700 ); +update_error (tc); -/* Either, we get no values for 'times' fields, in which case -we give a NULL pointer to utimensat(), or we get four values, -for secs+nsecs for each of atime and mtime. The special -values 'n' and 'o' can be used for tv_nsec settings of -UTIME_NOW and UTIME_OMIT, respectively. */ +if (tc->dirfd !=AT_FDCWD ) + dfd =SAFE_OPEN (TEST_DIR , tc->oflags); -if (argc == optind +1 ) { - tsp =NULL ; - - }else { - ts[0 ].tv_sec =atoi (argv[optind +1 ]); -if (argv[optind +2 ][0 ] =='n' ) { - ts[0 ].tv_nsec =UTIME_NOW ; - }else if (argv[optind +2 ][0 ] =='o' ) { - ts[0 ].tv_nsec =UTIME_OMIT ; - }else { - ts[0 ].tv_nsec =atoi (argv[optind +2 ]); - } - - ts[1 ].tv_sec =atoi (argv[optind +3 ]); -if (argv[optind +4 ][0 ] =='n' ) { - ts[1 ].tv_nsec =UTIME_NOW ; - }else if (argv[optind +4 ][0 ] =='o' ) { - ts[1 ].tv_nsec =UTIME_OMIT ; - }else { - ts[1 ].tv_nsec =atoi (argv[optind +4 ]); - } +if (tc->mytime) { +struct mytime *mytime = *tc->mytime; + ts[0 ].tv_sec = mytime->access_tv_sec; + ts[0 ].tv_nsec = mytime->access_tv_nsec; + ts[1 ].tv_sec = mytime->mod_tv_sec; + ts[1 ].tv_nsec = mytime->mod_tv_nsec; tsp = ts; + }else if (tc->exp_err ==EFAULT ) { + tsp = bad_addr; } -/* For testing purposes, it may have been useful to run this program -as set-user-ID-root so that a directory file descriptor could be -opened as root. (This allows us to obtain a file descriptor even -if normal user doesn't have permissions on the file.) Now we -reset to the real UID before making the utimensat() call, so that -the permission checking for the utimensat() call is performed -under that UID. */ - -if (geteuid () ==0 ) { -uid_t u; - - u =getuid (); - -if (verbose) -printf ("Resetting UIDs to %ld\n" , (long )u); - -if (setresuid (u, u, u) ==-1 ) -errExit ("setresuid" ); +if (tc->pathname) { + fd =SAFE_OPEN (tc->pathname,O_WRONLY |O_CREAT ); + pathname = tc->pathname; +SAFE_CHMOD (tc->pathname, tc->mode); +change_attr (tc, fd,1 ); + }else if (tc->exp_err ==EFAULT ) { + pathname = bad_addr; } -/* Display information allowing user to verify arguments for call */ +TEST (sys_utimensat (dfd, pathname, tsp, tc->flags)); +if (tc->pathname) +change_attr (tc, fd,0 ); -if (verbose) { -printf ("dirfd is %d\n" , dirfd); -printf ("pathname is %s\n" , pathname); -printf ("tsp is %p" , tsp); -if (tsp !=NULL ) { -printf ("; struct = { %ld, %ld } { %ld, %ld }" , - (long )tsp[0 ].tv_sec, (long )tsp[0 ].tv_nsec, - (long )tsp[1 ].tv_sec, (long )tsp[1 ].tv_nsec); - } -printf ("\n" ); -printf ("flags is %d\n" , flags); - } - -/* Make the call and see what happened */ - -if (utimensat_sc (dirfd, pathname, tsp, flags) ==-1 ) { -if (errno ==EPERM ) { -if (verbose) -printf ("utimensat() failed with EPERM\n" ); -else -printf ("EPERM\n" ); -exit (EXIT_FAILURE ); - - }else if (errno ==EACCES ) { -if (verbose) -printf ("utimensat() failed with EACCES\n" ); -else -printf ("EACCES\n" ); -exit (EXIT_FAILURE ); - - }else if (errno ==EINVAL ) { -if (verbose) -printf ("utimensat() failed with EINVAL\n" ); -else -printf ("EINVAL\n" ); -exit (EXIT_FAILURE ); - - }else {/* Unexpected failure case from utimensat() */ -errExit ("utimensat" ); +if (TST_RET ) { +if (!tc->exp_err) { +tst_res (TFAIL |TTERRNO ,"%2d: utimensat() failed" , i); + }else if (tc->exp_err ==TST_ERR ) { +tst_res (TPASS |TTERRNO ,"%2d: utimensat() failed expectedly" , i); + }else { +tst_res (TFAIL |TTERRNO ,"%2d: utimensat() failed with incorrect error, expected %s" , + i,tst_strerrno (tc->exp_err)); } - } - -if (verbose) -printf ("utimensat() succeeded\n" ); - -if (stat ((pathname !=NULL ) ? pathname : dirfdPath, &sb) ==-1 ) -errExit ("stat" ); - -if (verbose) { -printf ("Last file access: %s" ,ctime (&sb.st_atime)); -printf ("Last file modification: %s" ,ctime (&sb.st_mtime)); -printf ("Last status change: %s" ,ctime (&sb.st_ctime)); - + }else if (tc->exp_err) { +tst_res (TFAIL ,"%2d: utimensat() passed unexpectedly" , i); }else { -printf ("SUCCESS %ld %ld\n" , (long )sb.st_atime, - (long )sb.st_mtime); +TEST (stat (tc->pathname ? tc->pathname :TEST_DIR , &sb)); +tst_res (TPASS ,"%2d: utimensat() passed: access time: %lu %lu" , i, + sb.st_atime, sb.st_mtime); } -exit (EXIT_SUCCESS ); +if (dfd !=AT_FDCWD ) +SAFE_CLOSE (dfd); + +if (tc->pathname) +SAFE_CLOSE (fd); +SAFE_RMDIR (TEST_DIR ); } + +static struct tst_test test = { + .test = run, + .tcnt =ARRAY_SIZE (tcase), + .setup = setup, + .needs_root =1 , + .needs_tmpdir =1 , +};
testcases/kernel/syscalls/utimensat/utimensat_tests.sh deleted +0 -517
517 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 17/17 syscalls/utimensat: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing utimensat() syscall tests.
--- runtest/syscalls | 2 +- testcases/kernel/syscalls/utimensat/Makefile | 4 - .../kernel/syscalls/utimensat/utimensat01.c | 74 ++++++++++++++++--- 3 files changed, 65 insertions(+), 15 deletions(-)
runtest/syscalls +1 -1
@@ -1600,7 +1600,7 @@ utime06 utime06 utimes01 utimes01 # Introduced from Kernel 2.6.22 onwards -utimensat01 utimensat_tests.sh +utimensat01 utimensat01 vfork01 vfork01 vfork02 vfork02
testcases/kernel/syscalls/utimensat/Makefile +0 -4
@@ -5,8 +5,4 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk -vpath %.c $(srcdir):$(top_srcdir)/lib - -INSTALL_TARGETS := utimensat_tests.sh - include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/utimensat/utimensat01.c +64 -10
117 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v4 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Viresh KumarQuoted 39 lines · Viresh Kumar
This adds support for time64 tests to the existing
timer_gettime()syscall tests.Signed-off-by Viresh Kumar <[email protected]>--- include/tst_timer.h | 45 +++++++ .../syscalls/timer_gettime/timer_gettime01.c | 124 ++++++++---------- 2 files changed, 97 insertions(+), 72 deletions(-)include/tst_timer.h +11
-0@@ -15,6 +15,7 @@#include <sys/time.h> #include <time.h> #include "tst_test.h" +#include "lapi/common_timers.h" #include "lapi/syscalls.h" /* @@ -112,6 +113,16 @@ struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ long long tv_nsec;/* nanoseconds */ }; + +struct __kernel_old_itimerspec { +struct __kernel_old_timespec it_interval;/* timer period */ +struct __kernel_old_timespec it_value;/* timer expiration */ +}; + +struct __kernel_itimerspec { +struct __kernel_timespec it_interval;/* timer period */ +struct __kernel_timespec it_value;/* timer expiration */ +};#endif enum tst_ts_type {
include/tst_timer.h struct tst_ts { · line 147
Quoted 8 lines
include/tst_timer.h +4
-0@@ -129,6 +140,14 @@ struct tst_ts { } ts; }; +struct tst_its { +enum tst_ts_type type; +union { +struct __kernel_itimerspec kern_old_its;
I guess this line should be used 'struct __kernel_old_itimerspec', right?
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20200609/a9496cae/attachment.htm>
PATCH v4 6/17 syscalls/futex: Add support for time64 tests
In reply to Viresh KumarQuoted 31 lines · Viresh Kumar
...
testcases/kernel/syscalls/futex/futex_wake04.c +2
-4static void wakeup_thread2 (void ) { +struct test_variants *tv = &variants[tst_variant];void *addr;int hpsz, pgsz, res;pthread_t th1, th2; hpsz =read_hugepagesize (); -tst_resm (TINFO ,"Hugepagesize %i" , hpsz); +tst_res (TINFO ,"Hugepagesize %i" , hpsz);/*allocate some shared memory*/ addr =mmap (NULL , hpsz,PROT_WRITE |PROT_READ ,MAP_SHARED |MAP_ANONYMOUS |MAP_HUGETLB ,-1 ,0 );if (addr ==MAP_FAILED ) { -if (errno ==ENOMEM ) { - tst_brkm(TCONF, NULL, - "Cannot allocate hugepage, memory toofragmented?");
testcases/kernel/syscalls/futex/futex_wake04.c +2
-1- } +if (errno ==ENOMEM ) + tst_res(TCONF, "Cannot allocate hugepage, memory
Quoted 2 lines
too fragmented?");
Here we can use tst_brk(TCONF, ...), otherwise, the if condition will out of action for ENOMEM.
- tst_brkm(TBROK | TERRNO, NULL, "Cannot allocate hugepage");
testcases/kernel/syscalls/futex/futex_wake04.c static int read_hugepagesize(void) · line 149
Quoted 3 lines
testcases/kernel/syscalls/futex/futex_wake04.c +2
-0+tst_res (TFAIL |TERRNO ,"Cannot allocate hugepage" ); +return ;
tst_brk(TBROK | TERRNO, ...)
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20200609/cd003ff1/attachment.htm>
PATCH v4 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Li WangQuoted 45 lines · Li Wang
Quoted 42 lines · Viresh Kumar
This adds support for time64 tests to the existing
timer_gettime()syscall tests.Signed-off-by Viresh Kumar <[email protected]>--- include/tst_timer.h | 45 +++++++ .../syscalls/timer_gettime/timer_gettime01.c | 124 ++++++++---------- 2 files changed, 97 insertions(+), 72 deletions(-)include/tst_timer.h +11
-0@@ -15,6 +15,7 @@#include <sys/time.h> #include <time.h> #include "tst_test.h" +#include "lapi/common_timers.h" #include "lapi/syscalls.h" /* @@ -112,6 +113,16 @@ struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ long long tv_nsec;/* nanoseconds */ }; + +struct __kernel_old_itimerspec { +struct __kernel_old_timespec it_interval;/* timer period */ +struct __kernel_old_timespec it_value;/* timer expiration */ +}; + +struct __kernel_itimerspec { +struct __kernel_timespec it_interval;/* timer period */ +struct __kernel_timespec it_value;/* timer expiration */ +};#endif enum tst_ts_type {@@ -129,6 +140,14 @@ struct tst_ts { } ts; };
Quoted 7 lines
include/tst_timer.h struct tst_ts {
Quoted 5 lines
include/tst_timer.h +4
-0+struct tst_its { +enum tst_ts_type type; +union { +struct __kernel_itimerspec kern_old_its;I guess this line should be used 'struct
__kernel_old_itimerspec', right?
Thanks for spotting this.
Signature · 1 line
viresh
PATCH v5 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing timer_gettime() syscall tests.
---
V5: Use __kernel_old_itimerspec instead of __kernel_itimerspec.
include/tst_timer.h | 45 +++++++ .../syscalls/clock_gettime/clock_gettime04 | Bin 0 -> 509264 bytes .../syscalls/clock_settime/clock_settime03 | Bin 0 -> 516496 bytes .../syscalls/timer_gettime/timer_gettime01.c | 124 ++++++++---------- 4 files changed, 97 insertions(+), 72 deletions(-) create mode 100755 testcases/kernel/syscalls/clock_gettime/clock_gettime04 create mode 100755 testcases/kernel/syscalls/clock_settime/clock_settime03
include/tst_timer.h +45 -0
@@ -15,6 +15,7 @@#include <sys/time.h> #include <time.h> #include "tst_test.h" +#include "lapi/common_timers.h" #include "lapi/syscalls.h" /*
@@ -112,6 +113,16 @@ struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ long long tv_nsec;/* nanoseconds */ }; + +struct __kernel_old_itimerspec { +struct __kernel_old_timespec it_interval;/* timer period */ +struct __kernel_old_timespec it_value;/* timer expiration */ +}; + +struct __kernel_itimerspec { +struct __kernel_timespec it_interval;/* timer period */ +struct __kernel_timespec it_value;/* timer expiration */ +};#endif enum tst_ts_type {
@@ -129,6 +140,14 @@ struct tst_ts { } ts; }; +struct tst_its { +enum tst_ts_type type; +union { +struct __kernel_old_itimerspec kern_old_its; +struct __kernel_itimerspec kern_its; + } ts; +}; +static inline void *tst_ts_get (struct tst_ts *t) {if (!t)
@@ -147,6 +166,22 @@ static inline void *tst_ts_get(struct tst_ts *t) } } +static inline void *tst_its_get (struct tst_its *t) +{ +if (!t) +return NULL ; + +switch (t->type) { +case TST_KERN_OLD_TIMESPEC : +return &t->ts.kern_old_its; +case TST_KERN_TIMESPEC : +return &t->ts.kern_its; +default : +tst_brk (TBROK ,"Invalid type: %d" , t->type); +return NULL ; + } +} +static inline int libc_clock_getres (clockid_t clk_id,void *ts) {return clock_getres (clk_id, ts);
@@ -212,6 +247,16 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int sys_timer_gettime (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime, timerid, its); +} + +static inline int sys_timer_gettime64 (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime64, timerid, its); +} +/* * Returns tst_ts seconds. */
testcases/kernel/syscalls/clock_gettime/clock_gettime04 new file binary +0 -0
testcases/kernel/syscalls/clock_settime/clock_settime03 new file binary +0 -0
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +52 -72
147 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v5 6/17 syscalls/futex: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing futex() syscall tests.
---
V5: Use tst_brk instead of tst_res at two places.
include/tst_timer.h | 12 ++ .../syscalls/futex/futex_cmp_requeue01.c | 34 +++- .../syscalls/futex/futex_cmp_requeue02.c | 24 ++- testcases/kernel/syscalls/futex/futex_utils.h | 52 +++++-- .../kernel/syscalls/futex/futex_wait01.c | 79 +++++----- .../kernel/syscalls/futex/futex_wait02.c | 102 ++++++------ .../kernel/syscalls/futex/futex_wait03.c | 87 ++++++----- .../kernel/syscalls/futex/futex_wait04.c | 81 +++++----- .../kernel/syscalls/futex/futex_wait05.c | 2 +- .../syscalls/futex/futex_wait_bitset01.c | 48 ++++-- .../kernel/syscalls/futex/futex_wake01.c | 67 ++++---- .../kernel/syscalls/futex/futex_wake02.c | 95 ++++++------ .../kernel/syscalls/futex/futex_wake03.c | 109 +++++++------ .../kernel/syscalls/futex/futex_wake04.c | 145 +++++++++--------- testcases/kernel/syscalls/futex/futextest.h | 122 ++++++++++----- 15 files changed, 592 insertions(+), 467 deletions(-)
include/tst_timer.h +12 -0
@@ -248,6 +248,18 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int sys_futex (int *uaddr,int futex_op,int val,void *to, +int *uaddr2,int val3) +{ +return tst_syscall (__NR_futex, uaddr, futex_op, val, to, uaddr2, val3); +} + +static inline int sys_futex_time64 (int *uaddr,int futex_op,int val,void *to, +int *uaddr2,int val3) +{ +return tst_syscall (__NR_futex_time64, uaddr, futex_op, val, to, uaddr2, val3); +} +static inline int libc_sched_rr_get_interval (pid_t pid,void *ts) {return sched_rr_get_interval (pid, ts);
testcases/kernel/syscalls/futex/futex_cmp_requeue01.c +28 -6
@@ -42,14 +42,29 @@ static struct tcase { {1000, 300, 500}, }; +static struct test_variants { +enum futex_fn_type fntype; +enum tst_ts_type tstype; +char *desc; +} variants[] = { +#if (__NR_futex != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX , .tstype =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_futex_time64 != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX64 , .tstype =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; +static void do_child (void ) { +struct test_variants *tv = &variants[tst_variant]; +struct tst_ts usec =tst_ts_from_ms (tv->tstype, max_sleep_ms);int slept_for_ms =0 ; -struct timespec usec =tst_timespec_from_ms (max_sleep_ms);int pid =getpid ();int ret =0 ; -if (futex_wait (&sd->futexes[0 ], sd->futexes[0 ], &usec,0 ) ==-1 ) { +if (futex_wait (tv->fntype, &sd->futexes[0 ], sd->futexes[0 ], &usec,0 ) ==-1 ) {if (errno ==EAGAIN ) {/* spurious wakeup or signal */ tst_atomic_inc (&sd->spurious);
@@ -72,6 +87,7 @@ static void do_child(void)static void verify_futex_cmp_requeue (unsigned int n) { +struct test_variants *tv = &variants[tst_variant];int num_requeues =0 , num_waits =0 , num_total =0 ;int i, status, spurious, woken_up;struct tcase *tc = &tcases[n];
@@ -104,8 +120,8 @@ static void verify_futex_cmp_requeue(unsigned int n)* specifies an upper limit on the number of waiters that are requeued. * Returns the total number of waiters that were woken up or requeued. */ -TEST (futex_cmp_requeue (&sd->futexes[0 ], sd->futexes[0 ], &sd->futexes[1 ], - tc->set_wakes, tc->set_requeues,0 )); +TEST (futex_cmp_requeue (tv->fntype, &sd->futexes[0 ], sd->futexes[0 ], + &sd->futexes[1 ], tc->set_wakes, tc->set_requeues,0 ));/* Fail if more than requested wakes + requeues were returned */ if (TST_RET > exp_ret) {
@@ -115,8 +131,8 @@ static void verify_futex_cmp_requeue(unsigned int n)tst_res (TINFO ,"futex_cmp_requeue() returned %ld" ,TST_RET ); } - num_requeues =futex_wake (&sd->futexes[1 ], tc->num_waiters,0 ); - num_waits =futex_wake (&sd->futexes[0 ], tc->num_waiters,0 ); + num_requeues =futex_wake (tv->fntype, &sd->futexes[1 ], tc->num_waiters,0 ); + num_waits =futex_wake (tv->fntype, &sd->futexes[0 ], tc->num_waiters,0 );tst_atomic_store (1 , &sd->test_done);for (i =0 ; i < tc->num_waiters; i++) {
@@ -178,6 +194,11 @@ static void verify_futex_cmp_requeue(unsigned int n)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +futex_supported_by_kernel (tv->fntype); + max_sleep_ms =tst_multiply_timeout (5000 ); sd = SAFE_MMAP(NULL, sizeof(*sd), PROT_READ | PROT_WRITE,
@@ -198,5 +219,6 @@ static struct tst_test test = { .cleanup = cleanup, .tcnt = ARRAY_SIZE(tcases), .test = verify_futex_cmp_requeue, + .test_variants = ARRAY_SIZE(variants), .forks_child = 1, };
testcases/kernel/syscalls/futex/futex_cmp_requeue02.c +22 -2
@@ -32,12 +32,26 @@ static struct tcase { {1, 1, FUTEX_INITIALIZER + 1, EAGAIN}, }; +static struct test_variants { +enum futex_fn_type fntype; +char *desc; +} variants[] = { +#if (__NR_futex != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX , .desc ="syscall with old kernel spec" }, +#endif + +#if (__NR_futex_time64 != __LTP__NR_INVALID_SYSCALL) + { .fntype =FUTEX_FN_FUTEX64 , .desc ="syscall time64 with kernel spec" }, +#endif +}; +static void verify_futex_cmp_requeue (unsigned int n) { +struct test_variants *tv = &variants[tst_variant];struct tcase *tc = &tcases[n]; -TEST (futex_cmp_requeue (&futexes[0 ], tc->exp_val, &futexes[1 ], - tc->set_wakes, tc->set_requeues,0 )); +TEST (futex_cmp_requeue (tv->fntype, &futexes[0 ], tc->exp_val, + &futexes[1 ], tc->set_wakes, tc->set_requeues,0 ));if (TST_RET !=-1 ) {tst_res (TFAIL ,"futex_cmp_requeue() succeeded unexpectedly" );return ;
@@ -55,6 +69,11 @@ static void verify_futex_cmp_requeue(unsigned int n)static void setup (void ) { +struct test_variants *tv = &variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv->desc); +futex_supported_by_kernel (tv->fntype); + futexes =SAFE_MMAP (NULL ,sizeof (futex_t) *2 ,PROT_READ |PROT_WRITE ,MAP_ANONYMOUS |MAP_SHARED ,-1 ,0 );
@@ -73,6 +92,7 @@ static struct tst_test test = { .cleanup = cleanup, .test = verify_futex_cmp_requeue, .tcnt = ARRAY_SIZE(tcases), + .test_variants = ARRAY_SIZE(variants), .tags = (const struct tst_tag []) { {"CVE" ,"2018-6927" }, {"linux-git" ,"fbe0e839d1e2" },
testcases/kernel/syscalls/futex/futex_utils.h +42 -10
86 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait01.c +40 -39
122 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait02.c +45 -57
150 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait03.c +43 -44
130 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait04.c +41 -40
106 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wait05.c +1 -1
@@ -19,7 +19,7 @@ int sample_fn(int clk_id, long long usec)futex_t futex =FUTEX_INITIALIZER ;tst_timer_start (clk_id); -TEST (futex_wait (&futex, futex, &to,0 )); +TEST (syscall (SYS_futex, &futex,FUTEX_WAIT , futex, &to,NULL ,0 ));tst_timer_stop ();tst_timer_sample ();
testcases/kernel/syscalls/futex/futex_wait_bitset01.c +38 -10
89 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake01.c +31 -36
96 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake02.c +46 -49
174 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake03.c +52 -57
171 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_wake04.c +71 -74
252 lines not on this page · raw message
testcases/kernel/syscalls/futex/futextest.h +80 -42
225 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v6 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Viresh KumarThis adds support for time64 tests to the existing timer_gettime() syscall tests.
---
V6: Drop the binary files included by mistake.
include/tst_timer.h | 45 +++++++ .../syscalls/timer_gettime/timer_gettime01.c | 124 ++++++++---------- 2 files changed, 97 insertions(+), 72 deletions(-)
include/tst_timer.h +45 -0
@@ -15,6 +15,7 @@#include <sys/time.h> #include <time.h> #include "tst_test.h" +#include "lapi/common_timers.h" #include "lapi/syscalls.h" /*
@@ -112,6 +113,16 @@ struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ long long tv_nsec;/* nanoseconds */ }; + +struct __kernel_old_itimerspec { +struct __kernel_old_timespec it_interval;/* timer period */ +struct __kernel_old_timespec it_value;/* timer expiration */ +}; + +struct __kernel_itimerspec { +struct __kernel_timespec it_interval;/* timer period */ +struct __kernel_timespec it_value;/* timer expiration */ +};#endif enum tst_ts_type {
@@ -129,6 +140,14 @@ struct tst_ts { } ts; }; +struct tst_its { +enum tst_ts_type type; +union { +struct __kernel_old_itimerspec kern_old_its; +struct __kernel_itimerspec kern_its; + } ts; +}; +static inline void *tst_ts_get (struct tst_ts *t) {if (!t)
@@ -147,6 +166,22 @@ static inline void *tst_ts_get(struct tst_ts *t) } } +static inline void *tst_its_get (struct tst_its *t) +{ +if (!t) +return NULL ; + +switch (t->type) { +case TST_KERN_OLD_TIMESPEC : +return &t->ts.kern_old_its; +case TST_KERN_TIMESPEC : +return &t->ts.kern_its; +default : +tst_brk (TBROK ,"Invalid type: %d" , t->type); +return NULL ; + } +} +static inline int libc_clock_getres (clockid_t clk_id,void *ts) {return clock_getres (clk_id, ts);
@@ -212,6 +247,16 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int sys_timer_gettime (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime, timerid, its); +} + +static inline int sys_timer_gettime64 (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime64, timerid, its); +} +/* * Returns tst_ts seconds. */
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +52 -72
147 lines not on this page · raw message
Signature · 1 line
2.25.0.rc1.19.g042ed3e048af
PATCH v6 1/17 syscalls/timer_gettime: Add support for time64 tests
Hi!
Quoted 113 lines
This adds support for time64 tests to the existing
timer_gettime()syscall tests.Signed-off-by Viresh Kumar <[email protected]>---
V6: Drop the binary files included by mistake.include/tst_timer.h | 45 +++++++ .../syscalls/timer_gettime/timer_gettime01.c | 124 ++++++++---------- 2 files changed, 97 insertions(+), 72 deletions(-)include/tst_timer.h +45
-0@@ -15,6 +15,7 @@#include <sys/time.h> #include <time.h> #include "tst_test.h" +#include "lapi/common_timers.h" #include "lapi/syscalls.h" /* @@ -112,6 +113,16 @@ struct __kernel_timespec {__kernel_time64_t tv_sec;/* seconds */ long long tv_nsec;/* nanoseconds */ }; + +struct __kernel_old_itimerspec { +struct __kernel_old_timespec it_interval;/* timer period */ +struct __kernel_old_timespec it_value;/* timer expiration */ +}; + +struct __kernel_itimerspec { +struct __kernel_timespec it_interval;/* timer period */ +struct __kernel_timespec it_value;/* timer expiration */ +};#endif enum tst_ts_type {@@ -129,6 +140,14 @@ struct tst_ts { } ts; }; +struct tst_its { +enum tst_ts_type type; +union { +struct __kernel_old_itimerspec kern_old_its; +struct __kernel_itimerspec kern_its; + } ts; +}; +static inline void *tst_ts_get (struct tst_ts *t) {if (!t)@@ -147,6 +166,22 @@ static inline void *tst_ts_get(struct tst_ts *t) } } +static inline void *tst_its_get (struct tst_its *t) +{ +if (!t) +return NULL ; + +switch (t->type) { +case TST_KERN_OLD_TIMESPEC : +return &t->ts.kern_old_its; +case TST_KERN_TIMESPEC : +return &t->ts.kern_its; +default : +tst_brk (TBROK ,"Invalid type: %d" , t->type); +return NULL ; + } +} +static inline int libc_clock_getres (clockid_t clk_id,void *ts) {return clock_getres (clk_id, ts);@@ -212,6 +247,16 @@ static inline int sys_clock_nanosleep64(clockid_t clk_id, int flags, request, remain); } +static inline int sys_timer_gettime (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime, timerid, its); +} + +static inline int sys_timer_gettime64 (timer_t timerid,void *its) +{ +return tst_syscall (__NR_timer_gettime64, timerid, its); +} +/* * Returns tst_ts seconds. */ testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +0
-13@@ -1,24 +1,5 @@ -/****************************************************************************** -* Copyright (c) Crackerjack Project., 2007 * -* Porting from Crackerjack to LTP is done by: * -* Manas Kumar Nayak <[email protected]> * -* Copyright (c) 2013 Cyril Hrubis <[email protected]> * -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of *
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c line 2
Quoted 10 lines
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +2
-8-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See * -* the GNU General Public License for more details. * -* * -* You should have received a copy of the GNU General Public License * -* along with this program; if not, write to the Free Software Foundation, * -* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * -* * -******************************************************************************/ +// SPDX-License-Identifier: GPL-2.0-or-later +/* Copyright (c) Crackerjack Project., 2007 */
You have dropped two copyright from there...
Quoted 92 lines
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +23
-49#include <time.h> #include <signal.h> @@ -26,71 +7,70 @@#include <stdio.h> #include <errno.h> -#include "test.h" -#include "lapi/syscalls.h" +#include "tst_timer.h" -char *TCID ="timer_gettime01" ; -int TST_TOTAL =3 ; +static struct test_variants { +int (*func)(timer_t timer,void *its); +enum tst_ts_type type; +char *desc; +} variants[] = { +#if (__NR_timer_gettime != __LTP__NR_INVALID_SYSCALL) + { .func = sys_timer_gettime, .type =TST_KERN_OLD_TIMESPEC , .desc ="syscall with old kernel spec" }, +#endif -static void cleanup (void ) -{ -tst_rmdir (); -} +#if (__NR_timer_gettime64 != __LTP__NR_INVALID_SYSCALL) + { .func = sys_timer_gettime64, .type =TST_KERN_TIMESPEC , .desc ="syscall time64 with kernel spec" }, +#endif +}; -static void setup (void ) -{ -TEST_PAUSE ; -tst_tmpdir (); -} +static timer_t timer; -int main (int ac,char **av) +static void setup (void ) { -int lc; -struct sigevent ev; -struct itimerspec spec; -int timer; -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); +tst_res (TINFO ,"Testing variant: %s" , variants[tst_variant].desc); ev.sigev_value = (union sigval )0 ; ev.sigev_signo =SIGALRM ; ev.sigev_notify =SIGEV_SIGNAL ; -TEST (ltp_syscall (__NR_timer_create,CLOCK_REALTIME , &ev, &timer)); - -if (TEST_RETURN !=0 ) -tst_brkm (TBROK |TERRNO , cleanup,"Failed to create timer" ); -for (lc =0 ;TEST_LOOPING (lc); ++lc) { - tst_count =0 ; +TEST (tst_syscall (__NR_timer_create,CLOCK_REALTIME , &ev, &timer)); -TEST (ltp_syscall (__NR_timer_gettime, timer, &spec)); -if (TEST_RETURN ==0 ) { -tst_resm (TPASS ,"timer_gettime(CLOCK_REALTIME) Passed" ); - }else { -tst_resm (TFAIL |TERRNO , -"timer_gettime(CLOCK_REALTIME) Failed" ); - } - -TEST (ltp_syscall (__NR_timer_gettime,-1 , &spec)); -if (TEST_RETURN ==-1 &&TEST_ERRNO ==EINVAL ) { -tst_resm (TPASS ,"timer_gettime(-1) Failed: EINVAL" ); - }else { -tst_resm (TFAIL |TERRNO , -"timer_gettime(-1) = %li" ,TEST_RETURN ); - } +if (TST_RET ) { +tst_res (TFAIL |TTERRNO ,"timer_create() failed" ); +return ; + } +} -TEST (ltp_syscall (__NR_timer_gettime, timer,NULL )); -if (TEST_RETURN ==-1 &&TEST_ERRNO ==EFAULT ) { -tst_resm (TPASS ,"timer_gettime(NULL) Failed: EFAULT" ); - }else { -tst_resm (TFAIL |TERRNO , -"timer_gettime(-1) = %li" ,TEST_RETURN ); - } +static void verify (void )
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c line 56
Quoted 10 lines
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +9
-0+{ +struct test_variants *tv = &variants[tst_variant]; +struct tst_its spec = {.type = tv->type, }; + +TEST (tv->func (timer,tst_its_get (&spec))); +if (TST_RET ==0 ) { +tst_res (TPASS ,"timer_gettime() Passed" ); + }else { +tst_res (TFAIL |TTERRNO ,"timer_gettime() Failed" ); }
Looking at manuals it seems that:
* Newly created timer is disarmed
* For disarmed timers the clock_gettime() should get itimer with zeroes
So we check here that the returned itimer has zeroes for both oneshoot and interval timers here.
Other than that it looks good.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v4 2/17 syscalls/timer_settime: Add support for time64 tests
In reply to Viresh KumarHi!
So this test depends on the previous one since we are adding the tst_its piece by piece, shouldn't we add all the functions into the tst_timer.h in a separate patch?
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v6 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Cyril HrubisQuoted 14 lines · Cyril Hrubis
Review
Quoted 11 lines
(quoted diff) +10
-0+static void verify(void) +{ + struct test_variants *tv = &variants[tst_variant]; + struct tst_its spec = {.type = tv->type, }; + + TEST(tv->func(timer, tst_its_get(&spec))); + if (TST_RET == 0) { + tst_res(TPASS, "timer_gettime() Passed"); + } else { + tst_res(TFAIL | TTERRNO, "timer_gettime() Failed"); }Looking at manuals it seems that:
Quoted 6 lines
* Newly created timer is disarmed
* For disarmed timers the
clock_gettime()should get itimer with zeroesSo we check here that the returned itimer has zeroes for both oneshoot and interval timers here.
I am not sure what oneshoot/interval timers you are talking about :)
This is what I came to, is this sufficient ?
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +13 -1
@@ -55,7 +55,19 @@ static void verify(void)TEST (tv->func (timer,tst_its_get (&spec)));if (TST_RET ==0 ) { -tst_res (TPASS ,"timer_gettime() Passed" ); +if ((spec.type ==TST_KERN_OLD_TIMESPEC && + (spec.ts.kern_old_its.it_interval.tv_sec || + spec.ts.kern_old_its.it_interval.tv_nsec || + spec.ts.kern_old_its.it_value.tv_sec || + spec.ts.kern_old_its.it_value.tv_nsec)) || + (spec.type ==TST_KERN_TIMESPEC && + (spec.ts.kern_its.it_interval.tv_sec || + spec.ts.kern_its.it_interval.tv_nsec || + spec.ts.kern_its.it_value.tv_sec || + spec.ts.kern_its.it_value.tv_nsec))) +tst_res (TFAIL ,"timespec should have been zeroed" ); +else +tst_res (TPASS ,"timer_gettime() Passed" ); }else {tst_res (TFAIL |TTERRNO ,"timer_gettime() Failed" ); }
Signature · 1 line
viresh
PATCH v4 2/17 syscalls/timer_settime: Add support for time64 tests
In reply to Cyril HrubisQuoted 4 lines · Cyril Hrubis
Hi!
So this test depends on the previous one since we are adding thetst_itspiece by piece, shouldn't we add all the functions into thetst_timer.hin a separate patch?
You mean functions related only to "its" ? Or all the wrappers for various syscalls that are getting added to tst_timer.h ?
Signature · 1 line
viresh
PATCH v6 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Viresh KumarHi!
Quoted 14 lines
Quoted 14 lines
Review
Quoted 11 lines
(quoted diff) +10
-0+static void verify(void) +{ + struct test_variants *tv = &variants[tst_variant]; + struct tst_its spec = {.type = tv->type, }; + + TEST(tv->func(timer, tst_its_get(&spec))); + if (TST_RET == 0) { + tst_res(TPASS, "timer_gettime() Passed"); + } else { + tst_res(TFAIL | TTERRNO, "timer_gettime() Failed"); }Looking at manuals it seems that:
Quoted 8 lines
Quoted 6 lines
* Newly created timer is disarmed
* For disarmed timers the
clock_gettime()should get itimer with zeroesSo we check here that the returned itimer has zeroes for both oneshoot and interval timers here.
I am not sure what oneshoot/interval timers you are talking about :)
These are the two timerspec structures inside of the itimerspec, one of them is for oneshoot timer/alarm and the second one is for reocurring timer/alarm and called interval.
Quoted 12 lines
This is what I came to, is this sufficient ?
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +1
-1@@ -55,7 +55,19 @@ static void verify(void)TEST (tv->func (timer,tst_its_get (&spec)));if (TST_RET ==0 ) { -tst_res (TPASS ,"timer_gettime() Passed" ); + if ((spec.type == TST_KERN_OLD_TIMESPEC &&
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c static void verify(void) · line 68
Quoted 10 lines
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +10
-0+ (spec.ts.kern_old_its.it_interval.tv_sec || + spec.ts.kern_old_its.it_interval.tv_nsec || + spec.ts.kern_old_its.it_value.tv_sec || + spec.ts.kern_old_its.it_value.tv_nsec)) || + (spec.type ==TST_KERN_TIMESPEC && + (spec.ts.kern_its.it_interval.tv_sec || + spec.ts.kern_its.it_interval.tv_nsec || + spec.ts.kern_its.it_value.tv_sec || + spec.ts.kern_its.it_value.tv_nsec))) + tst_res(TFAIL, "timespec should have been zeroed");
Indeed that's what I had in mind, can we please abstract this properly as well? I guess that we can add helpers such as tst_its_interval_sec() tst_its_inverval_nsec, etc.
Quoted 8 lines
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +2
-0+else +tst_res (TPASS ,"timer_gettime() Passed" ); }else {tst_res (TFAIL |TTERRNO ,"timer_gettime() Failed" ); }Signature · 2 lines
-- viresh
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v6 1/17 syscalls/timer_gettime: Add support for time64 tests
Quoted 15 lines · Cyril Hrubis
Quoted 4 lines
TEST(tv->func(timer, tst_its_get(&spec))); if (TST_RET == 0) {testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +1
-1-tst_res (TPASS ,"timer_gettime() Passed" ); + if ((spec.type == TST_KERN_OLD_TIMESPEC &&testcases/kernel/syscalls/timer_gettime/timer_gettime01.c static void verify(void) · line 68
Quoted 10 lines
testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +10
-0+ (spec.ts.kern_old_its.it_interval.tv_sec || + spec.ts.kern_old_its.it_interval.tv_nsec || + spec.ts.kern_old_its.it_value.tv_sec || + spec.ts.kern_old_its.it_value.tv_nsec)) || + (spec.type ==TST_KERN_TIMESPEC && + (spec.ts.kern_its.it_interval.tv_sec || + spec.ts.kern_its.it_interval.tv_nsec || + spec.ts.kern_its.it_value.tv_sec || + spec.ts.kern_its.it_value.tv_nsec))) + tst_res(TFAIL, "timespec should have been zeroed");
Quoted 3 lines
Indeed that's what I had in mind, can we please abstract this properly as well? I guess that we can add helpers such as
tst_its_interval_sec()tst_its_inverval_nsec, etc.
I preferred it this way as no one else uses it and so maybe we can live without adding those helpers ?
Signature · 1 line
viresh
PATCH v4 2/17 syscalls/timer_settime: Add support for time64 tests
In reply to Viresh KumarHi!
Quoted 6 lines
Quoted 3 lines
So this test depends on the previous one since we are adding the
tst_itspiece by piece, shouldn't we add all the functions into thetst_timer.hin a separate patch?You mean functions related only to "its" ? Or all the wrappers for various syscalls that are getting added to
tst_timer.h?
I guess that it would be easier to add all the code to tst_timer.h in one go, then we can focus on the actual tests. This avoids having dependencies between the patches touching the tests and allows them to be merged out of order...
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v6 1/17 syscalls/timer_gettime: Add support for time64 tests
In reply to Viresh KumarHi!
Quoted 6 lines
Quoted 3 lines
Indeed that's what I had in mind, can we please abstract this properly as well? I guess that we can add helpers such as
tst_its_interval_sec()tst_its_inverval_nsec, etc.I preferred it this way as no one else uses it and so maybe we can live without adding those helpers ?
I'm pretty sure we will need them for the timer_settime() tests anyway, i.e. test that would do timer_settime() and then timer_gettime() to check that the timer is read back correclty.
Signature · 2 lines
Cyril Hrubis [email protected]