Commit d15fd735 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mptcp-timestamps' 



Mat Martineau says:

====================
mptcp: Add timestamp support

Enable the SO_TIMESTAMP and SO_TIMESTAMPING socket options for MPTCP
sockets and add receive path cmsg support for timestamps.

Patches 1, 2, and 5 expose existing sock and tcp helpers for timestamps
(no new EXPORT_SYMBOLS()s).

Patch 3 propagates timestamp options to subflows.

Patch 4 cleans up MPTCP handling of SOL_SOCKET options.

Patch 6 adds timestamp csmg data when receiving on sockets that have
been configured for timestamps.

Patch 7 adds self test coverage for timestamps.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ebbf5fcb 5e6af0a7

include/net/sock.h

+3 −0
Original line number Diff line number Diff line
@@ -2743,6 +2743,9 @@ static inline bool sk_dev_equal_l3scope(struct sock *sk, int dif) 
void sock_def_readable(struct sock *sk);



int sock_bindtoindex(struct sock *sk, int ifindex, bool lock_sk);

void sock_set_timestamp(struct sock *sk, int optname, bool valbool);

int sock_set_timestamping(struct sock *sk, int optname, int val);



void sock_enable_timestamps(struct sock *sk);

void sock_no_linger(struct sock *sk);

void sock_set_keepalive(struct sock *sk);

include/net/tcp.h

+4 −0
Original line number Diff line number Diff line
@@ -412,6 +412,10 @@ int tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int nonblock, 
		int flags, int *addr_len);

int tcp_set_rcvlowat(struct sock *sk, int val);

int tcp_set_window_clamp(struct sock *sk, int val);

void tcp_update_recv_tstamps(struct sk_buff *skb,

			     struct scm_timestamping_internal *tss);

void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,

			struct scm_timestamping_internal *tss);

void tcp_data_ready(struct sock *sk);

#ifdef CONFIG_MMU

int tcp_mmap(struct file *file, struct socket *sock,

net/core/sock.c

+55 −42
Original line number Diff line number Diff line
@@ -776,6 +776,58 @@ void sock_enable_timestamps(struct sock *sk) 
}

EXPORT_SYMBOL(sock_enable_timestamps);



void sock_set_timestamp(struct sock *sk, int optname, bool valbool)

{

	switch (optname) {

	case SO_TIMESTAMP_OLD:

		__sock_set_timestamps(sk, valbool, false, false);

		break;

	case SO_TIMESTAMP_NEW:

		__sock_set_timestamps(sk, valbool, true, false);

		break;

	case SO_TIMESTAMPNS_OLD:

		__sock_set_timestamps(sk, valbool, false, true);

		break;

	case SO_TIMESTAMPNS_NEW:

		__sock_set_timestamps(sk, valbool, true, true);

		break;

	}

}



int sock_set_timestamping(struct sock *sk, int optname, int val)

{

	if (val & ~SOF_TIMESTAMPING_MASK)

		return -EINVAL;



	if (val & SOF_TIMESTAMPING_OPT_ID &&

	    !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {

		if (sk->sk_protocol == IPPROTO_TCP &&

		    sk->sk_type == SOCK_STREAM) {

			if ((1 << sk->sk_state) &

			    (TCPF_CLOSE | TCPF_LISTEN))

				return -EINVAL;

			sk->sk_tskey = tcp_sk(sk)->snd_una;

		} else {

			sk->sk_tskey = 0;

		}

	}



	if (val & SOF_TIMESTAMPING_OPT_STATS &&

	    !(val & SOF_TIMESTAMPING_OPT_TSONLY))

		return -EINVAL;



	sk->sk_tsflags = val;

	sock_valbool_flag(sk, SOCK_TSTAMP_NEW, optname == SO_TIMESTAMPING_NEW);



	if (val & SOF_TIMESTAMPING_RX_SOFTWARE)

		sock_enable_timestamp(sk,

				      SOCK_TIMESTAMPING_RX_SOFTWARE);

	else

		sock_disable_timestamp(sk,

				       (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE));

	return 0;

}



void sock_set_keepalive(struct sock *sk)

{

	lock_sock(sk);
@@ -989,54 +1041,15 @@ int sock_setsockopt(struct socket *sock, int level, int optname, 
		break;



	case SO_TIMESTAMP_OLD:

		__sock_set_timestamps(sk, valbool, false, false);

		break;

	case SO_TIMESTAMP_NEW:

		__sock_set_timestamps(sk, valbool, true, false);

		break;

	case SO_TIMESTAMPNS_OLD:

		__sock_set_timestamps(sk, valbool, false, true);

		break;

	case SO_TIMESTAMPNS_NEW:

		__sock_set_timestamps(sk, valbool, true, true);

		sock_set_timestamp(sk, valbool, optname);

		break;



	case SO_TIMESTAMPING_NEW:

	case SO_TIMESTAMPING_OLD:

		if (val & ~SOF_TIMESTAMPING_MASK) {

			ret = -EINVAL;

			break;

		}



		if (val & SOF_TIMESTAMPING_OPT_ID &&

		    !(sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID)) {

			if (sk->sk_protocol == IPPROTO_TCP &&

			    sk->sk_type == SOCK_STREAM) {

				if ((1 << sk->sk_state) &

				    (TCPF_CLOSE | TCPF_LISTEN)) {

					ret = -EINVAL;

					break;

				}

				sk->sk_tskey = tcp_sk(sk)->snd_una;

			} else {

				sk->sk_tskey = 0;

			}

		}



		if (val & SOF_TIMESTAMPING_OPT_STATS &&

		    !(val & SOF_TIMESTAMPING_OPT_TSONLY)) {

			ret = -EINVAL;

			break;

		}



		sk->sk_tsflags = val;

		sock_valbool_flag(sk, SOCK_TSTAMP_NEW, optname == SO_TIMESTAMPING_NEW);



		if (val & SOF_TIMESTAMPING_RX_SOFTWARE)

			sock_enable_timestamp(sk,

					      SOCK_TIMESTAMPING_RX_SOFTWARE);

		else

			sock_disable_timestamp(sk,

					       (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE));

		ret = sock_set_timestamping(sk, optname, val);

		break;



	case SO_RCVLOWAT:

net/ipv4/tcp.c

+4 −6
Original line number Diff line number Diff line
@@ -1738,7 +1738,7 @@ int tcp_set_rcvlowat(struct sock *sk, int val) 
}

EXPORT_SYMBOL(tcp_set_rcvlowat);



static void tcp_update_recv_tstamps(struct sk_buff *skb,

void tcp_update_recv_tstamps(struct sk_buff *skb,

			     struct scm_timestamping_internal *tss)

{

	if (skb->tstamp)
@@ -2024,8 +2024,6 @@ static int tcp_zerocopy_vm_insert_batch(struct vm_area_struct *vma, 
}



#define TCP_VALID_ZC_MSG_FLAGS   (TCP_CMSG_TS)

static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,

			       struct scm_timestamping_internal *tss);

static void tcp_zc_finalize_rx_tstamp(struct sock *sk,

				      struct tcp_zerocopy_receive *zc,

				      struct scm_timestamping_internal *tss)
@@ -2197,7 +2195,7 @@ static int tcp_zerocopy_receive(struct sock *sk, 
#endif



/* Similar to __sock_recv_timestamp, but does not require an skb */

static void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,

void tcp_recv_timestamp(struct msghdr *msg, const struct sock *sk,

			struct scm_timestamping_internal *tss)

{

	int new_tstamp = sock_flag(sk, SOCK_TSTAMP_NEW);

net/mptcp/protocol.c

+25 −3
Original line number Diff line number Diff line
@@ -39,10 +39,15 @@ struct mptcp_skb_cb { 
	u64 map_seq;

	u64 end_seq;

	u32 offset;

	u8  has_rxtstamp:1;

};



#define MPTCP_SKB_CB(__skb)	((struct mptcp_skb_cb *)&((__skb)->cb[0]))



enum {

	MPTCP_CMSG_TS = BIT(0),

};



static struct percpu_counter mptcp_sockets_allocated;



static void __mptcp_destroy_sock(struct sock *sk);
@@ -272,6 +277,7 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, 
	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);

	struct sock *sk = (struct sock *)msk;

	struct sk_buff *tail;

	bool has_rxtstamp;



	__skb_unlink(skb, &ssk->sk_receive_queue);
@@ -287,6 +293,8 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, 
			goto drop;

	}



	has_rxtstamp = TCP_SKB_CB(skb)->has_rxtstamp;



	/* the skb map_seq accounts for the skb offset:

	 * mptcp_subflow_get_mapped_dsn() is based on the current tp->copied_seq

	 * value
@@ -294,6 +302,7 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, 
	MPTCP_SKB_CB(skb)->map_seq = mptcp_subflow_get_mapped_dsn(subflow);

	MPTCP_SKB_CB(skb)->end_seq = MPTCP_SKB_CB(skb)->map_seq + copy_len;

	MPTCP_SKB_CB(skb)->offset = offset;

	MPTCP_SKB_CB(skb)->has_rxtstamp = has_rxtstamp;



	if (MPTCP_SKB_CB(skb)->map_seq == msk->ack_seq) {

		/* in sequence */
@@ -1757,7 +1766,9 @@ static void mptcp_wait_data(struct sock *sk, long *timeo) 


static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,

				struct msghdr *msg,

				size_t len, int flags)

				size_t len, int flags,

				struct scm_timestamping_internal *tss,

				int *cmsg_flags)

{

	struct sk_buff *skb, *tmp;

	int copied = 0;
@@ -1777,6 +1788,11 @@ static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk, 
			}

		}



		if (MPTCP_SKB_CB(skb)->has_rxtstamp) {

			tcp_update_recv_tstamps(skb, tss);

			*cmsg_flags |= MPTCP_CMSG_TS;

		}



		copied += count;



		if (count < data_len) {
@@ -1964,7 +1980,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
			 int nonblock, int flags, int *addr_len)

{

	struct mptcp_sock *msk = mptcp_sk(sk);

	int copied = 0;

	struct scm_timestamping_internal tss;

	int copied = 0, cmsg_flags = 0;

	int target;

	long timeo;
@@ -1986,7 +2003,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
	while (copied < len) {

		int bytes_read;



		bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied, flags);

		bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied, flags, &tss, &cmsg_flags);

		if (unlikely(bytes_read < 0)) {

			if (!copied)

				copied = bytes_read;
@@ -2067,6 +2084,11 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
		set_bit(MPTCP_DATA_READY, &msk->flags);

	}

out_err:

	if (cmsg_flags && copied >= 0) {

		if (cmsg_flags & MPTCP_CMSG_TS)

			tcp_recv_timestamp(msg, sk, &tss);

	}



	pr_debug("msk=%p data_ready=%d rx queue empty=%d copied=%d",

		 msk, test_bit(MPTCP_DATA_READY, &msk->flags),

		 skb_queue_empty_lockless(&sk->sk_receive_queue), copied);