| Message ID | 20190108032657.8331-1-deepa.kernel@gmail.com |
|---|---|
| Headers | show |
| Series | net: y2038-safe socket timestamps | expand |
On Mon, Jan 7, 2019 at 10:29 PM Deepa Dinamani <deepa.kernel@gmail.com> 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]. Perhaps also run the selftests in tools/testing/selftests/networking/timestamping/txtimestamp.sh, just to be sure. Since you have a to resend anyway, a few minor nits inline, as well.
On Tue, Jan 8, 2019 at 8:37 AM Willem de Bruijn <willemdebruijn.kernel@gmail.com> wrote: > > On Mon, Jan 7, 2019 at 10:29 PM Deepa Dinamani <deepa.kernel@gmail.com> 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].
From: Deepa Dinamani <deepa.kernel@gmail.com> 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.
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 Changes since v1: * Dropped the change to disentangle sock flags * Renamed sock_timeval to __kernel_sock_timeval * Updated a few comments * Added documentation changes Deepa Dinamani (8): arch: Use asm-generic/socket.h when possible sockopt: Rename SO_TIMESTAMP* to SO_TIMESTAMP*_OLD arch: sparc: Override struct __kernel_old_timeval socket: Use old_timeval types for socket timestamps socket: Add struct __kernel_sock_timeval socket: Add SO_TIMESTAMP[NS]_NEW socket: Add SO_TIMESTAMPING_NEW socket: Update timestamping Documentation Documentation/networking/timestamping.txt | 43 +++++++- arch/alpha/include/uapi/asm/socket.h | 35 +++++-- arch/ia64/include/uapi/asm/Kbuild | 1 + arch/ia64/include/uapi/asm/socket.h | 120 --------------------- arch/mips/include/uapi/asm/socket.h | 34 ++++-- arch/parisc/include/uapi/asm/socket.h | 34 ++++-- arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/socket.h | 117 --------------------- arch/sparc/include/uapi/asm/posix_types.h | 10 ++ arch/sparc/include/uapi/asm/socket.h | 36 +++++-- arch/x86/include/uapi/asm/Kbuild | 1 + arch/x86/include/uapi/asm/socket.h | 1 - arch/xtensa/include/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/Kbuild | 1 + arch/xtensa/include/uapi/asm/socket.h | 122 ---------------------- drivers/isdn/mISDN/socket.c | 2 +- include/linux/skbuff.h | 24 ++++- include/linux/socket.h | 8 ++ include/net/sock.h | 1 + include/uapi/asm-generic/socket.h | 35 +++++-- include/uapi/linux/errqueue.h | 4 + include/uapi/linux/time.h | 7 ++ net/bluetooth/hci_sock.c | 4 +- net/compat.c | 14 +-- net/core/scm.c | 27 +++++ net/core/sock.c | 43 ++++++-- net/ipv4/tcp.c | 61 +++++++---- net/rds/af_rds.c | 10 +- net/rds/recv.c | 18 +++- net/rxrpc/local_object.c | 2 +- net/smc/af_smc.c | 3 +- net/socket.c | 50 ++++++--- 32 files changed, 404 insertions(+), 466 deletions(-) delete mode 100644 arch/ia64/include/uapi/asm/socket.h delete mode 100644 arch/s390/include/uapi/asm/socket.h delete mode 100644 arch/x86/include/uapi/asm/socket.h delete mode 100644 arch/xtensa/include/uapi/asm/socket.h base-commit: a4983672f9ca4c8393f26b6b80710e6c78886b8c