nptl: handle EAGAIN with some futex operations

https://bugs.gentoo.org/452184

diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
index 0867b065331ffaefce8d6def60101de7175a2b51..f10ca582e2aa170bd036e7bb4225cd472a700758 100644 (file)
--- a/nptl/pthread_mutex_trylock.c
+++ b/nptl/pthread_mutex_trylock.c
@@ -261,7 +261,8 @@ __pthread_mutex_trylock (mutex)
                                                          private), 0, 0);
 
            if (INTERNAL_SYSCALL_ERROR_P (e, __err)
-               && INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK)
+               && ((INTERNAL_SYSCALL_ERRNO (e, __err) == EWOULDBLOCK)
+                   || (INTERNAL_SYSCALL_ERRNO (e, __err) == EAGAIN)))
              {
                THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
 

diff --git a/nptl/sem_timedwait.c b/nptl/sem_timedwait.c
index 7dfe51dd8bea871a81c4aa353563e6d19f5d7b5e..f96f6251e214845a0aafa2f4775a46d8e8141a24 100644 (file)
--- a/nptl/sem_timedwait.c
+++ b/nptl/sem_timedwait.c
@@ -94,7 +94,7 @@ sem_timedwait (sem_t *sem, const struct timespec *abstime)
       rt.tv_sec = sec;
       rt.tv_nsec = nsec;
       err = do_futex_timed_wait(isem, &rt);
-      if (err != 0 && err != -EWOULDBLOCK)
+      if (err != 0 && err != -EWOULDBLOCK && err != -EAGAIN)
        {
          __set_errno (-err);
          err = -1;

diff --git a/nptl/sem_wait.c b/nptl/sem_wait.c
index b12babb5961209c189ba5a5a8e686c2a39290b08..4b9856c846949b60b3a9499bd656dfff7105fcee 100644 (file)
--- a/nptl/sem_wait.c
+++ b/nptl/sem_wait.c
@@ -68,7 +68,7 @@ __new_sem_wait (sem_t *sem)
   while (1)
     {
       err = do_futex_wait(isem);
-      if (err != 0 && err != -EWOULDBLOCK)
+      if (err != 0 && err != -EWOULDBLOCK && err != -EAGAIN)
        {
          __set_errno (-err);
          err = -1;
@@ -113,7 +113,7 @@ __old_sem_wait (sem_t *sem)
       /* Disable asynchronous cancellation.  */
       __pthread_disable_asynccancel (oldtype);
     }
-  while (err == 0 || err == -EWOULDBLOCK);
+  while (err == 0 || err == -EWOULDBLOCK || err == -EAGAIN);
 
   __set_errno (-err);
   return -1;

diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
index 6ffa5f259009f44914767b1677085450d4b9d7cc..b6638bb8e8a53843ac8c60ec998e5d1b741043de 100644 (file)
--- a/sunrpc/clnt_udp.c
+++ b/sunrpc/clnt_udp.c
@@ -463,7 +463,7 @@ send_again:
       while (inlen < 0 && errno == EINTR);
       if (inlen < 0)
        {
-         if (errno == EWOULDBLOCK)
+         if (errno == EWOULDBLOCK || errno == EAGAIN)
            continue;
          cu->cu_error.re_errno = errno;
          return (cu->cu_error.re_status = RPC_CANTRECV);

diff --git a/sysdeps/nptl/aio_misc.h b/sysdeps/nptl/aio_misc.h
index c3de84b1ace0d45e553eab7c8b60f9351364893c..a419ee041f3469d220788b1ec329ef1d38d2cf2e 100644 (file)
--- a/sysdeps/nptl/aio_misc.h
+++ b/sysdeps/nptl/aio_misc.h
@@ -50,7 +50,7 @@
          {                                                                   \
            status = lll_futex_timed_wait (futexaddr, oldval, timeout,        \
                                           LLL_PRIVATE);                      \
-           if (status != -EWOULDBLOCK)                                       \
+           if (status != -EWOULDBLOCK && status != -EAGAIN)                  \
              break;                                                          \
                                                                              \
            oldval = *futexaddr;                                              \
@@ -65,7 +65,7 @@
        else if (status == -ETIMEDOUT)                                        \
          result = EAGAIN;                                                    \
        else                                                                  \
-         assert (status == 0 || status == -EWOULDBLOCK);                     \
+         assert (status == 0 || status == -EWOULDBLOCK || status == -EAGAIN);\
                                                                              \
        pthread_mutex_lock (&__aio_requests_mutex);                           \
       }                                                                              \

diff --git a/sysdeps/nptl/gai_misc.h b/sysdeps/nptl/gai_misc.h
index 942f2b1b7e9f5824ce0cd2edf9a7235137bb4eba..fc66256e300a42907e1b41e75a228067df001e14 100644 (file)
--- a/sysdeps/nptl/gai_misc.h
+++ b/sysdeps/nptl/gai_misc.h
@@ -51,7 +51,7 @@
          {                                                                   \
            status = lll_futex_timed_wait (futexaddr, oldval, timeout,        \
                                           LLL_PRIVATE);                      \
-           if (status != -EWOULDBLOCK)                                       \
+           if (status != -EWOULDBLOCK && status != -EAGAIN)                  \
              break;                                                          \
                                                                              \
            oldval = *futexaddr;                                              \
@@ -66,7 +66,7 @@
        else if (status == -ETIMEDOUT)                                        \
          result = EAGAIN;                                                    \
        else                                                                  \
-         assert (status == 0 || status == -EWOULDBLOCK);                     \
+         assert (status == 0 || status == -EWOULDBLOCK || status == -EAGAIN);\
                                                                              \
        pthread_mutex_lock (&__gai_requests_mutex);                           \
       }                                                                              \