[permalink] [raw]

Subject: Re: [PATCH v3 6/8] socket: Add SO_TIMESTAMP[NS]_NEW

On Mon, Jan 7, 2019 at 10:29 PM Deepa Dinamani <[email protected]> wrote:
>
> Add SO_TIMESTAMP_NEW and SO_TIMESTAMPNS_NEW variants of
> socket timestamp options.
> These are the y2038 safe versions of the SO_TIMESTAMP_OLD
> and SO_TIMESTAMPNS_OLD for all architectures.
>
> Note that the format of scm_timestamping.ts[0] is not changed
> in this patch.
>
> Signed-off-by: Deepa Dinamani <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]

> diff --git a/arch/alpha/include/uapi/asm/socket.h b/arch/alpha/include/uapi/asm/socket.h
> index 00e45c80e574..352e3dc0b3d9 100644
> --- a/arch/alpha/include/uapi/asm/socket.h
> +++ b/arch/alpha/include/uapi/asm/socket.h
> @@ -3,6 +3,7 @@
> #define _UAPI_ASM_SOCKET_H
>
> #include <asm/sockios.h>
> +#include <asm/bitsperlong.h>
>
> /* For setsockopt(2) */
> /*
> @@ -110,12 +111,22 @@
>
> #define SO_TIMESTAMP_OLD 29
> #define SO_TIMESTAMPNS_OLD 35
> +

nit: unnecessary whitespace line

> @@ -1864,20 +1864,39 @@ static void tcp_update_recv_tstamps(struct sk_buff *skb,
> static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,
> struct scm_timestamping *tss)
> {
> - struct __kernel_old_timeval tv;
> bool has_timestamping = false;
> + int new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW);
>
> if (tss->ts[0].tv_sec || tss->ts[0].tv_nsec) {
> if (sock_flag(sk, SOCK_RCVTSTAMP)) {
> if (sock_flag(sk, SOCK_RCVTSTAMPNS)) {
> - put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_OLD,
> - sizeof(tss->ts[0]), &tss->ts[0]);
> - } else {
> - tv.tv_sec = tss->ts[0].tv_sec;
> - tv.tv_usec = tss->ts[0].tv_nsec / 1000;
> + if (new_tstamp) {
> + struct __kernel_timespec kts = {tss->ts[0].tv_sec, tss->ts[0].tv_nsec};
> +
> + put_cmsg(msg, SOL_SOCKET, SO_TIMESTAMPNS_NEW,
> + sizeof(kts), &kts);
> + } else {
> + struct timespec ts_old = tss->ts[0];

nit: intermediate variable not needed as tss->ts[0] is also of type
struct timespec.

2019-01-08 14:59:36

by Willem de Bruijn

[permalink] [raw]

Subject: Re: [PATCH v3 0/8] net: y2038-safe socket timestamps

On Tue, Jan 8, 2019 at 8:37 AM Willem de Bruijn
<[email protected]> wrote:
>
> On Mon, Jan 7, 2019 at 10:29 PM Deepa Dinamani <[email protected]> wrote:
> >
> > The series introduces new socket timestamps that are
> > y2038 safe.
> >
> > The time data types used for the existing socket timestamp
> > options: SO_TIMESTAMP, SO_TIMESTAMPNS and SO_TIMESTAMPING
> > are not y2038 safe. The series introduces SO_TIMESTAMP_NEW,
> > SO_TIMESTAMPNS_NEW and SO_TIMESTAMPING_NEW to replace these.
> > These new timestamps can be used on all architectures.
> >
> > The alternative considered was to extend the sys_setsockopt()
> > by using the flags. We did not receive any strong opinions about
> > either of the approaches. Hence, this was chosen, as glibc folks
> > preferred this.
> >
> > The series does not deal with updating the internal kernel socket
> > calls like rxrpc to make them y2038 safe. This will be dealt
> > with separately.
> >
> > Note that the timestamps behavior already does not match the
> > man page specific behavior:
> > SIOCGSTAMP
> > This ioctl should only be used if the socket option SO_TIMESTAMP
> > is not set on the socket. Otherwise, it returns the timestamp of
> > the last packet that was received while SO_TIMESTAMP was not set,
> > or it fails if no such packet has been received,
> > (i.e., ioctl(2) returns -1 with errno set to ENOENT).
> >
> > The recommendation is to update the man page to remove the above statement.
> >
> > The overview of the series is as below:
> > 1. Delete asm specific socket.h when possible.
> > 2. Support SO/SCM_TIMESTAMP* options only in userspace.
> > 3. Rename current SO/SCM_TIMESTAMP* to SO/SCM_TIMESTAMP*_OLD.
> > 3. Alter socket options so that SOCK_RCVTSTAMPNS does
> > not rely on SOCK_RCVTSTAMP.
> > 4. Introduce y2038 safe types for socket timestamp.
> > 5. Introduce new y2038 safe socket options SO/SCM_TIMESTAMP*_NEW.
> >
> > Changes since v2:
> > * Removed extra functions to reduce diff churn as per code review
>
> Thanks, Deepa. This set looks great to me.
>
> One issue, it does not apply cleanly to current davem-net-next/master
> for me. A conflict on patch 7. It does apply cleanly on davem-net
> master. Please rebase and also send with [PATCH net-next].

to be clear, with the version, so this will be [PATCH net-next v4].

2019-01-08 21:50:54

by David Miller

[permalink] [raw]

Subject: Re: [PATCH v3 0/8] net: y2038-safe socket timestamps

From: Deepa Dinamani <[email protected]>
Date: Mon, 7 Jan 2019 19:26:49 -0800

> The series introduces new socket timestamps that are
> y2038 safe.

Great discussion, but this is definitely net-next material and the net-next
tree is not open at this time.