selftests/futex: Order calls in futex_requeue
PATCH RESEND 1/1 selftests/futex: Order calls in futex_requeue
Similar to fbf4dec70277 ("selftests/futex: Order calls to futex_lock_pi"), which fixed a flake in futex_lock_pi due to racing between the parent and child threads.
The same issue can occur in the futex_requeue test, because it expects waiterfn to make progress to futex_wait before the parent starts to requeue. This is mitigated by the parent sleeping for WAKE_WAIT_US, but it still fails occasionally. This can be reproduced by adding a sleep in the waiterfn before futex_wait:
TAP version 13
1..2
not ok 1 futex_requeue simple returned: 0
not ok 2 futex_requeue simple returned: 0
not ok 3 futex_requeue many returned: 0
not ok 4 futex_requeue many returned: 0
Instead, replace the sleep with barriers to make the sequencing explicit.
--- .../selftests/futex/functional/futex_requeue.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
tools/testing/selftests/futex/functional/futex_requeue.c +9 -3
@@ -12,9 +12,9 @@#define TEST_NAME "futex-requeue"#define timeout_ns 30000000 -#define WAKE_WAIT_US 10000volatile futex_t *f1; +static pthread_barrier_t barrier;void usage (char *prog) {
@@ -32,6 +32,8 @@ void *waiterfn(void *arg) to.tv_sec =0 ; to.tv_nsec = timeout_ns; +pthread_barrier_wait (&barrier); +if (futex_wait (f1, *f1, &to,0 ))printf ("waiter failed errno %d\n" , errno);
@@ -70,13 +72,15 @@ int main(int argc, char *argv[])ksft_print_msg ("%s: Test futex_requeue\n" ,basename (argv[0 ])); +pthread_barrier_init (&barrier,NULL ,2 );/* * Requeue a waiter from f1 to f2, and wake f2. */ if (pthread_create (&waiter[0 ],NULL , waiterfn,NULL ))error ("pthread_create failed\n" , errno); -usleep (WAKE_WAIT_US ); +pthread_barrier_wait (&barrier); +pthread_barrier_destroy (&barrier);info ("Requeuing 1 futex from f1 to f2\n" ); res =futex_cmp_requeue (f1,0 , &f2,0 ,1 ,0 );
@@ -99,6 +103,7 @@ int main(int argc, char *argv[])ksft_test_result_pass ("futex_requeue simple succeeds\n" ); } +pthread_barrier_init (&barrier,NULL ,11 );/* * Create 10 waiters at f1. At futex_requeue, wake 3 and requeue 7.
@@ -109,7 +114,8 @@ int main(int argc, char *argv[])error ("pthread_create failed\n" , errno); } -usleep (WAKE_WAIT_US ); +pthread_barrier_wait (&barrier); +pthread_barrier_destroy (&barrier);info ("Waking 3 futexes at f1 and requeuing 7 futexes from f1 to f2\n" ); res =futex_cmp_requeue (f1,0 , &f2,3 ,7 ,0 );
Signature · 1 line
2.46.0.469.g59c65b2a67-goog
Hi Edward,
Thanks for your patch!
Em 03/09/2024 17:39, Edward Liaw escreveu:
Quoted 17 lines
Similar to
fbf4dec70277("selftests/futex: Order calls tofutex_lock_pi"), which fixed a flake infutex_lock_pidue to racing between the parent and child threads.The same issue can occur in the
futex_requeuetest, because it expects waiterfn to make progress tofutex_waitbefore the parent starts to requeue. This is mitigated by the parent sleeping forWAKE_WAIT_US, but it still fails occasionally. This can be reproduced by adding a sleep in the waiterfn beforefutex_wait:TAP version 13
1..2
not ok 1futex_requeuesimple returned: 0
not ok 2futex_requeuesimple returned: 0
not ok 3futex_requeuemany returned: 0
not ok 4futex_requeuemany returned: 0
Quoted 3 lines
Instead, replace the sleep with barriers to make the sequencing explicit.