From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by sourceware.org (Postfix) with ESMTPS id 9937B3857C48 for ; Wed, 19 May 2021 08:50:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9937B3857C48 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lukma@denx.de Received: from ktm (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 44A8382CEA; Wed, 19 May 2021 10:50:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1621414217; bh=KMhEmX49WJck9kgADBqUuFR9zQ+su2/E9/HztCU2TZQ=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=Dd67D2d6fBIpssvN/uTF3qVCgmYfKRxuGcDydw2Qld9TQzJkJnbeI8Az88x+yMKrD qK7abR+m8bvS4Fvq8BCvH7kDWXD2Pdtl+CO7ZTuoaW/EC+QIJkE6bsR/eCXeeU+HAx sqd9EUrA5+b9GFBjRYHO12Th1WOsD3NAqhdq4c/K5YRS9pIlUFTZmdGvP+rh+mWmps gVLFC8OlWzk1PYg4WODQruz1PjcCjkjYfVim8clqNOEQoxm3OLzCrBK6dEfKpHwIzC iUtGJ+q+gUJP6ES9kiNq3cOLYlNNFFQHzOP0oF37toEBqYgRY4l6W2UAYvzL/M5T1N ZRCnW/j7mxONg== Date: Wed, 19 May 2021 10:50:10 +0200 From: Lukasz Majewski To: Adhemerval Zanella Cc: libc-alpha@sourceware.org, Carlos O'Donell Subject: Re: [PATCH v2 06/25] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Message-ID: <20210519105010.1fa51224@ktm> In-Reply-To: <20210518205613.1487824-7-adhemerval.zanella@linaro.org> References: <20210518205613.1487824-1-adhemerval.zanella@linaro.org> <20210518205613.1487824-7-adhemerval.zanella@linaro.org> Organization: denx.de X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; boundary="Sig_//.PK1iSIbHh2cowsaYAyWSc"; protocol="application/pgp-signature" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 May 2021 08:50:21 -0000 --Sig_//.PK1iSIbHh2cowsaYAyWSc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable On Tue, 18 May 2021 17:55:54 -0300 Adhemerval Zanella wrote: > The recvmsg handling is more complicated because it requires check the > returned kernel control message and make some convertions. 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. >=20 > Calls with __TIMESIZE=3D32 will see the converted 64-bit time control > messages as spurious control message of unknown type. Calls with > __TIMESIZE=3D64 running on pre-time64 kernels will see the 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. >=20 Reviewed-by: Lukasz Majewski > Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 > kernel). > --- > include/sys/socket.h | 5 + > sysdeps/unix/sysv/linux/Makefile | 2 +- > sysdeps/unix/sysv/linux/Versions | 1 + > .../unix/sysv/linux/convert_scm_timestamps.c | 96 > +++++++++++++++++++ sysdeps/unix/sysv/linux/getsockopt.c | > 12 +++ .../sysv/linux/hppa/socket-constants-time64.h | 5 + > .../sysv/linux/mips/socket-constants-time64.h | 5 + > .../linux/powerpc/socket-constants-time64.h | 5 + > sysdeps/unix/sysv/linux/recvmsg.c | 23 +++-- > sysdeps/unix/sysv/linux/setsockopt.c | 12 +++ > .../unix/sysv/linux/socket-constants-time64.h | 5 + > .../linux/sparc/socket-constants-time64.h | 5 + > 12 files changed, 169 insertions(+), 7 deletions(-) > create mode 100644 sysdeps/unix/sysv/linux/convert_scm_timestamps.c >=20 > diff --git a/include/sys/socket.h b/include/sys/socket.h > index 0e39dd2a3a..15d4a62b26 100644 > --- a/include/sys/socket.h > +++ b/include/sys/socket.h > @@ -164,5 +164,10 @@ libc_hidden_proto (__libc_sa_len) > =20 > libc_hidden_proto (__cmsg_nxthdr) > =20 > +#ifndef __ASSUME_TIME64_SYSCALLS > +extern void __convert_scm_timestamps (struct msghdr *msg, socklen_t > msgsize) ; +libc_hidden_proto (__convert_scm_timestamps) > +#endif > + > #endif > #endif > diff --git a/sysdeps/unix/sysv/linux/Makefile > b/sysdeps/unix/sysv/linux/Makefile index fb155cf856..e28f6470e3 100644 > --- a/sysdeps/unix/sysv/linux/Makefile > +++ b/sysdeps/unix/sysv/linux/Makefile > @@ -64,7 +64,7 @@ sysdep_routines +=3D adjtimex clone umount umount2 > readahead sysctl \ time64-support pselect32 \ > xstat fxstat lxstat xstat64 fxstat64 lxstat64 \ > fxstatat fxstatat64 \ > - xmknod xmknodat > + xmknod xmknodat convert_scm_timestamps > =20 > CFLAGS-gethostid.c =3D -fexceptions > CFLAGS-tee.c =3D -fexceptions -fasynchronous-unwind-tables > diff --git a/sysdeps/unix/sysv/linux/Versions > b/sysdeps/unix/sysv/linux/Versions index 220bb2dffe..148f04c50a 100644 > --- a/sysdeps/unix/sysv/linux/Versions > +++ b/sysdeps/unix/sysv/linux/Versions > @@ -177,6 +177,7 @@ libc { > __pread64_nocancel; > __close_nocancel; > __sigtimedwait; > + __convert_scm_timestamps; > # functions used by nscd > __netlink_assert_response; > } > diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c > b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c new file mode > 100644 index 0000000000..3c123c28ce > --- /dev/null > +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c > @@ -0,0 +1,96 @@ > +/* Socket timestamp conversion routines. > + 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 > + . */ > + > +#include > + > +#ifndef __ASSUME_TIME64_SYSCALLS > +# include > +# include > +# include > +# include > + > +/* It converts the first SO_TIMESTAMP or SO_TIMESTAMPNS with 32-bit > time and > + appends it to the control buffer. The 32-bit time field is kept > as-is. + > + Calls with __TIMESIZE=3D32 will see the converted 64-bit time > control > + messages as spurious control message of unknown type. > + > + Calls with __TIMESIZE=3D64 running on pre-time64 kernels will see > the > + 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. */ > +void > +__convert_scm_timestamps (struct msghdr *msg, socklen_t msgsize) > +{ > + if (msg->msg_control =3D=3D NULL || msg->msg_controllen =3D=3D 0) > + return; > + > + /* The returned control message format for SO_TIMESTAMP_NEW is a > + 'struct __kernel_sock_timeval' while for SO_TIMESTAMPNS_NEW is a > + 'struct __kernel_timespec'. In either case it is two uint64_t > + members. */ > + uint64_t tvts[2]; > + > + struct cmsghdr *cmsg, *last =3D NULL; > + int type =3D 0; > + > + for (cmsg =3D CMSG_FIRSTHDR (msg); > + cmsg !=3D NULL; > + cmsg =3D CMSG_NXTHDR (msg, cmsg)) > + { > + if (cmsg->cmsg_level !=3D SOL_SOCKET) > + continue; > + > + switch (cmsg->cmsg_type) > + { > + case COMPAT_SO_TIMESTAMP_OLD: > + if (type !=3D 0) > + break; > + type =3D COMPAT_SO_TIMESTAMP_NEW; > + goto common; > + > + case COMPAT_SO_TIMESTAMPNS_OLD: > + type =3D COMPAT_SO_TIMESTAMPNS_NEW; > + > + /* fallthrough */ > + common: > + memcpy (tvts, CMSG_DATA (cmsg), sizeof (tvts)); > + break; > + } > + > + last =3D cmsg; > + } > + > + if (last =3D=3D NULL || type =3D=3D 0) > + return; > + > + if (CMSG_SPACE (sizeof tvts) > msgsize - msg->msg_controllen) > + { > + msg->msg_flags |=3D MSG_CTRUNC; > + return; > + } > + > + msg->msg_controllen +=3D CMSG_SPACE (sizeof tvts); > + cmsg =3D CMSG_NXTHDR(msg, last); > + cmsg->cmsg_level =3D SOL_SOCKET; > + cmsg->cmsg_type =3D type; > + cmsg->cmsg_len =3D CMSG_LEN (sizeof tvts); > + memcpy (CMSG_DATA (cmsg), tvts, sizeof tvts); > +} > +libc_hidden_def (__convert_scm_timestamps) > +#endif > diff --git a/sysdeps/unix/sysv/linux/getsockopt.c > b/sysdeps/unix/sysv/linux/getsockopt.c index c8e502d976..14b782d0da > 100644 --- a/sysdeps/unix/sysv/linux/getsockopt.c > +++ b/sysdeps/unix/sysv/linux/getsockopt.c > @@ -67,6 +67,18 @@ getsockopt32 (int fd, int level, int optname, void > *optval, *tv64 =3D valid_timeval32_to_timeval64 (tv32); > *len =3D sizeof (*tv64); > } > + break; > + > + case COMPAT_SO_TIMESTAMP_NEW: > + case COMPAT_SO_TIMESTAMPNS_NEW: > + { > + if (optname =3D=3D COMPAT_SO_TIMESTAMP_NEW) > + optname =3D COMPAT_SO_TIMESTAMP_OLD; > + if (optname =3D=3D COMPAT_SO_TIMESTAMPNS_NEW) > + optname =3D COMPAT_SO_TIMESTAMPNS_OLD; > + r =3D getsockopt_syscall (fd, level, optname, optval, len); > + } > + break; > } > =20 > return r; > diff --git a/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h > b/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h index > ea721e0fc2..f3b98012d5 100644 --- > a/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h +++ > b/sysdeps/unix/sysv/linux/hppa/socket-constants-time64.h @@ -27,4 > +27,9 @@ #define COMPAT_SO_RCVTIMEO_NEW 16448 > #define COMPAT_SO_SNDTIMEO_NEW 16449 > =20 > +#define COMPAT_SO_TIMESTAMP_OLD 0x4012 > +#define COMPAT_SO_TIMESTAMPNS_OLD 0x4013 > +#define COMPAT_SO_TIMESTAMP_NEW 0x4038 > +#define COMPAT_SO_TIMESTAMPNS_NEW 0x4039 > + > #endif > diff --git a/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h > b/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h index > ab8bd62853..31fa69fa9f 100644 --- > a/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h +++ > b/sysdeps/unix/sysv/linux/mips/socket-constants-time64.h @@ -27,4 > +27,9 @@ #define COMPAT_SO_RCVTIMEO_NEW 66 > #define COMPAT_SO_SNDTIMEO_NEW 67 > =20 > +#define COMPAT_SO_TIMESTAMP_OLD 29 > +#define COMPAT_SO_TIMESTAMPNS_OLD 35 > +#define COMPAT_SO_TIMESTAMP_NEW 63 > +#define COMPAT_SO_TIMESTAMPNS_NEW 64 > + > #endif > diff --git > a/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h > b/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h index > 1e48dcca8d..889251895b 100644 --- > a/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h +++ > b/sysdeps/unix/sysv/linux/powerpc/socket-constants-time64.h @@ -27,4 > +27,9 @@ #define COMPAT_SO_RCVTIMEO_NEW 66 #define > COMPAT_SO_SNDTIMEO_NEW 67=20 > +#define COMPAT_SO_TIMESTAMP_OLD 29 > +#define COMPAT_SO_TIMESTAMPNS_OLD 35 > +#define COMPAT_SO_TIMESTAMP_NEW 63 > +#define COMPAT_SO_TIMESTAMPNS_NEW 64 > + > #endif > diff --git a/sysdeps/unix/sysv/linux/recvmsg.c > b/sysdeps/unix/sysv/linux/recvmsg.c index b209b4ad99..a2a600228b > 100644 --- a/sysdeps/unix/sysv/linux/recvmsg.c > +++ b/sysdeps/unix/sysv/linux/recvmsg.c > @@ -19,16 +19,27 @@ > #include > #include > #include > -#include > =20 > ssize_t > __libc_recvmsg (int fd, struct msghdr *msg, int flags) > { > -# ifdef __ASSUME_RECVMSG_SYSCALL > - return SYSCALL_CANCEL (recvmsg, fd, msg, flags); > -# else > - return SOCKETCALL_CANCEL (recvmsg, fd, msg, flags); > -# endif > + ssize_t r; > +#ifndef __ASSUME_TIME64_SYSCALLS > + socklen_t orig_controllen =3D msg->msg_controllen; > +#endif > + > +#ifdef __ASSUME_RECVMSG_SYSCALL > + r =3D SYSCALL_CANCEL (recvmsg, fd, msg, flags); > +#else > + r =3D SOCKETCALL_CANCEL (recvmsg, fd, msg, flags); > +#endif > + > +#ifndef __ASSUME_TIME64_SYSCALLS > + if (r >=3D 0) > + __convert_scm_timestamps (msg, orig_controllen); > +#endif > + > + return r; > } > weak_alias (__libc_recvmsg, recvmsg) > weak_alias (__libc_recvmsg, __recvmsg) > diff --git a/sysdeps/unix/sysv/linux/setsockopt.c > b/sysdeps/unix/sysv/linux/setsockopt.c index 6505202265..a4780a9d33 > 100644 --- a/sysdeps/unix/sysv/linux/setsockopt.c > +++ b/sysdeps/unix/sysv/linux/setsockopt.c > @@ -69,6 +69,18 @@ setsockopt32 (int fd, int level, int optname, > const void *optval,=20 > r =3D setsockopt_syscall (fd, level, optname, &tv32, sizeof > (tv32)); } > + break; > + > + case COMPAT_SO_TIMESTAMP_NEW: > + case COMPAT_SO_TIMESTAMPNS_NEW: > + { > + if (optname =3D=3D COMPAT_SO_TIMESTAMP_NEW) > + optname =3D COMPAT_SO_TIMESTAMP_OLD; > + if (optname =3D=3D COMPAT_SO_TIMESTAMPNS_NEW) > + optname =3D COMPAT_SO_TIMESTAMPNS_OLD; > + r =3D setsockopt_syscall (fd, level, optname, NULL, 0); > + } > + break; > } > =20 > return r; > diff --git a/sysdeps/unix/sysv/linux/socket-constants-time64.h > b/sysdeps/unix/sysv/linux/socket-constants-time64.h index > e5a3777f28..7f7ca05504 100644 --- > a/sysdeps/unix/sysv/linux/socket-constants-time64.h +++ > b/sysdeps/unix/sysv/linux/socket-constants-time64.h @@ -27,4 +27,9 @@ > #define COMPAT_SO_RCVTIMEO_NEW 66 > #define COMPAT_SO_SNDTIMEO_NEW 67 > =20 > +#define COMPAT_SO_TIMESTAMP_OLD 29 > +#define COMPAT_SO_TIMESTAMPNS_OLD 35 > +#define COMPAT_SO_TIMESTAMP_NEW 63 > +#define COMPAT_SO_TIMESTAMPNS_NEW 64 > + > #endif > diff --git a/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h > b/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h index > b137abdeea..56358923e1 100644 --- > a/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h +++ > b/sysdeps/unix/sysv/linux/sparc/socket-constants-time64.h @@ -27,4 > +27,9 @@ #define COMPAT_SO_RCVTIMEO_NEW 68 > #define COMPAT_SO_SNDTIMEO_NEW 69 > =20 > +#define COMPAT_SO_TIMESTAMP_OLD 0x001d > +#define COMPAT_SO_TIMESTAMPNS_OLD 0x0021 > +#define COMPAT_SO_TIMESTAMP_NEW 0x0046 > +#define COMPAT_SO_TIMESTAMPNS_NEW 0x0042 > + > #endif Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de --Sig_//.PK1iSIbHh2cowsaYAyWSc Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEgAyFJ+N6uu6+XupJAR8vZIA0zr0FAmCk0UIACgkQAR8vZIA0 zr0XmggA1jNo+c0p/2q5Ks7dfhHw1I7rlcPcfqssKry2Fmt1EQQ1M8A1IzNu7nKU 8JViw70ZtRIXwfYvafJKRY4iSetr5qSgkragK95J6y4mlIhu/4XD9iiXcgDbSBcU wE2eQID8MSau+e88Ys0Rgfp/Hng+XYTFOVoNm/xyYQJa00FWF20a9k8WKguwAV0/ XMlV/wdOxm0e7aXu+R3h4Ty33SpJttcGzAMUiPYWcmCDqNwlVDWmCNftkRiP1g1g Pc29TujsHYiqagOtG7hJkDD0xlt5lnYJ11Kbu6sXFCJXoL3obq+G6uX5tsDsAzDR RJaFYI3C7wYP4cgAjZeZ4ZDtxDdKDA== =4z0S -----END PGP SIGNATURE----- --Sig_//.PK1iSIbHh2cowsaYAyWSc--