[v2] nptl: Fix tst-cancel30 on kernels without ppoll_time64 support

Message ID 877cgt8tge.fsf@oldenburg.str.redhat.com
State Committed
Commit f4724843ada64a51d66f65d3199fe431f9d4c254
Headers
Series [v2] nptl: Fix tst-cancel30 on kernels without ppoll_time64 support |

Checks

Context Check Description
redhat-pt-bot/TryBot-apply_patch success Patch applied to master at the time it was sent
redhat-pt-bot/TryBot-32bit success Build for i686
linaro-tcwg-bot/tcwg_glibc_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-arm success Testing passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 success Testing passed

Commit Message

Florian Weimer April 19, 2024, 11:47 a.m. UTC
  Fall back to ppoll if ppoll_time64 fails with ENOSYS.
Fixes commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25 ("nptl: Fix
tst-cancel30 on sparc64").

---
v2: Fix build failure on 32-bit RISC-V.
 sysdeps/pthread/tst-cancel30.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)


base-commit: 0997c3d0c87433ac8c78043aaa9b6b7e91df2882
  

Comments

Adhemerval Zanella April 23, 2024, 7:03 p.m. UTC | #1
On 19/04/24 08:47, Florian Weimer wrote:
> Fall back to ppoll if ppoll_time64 fails with ENOSYS.
> Fixes commit 370da8a121c3ba9eeb2f13da15fc0f21f4136b25 ("nptl: Fix
> tst-cancel30 on sparc64").

LGTM, thanks.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>

> 
> ---
> v2: Fix build failure on 32-bit RISC-V.
>  sysdeps/pthread/tst-cancel30.c | 15 +++++++++++----
>  1 file changed, 11 insertions(+), 4 deletions(-)
> 
> diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c
> index 3030660e5f..94ad6281bc 100644
> --- a/sysdeps/pthread/tst-cancel30.c
> +++ b/sysdeps/pthread/tst-cancel30.c
> @@ -18,6 +18,7 @@
>     License along with the GNU C Library; if not, see
>     <https://www.gnu.org/licenses/>.  */
>  
> +#include <errno.h>
>  #include <support/check.h>
>  #include <support/xstdio.h>
>  #include <support/xthread.h>
> @@ -46,13 +47,19 @@ tf (void *arg)
>  
>    /* Wait indefinitely for cancellation, which only works if asynchronous
>       cancellation is enabled.  */
> -#if defined SYS_ppoll || defined SYS_ppoll_time64
> -# ifndef SYS_ppoll_time64
> -#  define SYS_ppoll_time64 SYS_ppoll
> +#ifdef SYS_ppoll_time64
> +  long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
> +  (void) ret;
> +# ifdef SYS_ppoll
> +  if (ret == -1 && errno == ENOSYS)
> +    syscall (SYS_ppoll, NULL, 0, NULL, NULL);
>  # endif
> -  syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
>  #else
> +# ifdef SYS_ppoll
> +  syscall (SYS_ppoll, NULL, 0, NULL, NULL);
> +# else
>    for (;;);
> +# endif
>  #endif
>  
>    return 0;
> 
> base-commit: 0997c3d0c87433ac8c78043aaa9b6b7e91df2882
>
  

Patch

diff --git a/sysdeps/pthread/tst-cancel30.c b/sysdeps/pthread/tst-cancel30.c
index 3030660e5f..94ad6281bc 100644
--- a/sysdeps/pthread/tst-cancel30.c
+++ b/sysdeps/pthread/tst-cancel30.c
@@ -18,6 +18,7 @@ 
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+#include <errno.h>
 #include <support/check.h>
 #include <support/xstdio.h>
 #include <support/xthread.h>
@@ -46,13 +47,19 @@  tf (void *arg)
 
   /* Wait indefinitely for cancellation, which only works if asynchronous
      cancellation is enabled.  */
-#if defined SYS_ppoll || defined SYS_ppoll_time64
-# ifndef SYS_ppoll_time64
-#  define SYS_ppoll_time64 SYS_ppoll
+#ifdef SYS_ppoll_time64
+  long int ret = syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
+  (void) ret;
+# ifdef SYS_ppoll
+  if (ret == -1 && errno == ENOSYS)
+    syscall (SYS_ppoll, NULL, 0, NULL, NULL);
 # endif
-  syscall (SYS_ppoll_time64, NULL, 0, NULL, NULL);
 #else
+# ifdef SYS_ppoll
+  syscall (SYS_ppoll, NULL, 0, NULL, NULL);
+# else
   for (;;);
+# endif
 #endif
 
   return 0;