diff mbox series

[v3,1/2] support: Add support_socket_so_timestamp_time64

Message ID 20211213143643.1182659-2-adhemerval.zanella@linaro.org
State Committed
Commit a4cf12360fb7a8eae4fa4923763309b7f10797c3
Headers show
Series Fix 64-bit time_t ancillary socket conversion | expand

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Dec. 13, 2021, 2:36 p.m. UTC
Check if the socket support 64-bit network packages timestamps
(SO_TIMESTAMP and SO_TIMESTAMPNS).  This will be used on recvmsg
and recvmmsg tests to check if the timestamp should be generated.
---
 support/Makefile                             |  1 +
 support/support.h                            |  4 ++
 support/support_socket_so_timestamp_time64.c | 56 ++++++++++++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 support/support_socket_so_timestamp_time64.c

Comments

Florian Weimer Jan. 21, 2022, 12:16 p.m. UTC | #1
* Adhemerval Zanella:

> +bool
> +support_socket_so_timestamp_time64 (int fd)
> +{
> +#ifdef __linux__
> +# if __LINUX_KERNEL_VERSION >= 0x050100                          \
> +   || __WORDSIZE == 64                                           \
> +   || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64)
> +  return true;
> +# else
> +  int level = SOL_SOCKET;
> +  int optname = COMPAT_SO_TIMESTAMP_NEW;
> +  int optval;
> +  socklen_t len = sizeof (optval);
> +
> +  int r = syscall (__NR_getsockopt, fd, level, optname, &optval, &len);
> +#  ifdef __NR_socketcall
> +  if (r == -1 && errno == ENOSYS)
> +    {
> +      long int args[] = { fd, level, optname, (long int) &optval,
> +			  sizeof (optval) };
> +      r = syscall (__NR_socketcall, 15 /* SOCKOP_getsockopt  */ , args);
> +    }
> +#  endif
> +  return r != -1;
> +# endif
> +#else
> +  return false;
> +#endif
> +}

Is the socketcall fallback really required?  Why would anyone backport
time64 support without also backporting direct system call support?

Thanks,
Florian
Adhemerval Zanella Jan. 24, 2022, 11:45 a.m. UTC | #2
On 21/01/2022 09:16, Florian Weimer wrote:
> * Adhemerval Zanella:
> 
>> +bool
>> +support_socket_so_timestamp_time64 (int fd)
>> +{
>> +#ifdef __linux__
>> +# if __LINUX_KERNEL_VERSION >= 0x050100                          \
>> +   || __WORDSIZE == 64                                           \
>> +   || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64)
>> +  return true;
>> +# else
>> +  int level = SOL_SOCKET;
>> +  int optname = COMPAT_SO_TIMESTAMP_NEW;
>> +  int optval;
>> +  socklen_t len = sizeof (optval);
>> +
>> +  int r = syscall (__NR_getsockopt, fd, level, optname, &optval, &len);
>> +#  ifdef __NR_socketcall
>> +  if (r == -1 && errno == ENOSYS)
>> +    {
>> +      long int args[] = { fd, level, optname, (long int) &optval,
>> +			  sizeof (optval) };
>> +      r = syscall (__NR_socketcall, 15 /* SOCKOP_getsockopt  */ , args);
>> +    }
>> +#  endif
>> +  return r != -1;
>> +# endif
>> +#else
>> +  return false;
>> +#endif
>> +}
> 
> Is the socketcall fallback really required?  Why would anyone backport
> time64 support without also backporting direct system call support?
> 

It does not make sense indeed, all supported architecture already support 
direct socket syscall with a kernel with 64 bit time_t support (v5.1.).
I will remove it.
diff mbox series

Patch

diff --git a/support/Makefile b/support/Makefile
index 984ec02dfe..073eb7bb4b 100644
--- a/support/Makefile
+++ b/support/Makefile
@@ -80,6 +80,7 @@  libsupport-routines = \
   support_set_small_thread_stack_size \
   support_shared_allocate \
   support_small_stack_thread_attribute \
+  support_socket_so_timestamp_time64 \
   support_stat_nanoseconds \
   support_subprocess \
   support_test_compare_blob \
diff --git a/support/support.h b/support/support.h
index 10a4a36848..28b1cbb304 100644
--- a/support/support.h
+++ b/support/support.h
@@ -183,6 +183,10 @@  extern bool support_select_modifies_timeout (void);
    tv_usec larger than 1000000.  */
 extern bool support_select_normalizes_timeout (void);
 
+/* Return true if socket FD supports 64-bit timestamps with the SOL_SOCKET
+   and SO_TIMESTAMP/SO_TIMESTAMPNS.  */
+extern bool support_socket_so_timestamp_time64 (int fd);
+
 /* Create a timer that trigger after SEC seconds and NSEC nanoseconds.  If
    REPEAT is true the timer will repeat indefinitely.  If CALLBACK is not
    NULL, the function will be called when the timer expires; otherwise a
diff --git a/support/support_socket_so_timestamp_time64.c b/support/support_socket_so_timestamp_time64.c
new file mode 100644
index 0000000000..eb8f8ef0cc
--- /dev/null
+++ b/support/support_socket_so_timestamp_time64.c
@@ -0,0 +1,56 @@ 
+/* Return whether socket supports 64-bit timestamps.
+   Copyright (C) 2021 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
+
+#include <errno.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/socket.h>
+#include <support/support.h>
+#ifdef __linux__
+# include <socket-constants-time64.h>
+#endif
+
+bool
+support_socket_so_timestamp_time64 (int fd)
+{
+#ifdef __linux__
+# if __LINUX_KERNEL_VERSION >= 0x050100                          \
+   || __WORDSIZE == 64                                           \
+   || (defined __SYSCALL_WORDSIZE && __SYSCALL_WORDSIZE == 64)
+  return true;
+# else
+  int level = SOL_SOCKET;
+  int optname = COMPAT_SO_TIMESTAMP_NEW;
+  int optval;
+  socklen_t len = sizeof (optval);
+
+  int r = syscall (__NR_getsockopt, fd, level, optname, &optval, &len);
+#  ifdef __NR_socketcall
+  if (r == -1 && errno == ENOSYS)
+    {
+      long int args[] = { fd, level, optname, (long int) &optval,
+			  sizeof (optval) };
+      r = syscall (__NR_socketcall, 15 /* SOCKOP_getsockopt  */ , args);
+    }
+#  endif
+  return r != -1;
+# endif
+#else
+  return false;
+#endif
+}