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

Commit a44d6eac authored by Martin KaFai Lau's avatar Martin KaFai Lau Committed by David S. Miller
Browse files

tcp: Add RFC4898 tcpEStatsPerfDataSegsOut/In 



Per RFC4898, they count segments sent/received
containing a positive length data segment (that includes
retransmission segments carrying data).  Unlike
tcpi_segs_out/in, tcpi_data_segs_out/in excludes segments
carrying no data (e.g. pure ack).

The patch also updates the segs_in in tcp_fastopen_add_skb()
so that segs_in >= data_segs_in property is kept.

Together with retransmission data, tcpi_data_segs_out
gives a better signal on the rxmit rate.

v6: Rebase on the latest net-next

v5: Eric pointed out that checking skb->len is still needed in
tcp_fastopen_add_skb() because skb can carry a FIN without data.
Hence, instead of open coding segs_in and data_segs_in, tcp_segs_in()
helper is used.  Comment is added to the fastopen case to explain why
segs_in has to be reset and tcp_segs_in() has to be called before
__skb_pull().

v4: Add comment to the changes in tcp_fastopen_add_skb()
and also add remark on this case in the commit message.

v3: Add const modifier to the skb parameter in tcp_segs_in()

v2: Rework based on recent fix by Eric:
commit a9d99ce2 ("tcp: fix tcpi_segs_in after connection establishment")

Signed-off-by: default avatarMartin KaFai Lau <kafai@fb.com>
Cc: Chris Rapier <rapier@psc.edu>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Marcelo Ricardo Leitner <mleitner@redhat.com>
Cc: Neal Cardwell <ncardwell@google.com>
Cc: Yuchung Cheng <ycheng@google.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efc21d95

include/linux/tcp.h

+6 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ struct tcp_sock { 
	u32	segs_in;	/* RFC4898 tcpEStatsPerfSegsIn

				 * total number of segments in.

				 */

	u32	data_segs_in;	/* RFC4898 tcpEStatsPerfDataSegsIn

				 * total number of data segments in.

				 */

 	u32	rcv_nxt;	/* What we want to receive next 	*/

	u32	copied_seq;	/* Head of yet unread data		*/

	u32	rcv_wup;	/* rcv_nxt on last window update sent	*/
@@ -165,6 +168,9 @@ struct tcp_sock { 
	u32	segs_out;	/* RFC4898 tcpEStatsPerfSegsOut

				 * The total number of segments sent.

				 */

	u32	data_segs_out;	/* RFC4898 tcpEStatsPerfDataSegsOut

				 * total number of data segments sent.

				 */

	u64	bytes_acked;	/* RFC4898 tcpEStatsAppHCThruOctetsAcked

				 * sum(delta(snd_una)), or how many bytes

				 * were acked.

include/net/tcp.h

+10 −0
Original line number Diff line number Diff line
@@ -1840,4 +1840,14 @@ static inline int tcp_inq(struct sock *sk) 
	return answ;

}



static inline void tcp_segs_in(struct tcp_sock *tp, const struct sk_buff *skb)

{

	u16 segs_in;



	segs_in = max_t(u16, 1, skb_shinfo(skb)->gso_segs);

	tp->segs_in += segs_in;

	if (skb->len > tcp_hdrlen(skb))

		tp->data_segs_in += segs_in;

}



#endif	/* _TCP_H */

include/uapi/linux/tcp.h

+2 −0
Original line number Diff line number Diff line
@@ -199,6 +199,8 @@ struct tcp_info { 


	__u32	tcpi_notsent_bytes;

	__u32	tcpi_min_rtt;

	__u32	tcpi_data_segs_in;	/* RFC4898 tcpEStatsDataSegsIn */

	__u32	tcpi_data_segs_out;	/* RFC4898 tcpEStatsDataSegsOut */

};



/* for TCP_MD5SIG socket option */

net/ipv4/tcp.c

+2 −0
Original line number Diff line number Diff line
@@ -2715,6 +2715,8 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 
	info->tcpi_notsent_bytes = max(0, notsent_bytes);



	info->tcpi_min_rtt = tcp_min_rtt(tp);

	info->tcpi_data_segs_in = tp->data_segs_in;

	info->tcpi_data_segs_out = tp->data_segs_out;

}

EXPORT_SYMBOL_GPL(tcp_get_info);

net/ipv4/tcp_fastopen.c

+8 −0
Original line number Diff line number Diff line
@@ -140,6 +140,14 @@ void tcp_fastopen_add_skb(struct sock *sk, struct sk_buff *skb) 
		return;



	skb_dst_drop(skb);

	/* segs_in has been initialized to 1 in tcp_create_openreq_child().

	 * Hence, reset segs_in to 0 before calling tcp_segs_in()

	 * to avoid double counting.  Also, tcp_segs_in() expects

	 * skb->len to include the tcp_hdrlen.  Hence, it should

	 * be called before __skb_pull().

	 */

	tp->segs_in = 0;

	tcp_segs_in(tp, skb);

	__skb_pull(skb, tcp_hdrlen(skb));

	skb_set_owner_r(skb, sk);