Add futex_wait testing suite
v2 cover Add futex_wait testing suite
futex_waitv tests have been inspired by tools/testing/selftests/futex/functional/futex_waitv.c that can be found in the Linux kernel official repository.
Andrea Cervesato (2):
Update lapi/futex.h fallback
Add futex_waitv testing suite
configure.ac | 3 + include/lapi/futex.h | 180 ++++++++++++++++++ include/lapi/syscalls/aarch64.in | 1 + include/lapi/syscalls/arc.in | 1 + include/lapi/syscalls/arm.in | 1 + include/lapi/syscalls/hppa.in | 1 + include/lapi/syscalls/i386.in | 1 + include/lapi/syscalls/ia64.in | 1 + include/lapi/syscalls/mips_n32.in | 1 + include/lapi/syscalls/mips_n64.in | 1 + include/lapi/syscalls/mips_o32.in | 1 + include/lapi/syscalls/powerpc.in | 1 + include/lapi/syscalls/powerpc64.in | 1 + include/lapi/syscalls/s390.in | 1 + include/lapi/syscalls/s390x.in | 1 + include/lapi/syscalls/sh.in | 1 + include/lapi/syscalls/sparc.in | 1 + include/lapi/syscalls/sparc64.in | 1 + include/lapi/syscalls/x86_64.in | 1 + lib/tst_checkpoint.c | 1 - testcases/kernel/syscalls/clone/clone08.c | 1 - testcases/kernel/syscalls/futex/.gitignore | 3 + testcases/kernel/syscalls/futex/Makefile | 14 +- .../syscalls/futex/futex_cmp_requeue01.c | 2 +- .../syscalls/futex/futex_cmp_requeue02.c | 2 +- .../kernel/syscalls/futex/futex_waitv01.c | 129 +++++++++++++ .../kernel/syscalls/futex/futex_waitv02.c | 104 ++++++++++ .../kernel/syscalls/futex/futex_waitv03.c | 112 +++++++++++ testcases/kernel/syscalls/futex/futextest.h | 72 +++---- 29 files changed, 591 insertions(+), 49 deletions(-) create mode 100644 testcases/kernel/syscalls/futex/futex_waitv01.c create mode 100644 testcases/kernel/syscalls/futex/futex_waitv02.c create mode 100644 testcases/kernel/syscalls/futex/futex_waitv03.c
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/2 Update lapi/futex.h fallback
Added a complete futex.h definition with futex2 support
--- configure.ac | 3 + include/lapi/futex.h | 180 ++++++++++++++++++ include/lapi/syscalls/aarch64.in | 1 + include/lapi/syscalls/arc.in | 1 + include/lapi/syscalls/arm.in | 1 + include/lapi/syscalls/hppa.in | 1 + include/lapi/syscalls/i386.in | 1 + include/lapi/syscalls/ia64.in | 1 + include/lapi/syscalls/mips_n32.in | 1 + include/lapi/syscalls/mips_n64.in | 1 + include/lapi/syscalls/mips_o32.in | 1 + include/lapi/syscalls/powerpc.in | 1 + include/lapi/syscalls/powerpc64.in | 1 + include/lapi/syscalls/s390.in | 1 + include/lapi/syscalls/s390x.in | 1 + include/lapi/syscalls/sh.in | 1 + include/lapi/syscalls/sparc.in | 1 + include/lapi/syscalls/sparc64.in | 1 + include/lapi/syscalls/x86_64.in | 1 + lib/tst_checkpoint.c | 1 - testcases/kernel/syscalls/clone/clone08.c | 1 - .../syscalls/futex/futex_cmp_requeue01.c | 2 +- .../syscalls/futex/futex_cmp_requeue02.c | 2 +- testcases/kernel/syscalls/futex/futextest.h | 72 +++---- 24 files changed, 231 insertions(+), 47 deletions(-)
configure.ac +3 -0
@@ -51,6 +51,7 @@ AC_CHECK_HEADERS_ONCE([ \ linux/close_range.h \ linux/dccp.h \ linux/fs.h \ + linux/futex.h \ linux/genetlink.h \ linux/if_alg.h \ linux/if_ether.h \
@@ -216,6 +217,8 @@ AC_CHECK_TYPES([struct xt_entry_match, struct xt_entry_target],,,[ AC_CHECK_TYPES([struct __kernel_old_timeval, struct __kernel_old_timespec, struct __kernel_timespec, struct __kernel_old_itimerspec, struct __kernel_itimerspec],,,[#include <sys/socket.h>]) +AC_CHECK_TYPES([struct futex_waitv],,,[#include <linux/futex.h>]) + # Tools knobs # Bash
include/lapi/futex.h +180 -0
196 lines not on this page · raw message
include/lapi/syscalls/aarch64.in +1 -0
@@ -295,4 +295,5 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449 _sysctl 1078
include/lapi/syscalls/arc.in +1 -0
@@ -315,3 +315,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/arm.in +1 -0
@@ -393,3 +393,4 @@ openat2 (__NR_SYSCALL_BASE+437) pidfd_getfd (__NR_SYSCALL_BASE+438) epoll_pwait2 (__NR_SYSCALL_BASE+441) quotactl_fd (__NR_SYSCALL_BASE+443) +futex_waitv (__NR_SYSCALL_BASE+449)
include/lapi/syscalls/hppa.in +1 -0
@@ -42,3 +42,4 @@ pidfd_open 434 close_range 436 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/i386.in +1 -0
@@ -429,3 +429,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/ia64.in +1 -0
@@ -342,3 +342,4 @@ openat2 1461 pidfd_getfd 1462 epoll_pwait2 1465 quotactl_fd 1467 +futex_waitv 1473
include/lapi/syscalls/mips_n32.in +1 -0
@@ -370,3 +370,4 @@ process_madvise 6440 epoll_pwait2 6441 mount_setattr 6442 quotactl_fd 6443 +futex_waitv 6449
include/lapi/syscalls/mips_n64.in +1 -0
@@ -346,3 +346,4 @@ process_madvise 5440 epoll_pwait2 5441 mount_setattr 5442 quotactl_fd 5443 +futex_waitv 5449
include/lapi/syscalls/mips_o32.in +1 -0
@@ -416,3 +416,4 @@ process_madvise 4440 epoll_pwait2 4441 mount_setattr 4442 quotactl_fd 4443 +futex_waitv 4449
include/lapi/syscalls/powerpc.in +1 -0
@@ -422,3 +422,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/powerpc64.in +1 -0
@@ -422,3 +422,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/s390.in +1 -0
@@ -409,3 +409,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/s390x.in +1 -0
@@ -357,3 +357,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/sh.in +1 -0
@@ -403,3 +403,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/sparc.in +1 -0
@@ -408,3 +408,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/sparc64.in +1 -0
@@ -373,3 +373,4 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449
include/lapi/syscalls/x86_64.in +1 -0
@@ -350,6 +350,7 @@ openat2 437 pidfd_getfd 438 epoll_pwait2 441 quotactl_fd 443 +futex_waitv 449 rt_sigaction 512 rt_sigreturn 513 ioctl 514
lib/tst_checkpoint.c +0 -1
@@ -25,7 +25,6 @@#include <limits.h> #include <errno.h> #include <sys/syscall.h> -#include <linux/futex.h> #include "test.h" #include "safe_macros.h"
testcases/kernel/syscalls/clone/clone08.c +0 -1
@@ -11,7 +11,6 @@#include <errno.h> #include <sched.h> #include <sys/wait.h> -#include <linux/futex.h> #include "tst_test.h" #include "clone_platform.h"
testcases/kernel/syscalls/futex/futex_cmp_requeue01.c +1 -1
@@ -12,12 +12,12 @@#include <errno.h> #include <sys/wait.h> #include <stdlib.h> -#include <linux/futex.h> #include <sys/time.h> #include "tst_timer_test.h" #include "tst_test.h" #include "futextest.h" +#include "lapi/futex.h" struct shared_data {futex_t futexes[2 ];
testcases/kernel/syscalls/futex/futex_cmp_requeue02.c +1 -1
@@ -13,11 +13,11 @@*/ #include <errno.h> -#include <linux/futex.h> #include <sys/time.h> #include "tst_test.h" #include "futextest.h" +#include "lapi/futex.h" static futex_t *futexes;
testcases/kernel/syscalls/futex/futextest.h +29 -43
93 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 1/2] Update lapi/futex.h fallback
Hi!
testcases/kernel/syscalls/futex/futextest.h struct futex_test_variants { · line 46
Quoted 9 lines
testcases/kernel/syscalls/futex/futextest.h +9
-0+struct futex_test_variants futex_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 +};
I guess that there should be a followup patch that makse use of this in all the futex tests, right?
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 1/2] Update lapi/futex.h fallback
Hi,
yes that's the idea. The issue now is that imports are bad sorted after tst_syscall patch and I need to create a v3. Gonna send it
Andrea
Quoted 13 lines · Cyril Hrubis
Hi!
testcases/kernel/syscalls/futex/futextest.h struct futex_test_variants { · line 46
Quoted 9 lines
testcases/kernel/syscalls/futex/futextest.h +9
-0+struct futex_test_variants futex_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 +};I guess that there should be a followup patch that makse use of this in all the futex tests, right?
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/2 Add futex_waitv testing suite
In reply to Andrea Cervesato--- testcases/kernel/syscalls/futex/.gitignore | 3 + testcases/kernel/syscalls/futex/Makefile | 14 +- .../kernel/syscalls/futex/futex_waitv01.c | 129 ++++++++++++++++++ .../kernel/syscalls/futex/futex_waitv02.c | 104 ++++++++++++++ .../kernel/syscalls/futex/futex_waitv03.c | 112 +++++++++++++++ 5 files changed, 360 insertions(+), 2 deletions(-) create mode 100644 testcases/kernel/syscalls/futex/futex_waitv01.c create mode 100644 testcases/kernel/syscalls/futex/futex_waitv02.c create mode 100644 testcases/kernel/syscalls/futex/futex_waitv03.c
testcases/kernel/syscalls/futex/.gitignore +3 -0
@@ -10,3 +10,6 @@ /futex_wake02 /futex_wake03 /futex_wake04 +/futex_waitv01 +/futex_waitv02 +/futex_waitv03
testcases/kernel/syscalls/futex/Makefile +12 -2
@@ -3,8 +3,18 @@ top_srcdir ?= ../../../.. -futex_cmp_requeue01 futex_cmp_requeue02 futex_wait02 futex_wake03 futex_wait05 futex_wait_bitset01: LDLIBS += -lrt -futex_wait03 futex_wake02 futex_wake04: CFLAGS += -pthread +futex_cmp_requeue01: LDLIBS+=-lrt +futex_cmp_requeue02: LDLIBS+=-lrt +futex_wait02: LDLIBS+=-lrt +futex_wake03: LDLIBS+=-lrt +futex_wait05: LDLIBS+=-lrt +futex_wait_bitset01: LDLIBS+=-lrt + +futex_wait03: CFLAGS+=-pthread +futex_wake02: CFLAGS+=-pthread +futex_wake04: CFLAGS+=-pthread +futex_waitv02: CFLAGS+=-pthread +futex_waitv03: CFLAGS+=-pthread include $(top_srcdir)/include/mk/testcases.mk include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/futex/futex_waitv01.c new file +129 -0
129 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_waitv02.c new file +104 -0
104 lines not on this page · raw message
testcases/kernel/syscalls/futex/futex_waitv03.c new file +112 -0
112 lines not on this page · raw message
Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] Add futex_waitv testing suite
Hi!
Quoted 39 lines
new file mode 100644
index 000000000..ccf1699detestcases/kernel/syscalls/futex/futex_waitv01.c new file +34
-0@@ -0,0 +1,129 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2021 SUSE LLC Andrea Cervesato <[email protected]> +*/ + +/*\ +* [Description] +* +* This test verifies EINVAL for futex_waitv syscall. +*/ + +#include <stdlib.h> +#include <time.h> +#include "tst_test.h" +#include "futextest.h" + +static char *str_numfutex; +static int numfutex =30 ; + +static uint32_t *futexes; +static struct futex_waitv *waitv; + +static void setup (void ) +{ +struct futex_test_variants tv; +int i; + + tv = futex_variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv.desc); +futex_supported_by_kernel (tv.fntype); + +if (tst_parse_int (str_numfutex, &numfutex,1 ,FUTEX_WAITV_MAX )) +tst_brk (TBROK ,"Invalid number of futexes '%s'" , str_numfutex);
testcases/kernel/syscalls/futex/futex_waitv01.c line 44
Quoted 10 lines
testcases/kernel/syscalls/futex/futex_waitv01.c new file +10
-0+ + futexes =SAFE_MALLOC (sizeof (uint32_t ) * numfutex); +memset (futexes,0 , numfutex); + + waitv =SAFE_MALLOC (sizeof (struct futex_waitv ) * numfutex); +for (i =0 ; i < numfutex; i++) { + waitv[i].uaddr = (uintptr_t )&futexes[i]; + waitv[i].flags =FUTEX_32 |FUTEX_PRIVATE_FLAG ; + waitv[i].val =0 ; + }
Can we allocate these data structures with the guarded buffers?
https://github.com/linux-test-project/ltp/wiki/C-Test-API#131-guarded-buffers
testcases/kernel/syscalls/futex/futex_waitv01.c line 56
Quoted 12 lines
testcases/kernel/syscalls/futex/futex_waitv01.c new file +12
-0+} + +static void cleanup (void ) +{ +free (futexes); +free (waitv); +} + +static void init_timeout (struct timespec *to) +{ +if (clock_gettime (CLOCK_MONOTONIC , to)) +tst_brk (TBROK ,"gettime64 failed" );
SAFE_CLOCK_GETTIME()
Quoted 49 lines
testcases/kernel/syscalls/futex/futex_waitv01.c new file +49
-0+ to->tv_sec++; +} + +static void run (void ) +{ +struct timespec to; +int res; + +/* Testing a waiter without FUTEX_32 flag */ + waitv[0 ].flags =FUTEX_PRIVATE_FLAG ; + +init_timeout (&to); + + res =tst_futex_waitv (waitv, numfutex,0 , &to,CLOCK_MONOTONIC ); +if (res ==EINVAL ) +tst_res (TFAIL ,"futex_waitv private returned: %d %s" , res,tst_strerrno (res)); +else +tst_res (TPASS ,"futex_waitv without FUTEX_32" ); + +/* Testing a waiter with an unaligned address */ + waitv[0 ].flags =FUTEX_PRIVATE_FLAG |FUTEX_32 ; + waitv[0 ].uaddr =1 ; + +init_timeout (&to); + + res =tst_futex_waitv (waitv, numfutex,0 , &to,CLOCK_MONOTONIC ); +if (res ==EINVAL ) +tst_res (TFAIL ,"futex_waitv private returned: %d %s" , res,tst_strerrno (res)); +else +tst_res (TPASS ,"futex_waitv with an unaligned address" ); + +/* Testing a NULL address for waiters.uaddr */ + waitv[0 ].uaddr =0x00000000 ; + +init_timeout (&to); + + res =tst_futex_waitv (waitv, numfutex,0 , &to,CLOCK_MONOTONIC ); +if (res ==EINVAL ) +tst_res (TFAIL ,"futex_waitv private returned: %d %s" , res,tst_strerrno (res)); +else +tst_res (TPASS ,"futex_waitv NULL address in waitv.uaddr" ); + +/* Testing a NULL address for *waiters */ +init_timeout (&to); + + res =tst_futex_waitv (NULL , numfutex,0 , &to,CLOCK_MONOTONIC ); +if (res ==EINVAL ) +tst_res (TFAIL ,"futex_waitv private returned: %d %s" , res,tst_strerrno (res)); +else
testcases/kernel/syscalls/futex/futex_waitv01.c line 116
Quoted 10 lines
testcases/kernel/syscalls/futex/futex_waitv01.c new file +10
-0+tst_res (TPASS ,"futex_waitv NULL address in *waiters" ); + +/* Testing an invalid clockid */ +init_timeout (&to); + + res =tst_futex_waitv (NULL , numfutex,0 , &to,CLOCK_TAI ); +if (res ==EINVAL ) +tst_res (TFAIL ,"futex_waitv private returned: %d %s" , res,tst_strerrno (res)); +else +tst_res (TPASS ,"futex_waitv invalid clockid" );
Can we put these testcases into a tcase structure as we usually do in tests?
testcases/kernel/syscalls/futex/futex_waitv01.c line 126
Quoted 10 lines
testcases/kernel/syscalls/futex/futex_waitv01.c new file +10
-0+} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .min_kver ="5.16" , + .test_variants =ARRAY_SIZE (futex_variants), + .options = (struct tst_option []){ + {"n:" , &str_numfutex,"Number of futex (default 30)" },
I'm not sure if it makes that much sense to add the number of futexes to this test.
Quoted 44 lines
testcases/kernel/syscalls/futex/futex_waitv01.c new file +3
-0+ {}, + }, +};testcases/kernel/syscalls/futex/futex_waitv02.c new file +35
-0@@ -0,0 +1,104 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2021 SUSE LLC Andrea Cervesato <[email protected]> +*/ + +/*\ +* [Description] +* +* This test verifies futex_waitv syscall using private data. +*/ + +#include <stdlib.h> +#include <time.h> +#include "tst_test.h" +#include "tst_safe_pthread.h" +#include "futextest.h" + +static char *str_numfutex; +static int numfutex =30 ; + +static uint32_t *futexes; +static struct futex_waitv *waitv; + +static void setup (void ) +{ +struct futex_test_variants tv; +int i; + + tv = futex_variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv.desc); +futex_supported_by_kernel (tv.fntype); + +if (tst_parse_int (str_numfutex, &numfutex,1 ,FUTEX_WAITV_MAX )) +tst_brk (TBROK ,"Invalid number of futexes '%s'" , str_numfutex);
testcases/kernel/syscalls/futex/futex_waitv02.c line 45
Quoted 10 lines
testcases/kernel/syscalls/futex/futex_waitv02.c new file +10
-0+ + futexes =SAFE_MALLOC (sizeof (uint32_t ) * numfutex); +memset (futexes,0 , numfutex); + + waitv =SAFE_MALLOC (sizeof (struct futex_waitv ) * numfutex); +for (i =0 ; i < numfutex; i++) { + waitv[i].uaddr = (uintptr_t )&futexes[i]; + waitv[i].flags =FUTEX_32 |FUTEX_PRIVATE_FLAG ; + waitv[i].val =0 ; + }
Here as well, guarded buffers please.
Quoted 124 lines
testcases/kernel/syscalls/futex/futex_waitv02.c new file +59
-0+} + +static void cleanup (void ) +{ +free (futexes); +free (waitv); +} + +static void *threaded (void *arg) +{ +struct futex_test_variants tv; +int ret, pid = *(int *)arg; + + tv = futex_variants[tst_variant]; + +TST_PROCESS_STATE_WAIT (pid,'S' ,0 ); + + ret =futex_wake (tv.fntype, (void *)(uintptr_t )waitv[numfutex -1 ].uaddr,1 ,FUTEX_PRIVATE_FLAG ); +if (ret <0 ) +tst_brk (TBROK ,"futex_wake private returned: %d %s" , ret,tst_strerrno (-ret)); + +return NULL ; +} + +static void run (void ) +{ +struct timespec to; +int ret, pid =getpid (); +pthread_t t; + +SAFE_PTHREAD_CREATE (&t,NULL , threaded, (void *)&pid); + +/* setting absolute timeout for futex2 */ +if (clock_gettime (CLOCK_MONOTONIC , &to)) +tst_brk (TBROK ,"gettime64 failed" ); + + to.tv_sec++; + + ret =tst_futex_waitv (waitv, numfutex,0 , &to,CLOCK_MONOTONIC ); +if (ret <0 ) +tst_brk (TBROK ,"futex_waitv returned: %d %s" , ret,tst_strerrno (-ret)); +else if (ret != numfutex -1 ) +tst_res (TFAIL ,"futex_waitv returned: %d, expecting %d" , ret, numfutex -1 ); + +SAFE_PTHREAD_JOIN (t,NULL ); +tst_res (TPASS ,"futex_waitv returned correctly" ); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .min_kver ="5.16" , + .test_variants =ARRAY_SIZE (futex_variants), + .options = (struct tst_option []){ + {"n:" , &str_numfutex,"Number of futex (default 30)" }, + {}, + }, +};testcases/kernel/syscalls/futex/futex_waitv03.c new file +59
-0@@ -0,0 +1,112 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2021 SUSE LLC Andrea Cervesato <[email protected]> +*/ + +/*\ +* [Description] +* +* This test verifies futex_waitv syscall using shared data. +*/ + +#include <stdlib.h> +#include <time.h> +#include <sys/shm.h> +#include "tst_test.h" +#include "tst_safe_pthread.h" +#include "futextest.h" + +static char *str_numfutex; +static int numfutex =30 ; + +static struct futex_waitv *waitv; + +static void setup (void ) +{ +struct futex_test_variants tv; +int shm_id; +int i; + + tv = futex_variants[tst_variant]; + +tst_res (TINFO ,"Testing variant: %s" , tv.desc); +futex_supported_by_kernel (tv.fntype); + +if (tst_parse_int (str_numfutex, &numfutex,1 ,FUTEX_WAITV_MAX )) +tst_brk (TBROK ,"Invalid number of futexes '%s'" , str_numfutex); + + waitv =SAFE_MALLOC (sizeof (struct futex_waitv ) * numfutex); +for (i =0 ; i < numfutex; i++) { + shm_id =shmget (IPC_PRIVATE ,4096 ,IPC_CREAT |0666 ); +if (shm_id <0 ) +tst_brk (TBROK ,"shmget" ); + +unsigned int *shared_data =shmat (shm_id,NULL ,0 ); + + waitv[i].uaddr = (uintptr_t )shared_data; + waitv[i].flags =FUTEX_32 ; + waitv[i].val =0 ; + } +} + +static void cleanup (void ) +{ +int i; + +for (i =0 ; i < numfutex; i++) +shmdt ((void *)(uintptr_t )waitv[i].uaddr); + +free (waitv);
testcases/kernel/syscalls/futex/futex_waitv03.c line 69
Quoted 10 lines
testcases/kernel/syscalls/futex/futex_waitv03.c new file +10
-0+} + +static void *threaded (void *arg) +{ +struct futex_test_variants tv; +int ret, pid = *(int *)arg; + + tv = futex_variants[tst_variant]; + +TST_PROCESS_STATE_WAIT (pid,'S' ,0 );
Hmm I guess that this works because the original thread that executes the run() function is the one whose status is exported in the /proc/$PID/stat file.
Technically there is no need to pass the pid like this since all threads would have the same pid. What they differ in is the tid (there is no difference in tid and pid from the kernel point of view though).
I guess that it would be cleaner though to add TST_THREAD_STATE_WAIT() that would look exactly the same as TST_PROCESS_STATE_WAIT() but would operate on the tid (see gettid()) and would open /proc/self/task/$TID/stat instead of /proc/$PID/stat. That way we could wait on any thread, not only the first one the program had started with.
Quoted 8 lines
testcases/kernel/syscalls/futex/futex_waitv03.c new file +8
-0+ ret =futex_wake (tv.fntype, (void *)(uintptr_t )waitv[numfutex -1 ].uaddr,1 ,0 ); +if (ret <0 ) +tst_brk (TBROK ,"futex_wake private returned: %d %s" , ret,tst_strerrno (-ret)); + +return NULL ; +} + +static void run (void )
testcases/kernel/syscalls/futex/futex_waitv03.c line 88
Quoted 10 lines
testcases/kernel/syscalls/futex/futex_waitv03.c new file +10
-0+{ +struct timespec to; +int ret, pid =getpid (); +pthread_t t; + +SAFE_PTHREAD_CREATE (&t,NULL , threaded, (void *)&pid); + +/* setting absolute timeout for futex2 */ +if (clock_gettime (CLOCK_MONOTONIC , &to)) +tst_brk (TBROK ,"gettime64 failed" );
SAFE_CLOCK_GETTIME()
Quoted 29 lines
testcases/kernel/syscalls/futex/futex_waitv03.c new file +23
-0+ to.tv_sec++; + + ret =tst_futex_waitv (waitv, numfutex,0 , &to,CLOCK_MONOTONIC ); +if (ret <0 ) +tst_brk (TBROK ,"futex_waitv returned: %d %s" , ret,tst_strerrno (-ret)); +else if (ret != numfutex -1 ) +tst_res (TFAIL ,"futex_waitv returned: %d, expecting %d" , ret, numfutex -1 ); + +SAFE_PTHREAD_JOIN (t,NULL ); +tst_res (TPASS ,"futex_waitv returned correctly" ); +} + +static struct tst_test test = { + .test_all = run, + .setup = setup, + .cleanup = cleanup, + .min_kver ="5.16" , + .test_variants =ARRAY_SIZE (futex_variants), + .options = (struct tst_option []){ + {"n:" , &str_numfutex,"Number of futex (default 30)" }, + {}, + }, +};Signature · 5 lines
2.34.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp