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

Commit 984988aa authored by Wei Wang's avatar Wei Wang Committed by David S. Miller
Browse files

tcp: add a helper to calculate size of opt_stats 



This is to refactor the calculation of the size of opt_stats to a helper
function to make the code cleaner and easier for later changes.

Suggested-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarWei Wang <weiwan@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Acked-by: default avatarNeal Cardwell <ncardwell@google.com>
Acked-by: default avatarSoheil Hassas Yeganeh <soheil@google.com>
Acked-by: default avatarYuchung Cheng <ycheng@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53dd9652

net/ipv4/tcp.c

+24 −3
Original line number Diff line number Diff line
@@ -3205,6 +3205,29 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 
}

EXPORT_SYMBOL_GPL(tcp_get_info);



static size_t tcp_opt_stats_get_size(void)

{

	return

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BUSY */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_RWND_LIMITED */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_SNDBUF_LIMITED */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_DATA_SEGS_OUT */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_TOTAL_RETRANS */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_PACING_RATE */

		nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_DELIVERY_RATE */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_SND_CWND */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_REORDERING */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_MIN_RTT */

		nla_total_size(sizeof(u8)) + /* TCP_NLA_RECUR_RETRANS */

		nla_total_size(sizeof(u8)) + /* TCP_NLA_DELIVERY_RATE_APP_LMT */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_SNDQ_SIZE */

		nla_total_size(sizeof(u8)) + /* TCP_NLA_CA_STATE */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_SND_SSTHRESH */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_DELIVERED */

		nla_total_size(sizeof(u32)) + /* TCP_NLA_DELIVERED_CE */

		0;

}



struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk)

{

	const struct tcp_sock *tp = tcp_sk(sk);
@@ -3213,9 +3236,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 
	u64 rate64;

	u32 rate;



	stats = alloc_skb(7 * nla_total_size_64bit(sizeof(u64)) +

			  7 * nla_total_size(sizeof(u32)) +

			  3 * nla_total_size(sizeof(u8)), GFP_ATOMIC);

	stats = alloc_skb(tcp_opt_stats_get_size(), GFP_ATOMIC);

	if (!stats)

		return NULL;