Commit 11878b40 authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

net-timestamp: SOCK_RAW and PING timestamping 

Add SO_TIMESTAMPING to sockets of type PF_INET[6]/SOCK_RAW:

Add the necessary sock_tx_timestamp calls to the datapath for RAW
sockets (ping sockets already had these calls).

Fix the IP output path to pass the timestamp flags on the first
fragment also for these sockets. The existing code relies on
transhdrlen != 0 to indicate a first fragment. For these sockets,
that assumption does not hold.

This fixes http://bugzilla.kernel.org/show_bug.cgi?id=77221



Tested SOCK_RAW on IPv4 and IPv6, not PING.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5c1c936

net/ipv4/ip_output.c

+3 −4
Original line number Diff line number Diff line
@@ -962,10 +962,6 @@ alloc_new_skb: 
							   sk->sk_allocation);

				if (unlikely(skb == NULL))

					err = -ENOBUFS;

				else

					/* only the initial fragment is

					   time stamped */

					cork->tx_flags = 0;

			}

			if (skb == NULL)

				goto error;
@@ -976,7 +972,10 @@ alloc_new_skb: 
			skb->ip_summed = csummode;

			skb->csum = 0;

			skb_reserve(skb, hh_len);



			/* only the initial fragment is time stamped */

			skb_shinfo(skb)->tx_flags = cork->tx_flags;

			cork->tx_flags = 0;



			/*

			 *	Find where to start putting bytes.

net/ipv4/raw.c

+4 −0
Original line number Diff line number Diff line
@@ -365,6 +365,8 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, 


	skb->ip_summed = CHECKSUM_NONE;



	sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);



	skb->transport_header = skb->network_header;

	err = -EFAULT;

	if (memcpy_fromiovecend((void *)iph, from, 0, length))
@@ -606,6 +608,8 @@ back_from_confirm: 
				      &rt, msg->msg_flags);



	 else {

		sock_tx_timestamp(sk, &ipc.tx_flags);



		if (!ipc.addr)

			ipc.addr = fl4.daddr;

		lock_sock(sk);

net/ipv6/ip6_output.c

+4 −9
Original line number Diff line number Diff line
@@ -1271,7 +1271,7 @@ emsgsize: 
	}



	/* For UDP, check if TX timestamp is enabled */

	if (sk->sk_type == SOCK_DGRAM)

	if (sk->sk_type == SOCK_DGRAM || sk->sk_type == SOCK_RAW)

		sock_tx_timestamp(sk, &tx_flags);



	/*
@@ -1380,12 +1380,6 @@ alloc_new_skb: 
							   sk->sk_allocation);

				if (unlikely(skb == NULL))

					err = -ENOBUFS;

				else {

					/* Only the initial fragment

					 * is time stamped.

					 */

					tx_flags = 0;

				}

			}

			if (skb == NULL)

				goto error;
@@ -1399,8 +1393,9 @@ alloc_new_skb: 
			skb_reserve(skb, hh_len + sizeof(struct frag_hdr) +

				    dst_exthdrlen);



			if (sk->sk_type == SOCK_DGRAM)

			/* Only the initial fragment is time stamped */

			skb_shinfo(skb)->tx_flags = tx_flags;

			tx_flags = 0;



			/*

			 *	Find where to start putting bytes

CRA Git | Maintained and supported by SUSTech CRA and CCSE