Commit 822b5bc6 authored by Vadim Fedorenko's avatar Vadim Fedorenko Committed by Jakub Kicinski
Browse files

net_tstamp: add SCM_TS_OPT_ID for RAW sockets 



The last type of sockets which supports SOF_TIMESTAMPING_OPT_ID is RAW
sockets. To add new option this patch converts all callers (direct and
indirect) of _sock_tx_timestamp to provide sockcm_cookie instead of
tsflags. And while here fix __sock_tx_timestamp to receive tsflags as
__u32 instead of __u16.

Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Reviewed-by: default avatarJason Xing <kerneljasonxing@gmail.com>
Signed-off-by: default avatarVadim Fedorenko <vadfed@meta.com>
Link: https://patch.msgid.link/20241001125716.2832769-3-vadfed@meta.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4aecca4c

include/net/sock.h

+18 −9
Original line number Diff line number Diff line
@@ -2660,39 +2660,48 @@ static inline void sock_recv_cmsgs(struct msghdr *msg, struct sock *sk, 
		sock_write_timestamp(sk, 0);

}



void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags);

void __sock_tx_timestamp(__u32 tsflags, __u8 *tx_flags);



/**

 * _sock_tx_timestamp - checks whether the outgoing packet is to be time stamped

 * @sk:		socket sending this packet

 * @tsflags:	timestamping flags to use

 * @sockc:	pointer to socket cmsg cookie to get timestamping info

 * @tx_flags:	completed with instructions for time stamping

 * @tskey:      filled in with next sk_tskey (not for TCP, which uses seqno)

 *

 * Note: callers should take care of initial ``*tx_flags`` value (usually 0)

 */

static inline void _sock_tx_timestamp(struct sock *sk, __u16 tsflags,

static inline void _sock_tx_timestamp(struct sock *sk,

				      const struct sockcm_cookie *sockc,

				      __u8 *tx_flags, __u32 *tskey)

{

	__u32 tsflags = sockc->tsflags;



	if (unlikely(tsflags)) {

		__sock_tx_timestamp(tsflags, tx_flags);

		if (tsflags & SOF_TIMESTAMPING_OPT_ID && tskey &&

		    tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK)

		    tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK) {

			if (tsflags & SOCKCM_FLAG_TS_OPT_ID)

				*tskey = sockc->ts_opt_id;

			else

				*tskey = atomic_inc_return(&sk->sk_tskey) - 1;

		}

	}

	if (unlikely(sock_flag(sk, SOCK_WIFI_STATUS)))

		*tx_flags |= SKBTX_WIFI_STATUS;

}



static inline void sock_tx_timestamp(struct sock *sk, __u16 tsflags,

static inline void sock_tx_timestamp(struct sock *sk,

				     const struct sockcm_cookie *sockc,

				     __u8 *tx_flags)

{

	_sock_tx_timestamp(sk, tsflags, tx_flags, NULL);

	_sock_tx_timestamp(sk, sockc, tx_flags, NULL);

}



static inline void skb_setup_tx_timestamp(struct sk_buff *skb, __u16 tsflags)

static inline void skb_setup_tx_timestamp(struct sk_buff *skb,

					  const struct sockcm_cookie *sockc)

{

	_sock_tx_timestamp(skb->sk, tsflags, &skb_shinfo(skb)->tx_flags,

	_sock_tx_timestamp(skb->sk, sockc, &skb_shinfo(skb)->tx_flags,

			   &skb_shinfo(skb)->tskey);

}

net/can/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) 
	skb->mark = READ_ONCE(sk->sk_mark);

	skb->tstamp = sockc.transmit_time;



	skb_setup_tx_timestamp(skb, sockc.tsflags);

	skb_setup_tx_timestamp(skb, &sockc);



	err = can_send(skb, ro->loopback);

net/ipv4/ip_output.c

+1 −1
Original line number Diff line number Diff line
@@ -1331,7 +1331,7 @@ static int ip_setup_cork(struct sock *sk, struct inet_cork *cork, 
	cork->priority = ipc->priority;

	cork->transmit_time = ipc->sockc.transmit_time;

	cork->tx_flags = 0;

	sock_tx_timestamp(sk, ipc->sockc.tsflags, &cork->tx_flags);

	sock_tx_timestamp(sk, &ipc->sockc, &cork->tx_flags);

	if (ipc->sockc.tsflags & SOCKCM_FLAG_TS_OPT_ID) {

		cork->flags |= IPCORK_TS_OPT_ID;

		cork->ts_opt_id = ipc->sockc.ts_opt_id;

net/ipv4/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, 


	skb->ip_summed = CHECKSUM_NONE;



	skb_setup_tx_timestamp(skb, sockc->tsflags);

	skb_setup_tx_timestamp(skb, sockc);



	if (flags & MSG_CONFIRM)

		skb_set_dst_pending_confirm(skb, 1);

net/ipv4/tcp.c

+4 −3
Original line number Diff line number Diff line
@@ -477,15 +477,16 @@ void tcp_init_sock(struct sock *sk) 
}

EXPORT_SYMBOL(tcp_init_sock);



static void tcp_tx_timestamp(struct sock *sk, u16 tsflags)

static void tcp_tx_timestamp(struct sock *sk, struct sockcm_cookie *sockc)

{

	struct sk_buff *skb = tcp_write_queue_tail(sk);

	u32 tsflags = sockc->tsflags;



	if (tsflags && skb) {

		struct skb_shared_info *shinfo = skb_shinfo(skb);

		struct tcp_skb_cb *tcb = TCP_SKB_CB(skb);



		sock_tx_timestamp(sk, tsflags, &shinfo->tx_flags);

		sock_tx_timestamp(sk, sockc, &shinfo->tx_flags);

		if (tsflags & SOF_TIMESTAMPING_TX_ACK)

			tcb->txstamp_ack = 1;

		if (tsflags & SOF_TIMESTAMPING_TX_RECORD_MASK)
@@ -1321,7 +1322,7 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size) 


out:

	if (copied) {

		tcp_tx_timestamp(sk, sockc.tsflags);

		tcp_tx_timestamp(sk, &sockc);

		tcp_push(sk, flags, mss_now, tp->nonagle, size_goal);

	}

out_nopush: