Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9718475e authored by Deepa Dinamani's avatar Deepa Dinamani Committed by David S. Miller
Browse files

socket: Add SO_TIMESTAMPING_NEW 



Add SO_TIMESTAMPING_NEW variant of socket timestamp options.
This is the y2038 safe versions of the SO_TIMESTAMPING_OLD
for all architectures.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Cc: chris@zankel.net
Cc: fenghua.yu@intel.com
Cc: rth@twiddle.net
Cc: tglx@linutronix.de
Cc: ubraun@linux.ibm.com
Cc: linux-alpha@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-s390@vger.kernel.org
Cc: linux-xtensa@linux-xtensa.org
Cc: sparclinux@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 887feae3

arch/alpha/include/uapi/asm/socket.h

+3 −2
Original line number Diff line number Diff line
@@ -117,19 +117,20 @@ 


#define SO_TIMESTAMP_NEW        63

#define SO_TIMESTAMPNS_NEW      64

#define SO_TIMESTAMPING_NEW     65



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)

#endif



#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING

arch/mips/include/uapi/asm/socket.h

+3 −2
Original line number Diff line number Diff line
@@ -128,19 +128,20 @@ 


#define SO_TIMESTAMP_NEW        63

#define SO_TIMESTAMPNS_NEW      64

#define SO_TIMESTAMPING_NEW     65



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)

#endif



#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING

arch/parisc/include/uapi/asm/socket.h

+3 −2
Original line number Diff line number Diff line
@@ -109,19 +109,20 @@ 


#define SO_TIMESTAMP_NEW        0x4038

#define SO_TIMESTAMPNS_NEW      0x4039

#define SO_TIMESTAMPING_NEW     0x403A



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)

#endif



#define SO_TIMESTAMPING         SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP           SO_TIMESTAMP

#define SCM_TIMESTAMPNS         SO_TIMESTAMPNS

#define SCM_TIMESTAMPING        SO_TIMESTAMPING

arch/sparc/include/uapi/asm/socket.h

+3 −2
Original line number Diff line number Diff line
@@ -110,19 +110,20 @@ 


#define SO_TIMESTAMP_NEW         0x0041

#define SO_TIMESTAMPNS_NEW       0x0042

#define SO_TIMESTAMPING_NEW      0x0043



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

#define SO_TIMESTAMP		SO_TIMESTAMP_OLD

#define SO_TIMESTAMPNS		SO_TIMESTAMPNS_OLD

#define SO_TIMESTAMPING		SO_TIMESTAMPING_OLD

#else

#define SO_TIMESTAMP (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMP_OLD : SO_TIMESTAMP_NEW)

#define SO_TIMESTAMPNS (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPNS_OLD : SO_TIMESTAMPNS_NEW)

#define SO_TIMESTAMPING (sizeof(time_t) == sizeof(__kernel_long_t) ? SO_TIMESTAMPING_OLD : SO_TIMESTAMPING_NEW)

#endif



#define SO_TIMESTAMPING        SO_TIMESTAMPING_OLD



#define SCM_TIMESTAMP          SO_TIMESTAMP

#define SCM_TIMESTAMPNS        SO_TIMESTAMPNS

#define SCM_TIMESTAMPING       SO_TIMESTAMPING

include/linux/socket.h

+8 −0
Original line number Diff line number Diff line
@@ -349,9 +349,17 @@ struct ucred { 
extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_storage *kaddr);

extern int put_cmsg(struct msghdr*, int level, int type, int len, void *data);



struct timespec64;

struct __kernel_timespec;

struct old_timespec32;



struct scm_timestamping_internal {

	struct timespec64 ts[3];

};



extern void put_cmsg_scm_timestamping64(struct msghdr *msg, struct scm_timestamping_internal *tss);

extern void put_cmsg_scm_timestamping(struct msghdr *msg, struct scm_timestamping_internal *tss);



/* The __sys_...msg variants allow MSG_CMSG_COMPAT iff

 * forbid_cmsg_compat==false

 */