syscalls: epoll_pwait01: Work around a race
PATCH 1/1 syscalls: epoll_pwait01: Work around a race
There was a race that would manifest on slower machines.
The call to epoll_pwait() could time out before the child has chance to run, and that would cause the signal to be sent to the parent when it was already sleeping in wait().
Ideally the whole test should be rewritten into new library and fixed properly, however as we are just before a release this is an attempt for a minimal fix.
The logic in the test is changed so that:
- epoll_wait() sleeps indefinitely
- the child:
- waits for the parent to get asleep
- sends the signal
- sleeps
- writes to the pipe
This causes the child to actually run, while the parent is blocked in the epoll_wait(), which greatly increases the changes of the signal arriving at the right time.
--- testcases/kernel/syscalls/epoll_pwait/epoll_pwait01.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
testcases/kernel/syscalls/epoll_pwait/epoll_pwait01.c +8 -3
@@ -121,8 +121,8 @@ static void verify_sigmask(void)return ; } -if (TEST_RETURN !=0 ) { -tst_resm (TFAIL ,"epoll_pwait() returned %li, expected 0" , +if (TEST_RETURN !=1 ) { +tst_resm (TFAIL ,"epoll_pwait() returned %li, expected 1" ,TEST_RETURN );return ; }
@@ -153,6 +153,7 @@ static void sighandler(int sig LTP_ATTRIBUTE_UNUSED)static void do_test (sigset_t *sigmask) {pid_t cpid; +char b; cpid =tst_fork ();if (cpid <0 )
@@ -161,13 +162,15 @@ static void do_test(sigset_t *sigmask)if (cpid ==0 )do_child (); -TEST (epoll_pwait (epfd, &epevs,1 ,100 , sigmask)); +TEST (epoll_pwait (epfd, &epevs,1 ,-1 , sigmask));if (sigmask !=NULL )verify_sigmask ();else verify_nonsigmask (); +SAFE_READ (cleanup,1 , fds[0 ], &b,1 ); +tst_record_childstatus (cleanup, cpid); }
@@ -179,6 +182,8 @@ static void do_child(void) }SAFE_KILL (cleanup,getppid (),SIGUSR1 ); +usleep (10000 ); +SAFE_WRITE (cleanup,1 , fds[1 ],"w" ,1 );cleanup ();tst_exit ();
Signature · 1 line
2.26.2
PATCH 1/1 syscalls: epoll_pwait01: Work around a race
Hi Cyril,
Quoted 19 lines
There was a race that would manifest on slower machines.
The call to
epoll_pwait()could time out before the child has chance to run, and that would cause the signal to be sent to the parent when it was already sleeping inwait().Ideally the whole test should be rewritten into new library and fixed properly, however as we are just before a release this is an attempt for a minimal fix.
The logic in the test is changed so that:
-
epoll_wait()sleeps indefinitely
- the child:
- waits for the parent to get asleep
- sends the signal
- sleeps
- writes to the pipe
Quoted 3 lines
This causes the child to actually run, while the parent is blocked in the
epoll_wait(), which greatly increases the changes of the signal arriving at the right time.
LGTM.
Quoted 1 line
Fixes #765
Kind regards,
Petr
PATCH 1/1 syscalls: epoll_pwait01: Work around a race
In reply to Cyril HrubisQuoted 19 lines · Cyril Hrubis
There was a race that would manifest on slower machines.
The call to
epoll_pwait()could time out before the child has chance to run, and that would cause the signal to be sent to the parent when it was already sleeping inwait().Ideally the whole test should be rewritten into new library and fixed properly, however as we are just before a release this is an attempt for a minimal fix.
The logic in the test is changed so that:
-
epoll_wait()sleeps indefinitely
- the child:
- waits for the parent to get asleep
- sends the signal
- sleeps
- writes to the pipe
Quoted 8 lines
This causes the child to actually run, while the parent is blocked in the
epoll_wait(), which greatly increases the changes of the signal arriving at the right time.Fixes #765Signed-off-by Cyril Hrubis <[email protected]>
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210113/13811696/attachment-0001.htm>