diff mbox series

[RFC,14/14] linux: Add recvvmsg fallback for 64-bit time_t SO_TIMESTAMP{NS}

Message ID 20200908145738.640039-14-adhemerval.zanella@linaro.org
State Superseded
Headers
Series [v2,01/14] linux: Simplify clock_getres |

Commit Message

Adhemerval Zanella Sept. 8, 2020, 2:57 p.m. UTC 
  Handle the SO_TIMESTAMP{NS} similar to recvmsg: for
!__ASSUME_TIME64_SYSCALLS it converts the first 32-bit time SO_TIMESTAMP
or SO_TIMESTAMPNS and appends it to the control buffer if has extra
space or returns MSG_CTRUNC otherwise.  The 32-bit time field is kept
as-is.

Also for !__ASSUME_TIME64_SYSCALLS it limits the maximum number of
'struct mmsghdr *' to IOV_MAX (and also increases the stack size
requirement to IOV_MAX times sizeof (socklen_t)).  The Linux imposes
a similar limit to sendmmsg, so bound the array size on recvmmsg is not
unreasonable.  And this will be used only on older when building with
32-bit time support.

Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
kernel).
---
 include/sys/socket.h               |  3 +++
 sysdeps/unix/sysv/linux/recvmmsg.c | 17 +++++++++++++++--
 sysdeps/unix/sysv/linux/recvmsg.c  |  6 +++---
 3 files changed, 21 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/include/sys/socket.h b/include/sys/socket.h
index c551c8fa87..171440ab14 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -171,6 +171,9 @@  libc_hidden_proto (__libc_sa_len)
 #define SCM_TIMESTAMPNS_NEW   SO_TIMESTAMPNS_NEW
 #define SCM_TIMESTAMPING_NEW  SO_TIMESTAMPING_NEW
 
+extern void __convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize)
+  attribute_hidden;
+
 libc_hidden_proto (__cmsg_nxthdr)
 
 #endif
diff --git a/sysdeps/unix/sysv/linux/recvmmsg.c b/sysdeps/unix/sysv/linux/recvmmsg.c
index a29c91fb76..0f67e2dcac 100644
--- a/sysdeps/unix/sysv/linux/recvmmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmmsg.c
@@ -44,13 +44,26 @@  __recvmmsg64 (int fd, struct mmsghdr *vmessages, unsigned int vlen, int flags,
       ts32 = valid_timespec64_to_timespec (*timeout);
       pts32 = &ts32;
     }
+
+  socklen_t csize[IOV_MAX];
+  if (vlen > IOV_MAX)
+    vlen = IOV_MAX;
+  for (int i = 0; i < vlen; i++)
+    csize[i] = vmessages[i].msg_hdr.msg_controllen;
+
 # ifdef __ASSUME_RECVMMSG_SYSCALL
   r = SYSCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32);
 # else
   r = SOCKETCALL_CANCEL (recvmmsg, fd, vmessages, vlen, flags, pts32);
 # endif
-  if (r >= 0 && timeout != NULL)
-    *timeout = valid_timespec_to_timespec64 (ts32);
+  if (r >= 0)
+    {
+      if (timeout != NULL)
+        *timeout = valid_timespec_to_timespec64 (ts32);
+
+      for (int i=0; i < r; i++)
+        __convert_scm_timestamps (&vmessages[i].msg_hdr, csize[i]);
+    }
 #endif /* __ASSUME_TIME64_SYSCALLS  */
   return r;
 }
diff --git a/sysdeps/unix/sysv/linux/recvmsg.c b/sysdeps/unix/sysv/linux/recvmsg.c
index c6d1d10b05..510ed04ea5 100644
--- a/sysdeps/unix/sysv/linux/recvmsg.c
+++ b/sysdeps/unix/sysv/linux/recvmsg.c
@@ -32,8 +32,8 @@ 
    original message as a spurious control ones of unknown typ while running
    on kernel with native 64-bit time support will only see the time64 version
    of the control message.  */
-static void
-convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize)
+void
+__convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize)
 {
   if (msg->msg_control == NULL || msg->msg_controllen == 0)
     return;
@@ -108,7 +108,7 @@  __libc_recvmsg (int fd, struct msghdr *msg, int flags)
 
 #ifndef __ASSUME_TIME64_SYSCALLS
   if (r >= 0)
-    convert_scm_timestamps (msg, orig_controllen);
+    __convert_scm_timestamps (msg, orig_controllen);
 #endif
 
   return r;