1 files changed, 43 insertions, 3 deletions

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f3bfb9f29520..31fa1c080f28 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2594,6 +2594,10 @@ int tcp_disconnect(struct sock *sk, int flags)
         sk->sk_rx_dst = NULL;
         tcp_saved_syn_free(tp);
         tp->compressed_ack = 0;
+        tp->bytes_sent = 0;
+        tp->bytes_retrans = 0;
+        tp->dsack_dups = 0;
+        tp->reord_seen = 0;
 
         /* Clean up fastopen related fields */
         tcp_free_fastopen_req(tp);
@@ -3201,10 +3205,41 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
                 info->tcpi_delivery_rate = rate64;
         info->tcpi_delivered = tp->delivered;
         info->tcpi_delivered_ce = tp->delivered_ce;
+        info->tcpi_bytes_sent = tp->bytes_sent;
+        info->tcpi_bytes_retrans = tp->bytes_retrans;
+        info->tcpi_dsack_dups = tp->dsack_dups;
+        info->tcpi_reord_seen = tp->reord_seen;
         unlock_sock_fast(sk, slow);
 }
 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 */
+                nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_SENT */
+                nla_total_size_64bit(sizeof(u64)) + /* TCP_NLA_BYTES_RETRANS */
+                nla_total_size(sizeof(u32)) + /* TCP_NLA_DSACK_DUPS */
+                nla_total_size(sizeof(u32)) + /* TCP_NLA_REORD_SEEN */
+                0;
+}
+
 struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk)
 {
         const struct tcp_sock *tp = tcp_sk(sk);
@@ -3213,9 +3248,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;
 
@@ -3251,6 +3284,13 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk)
         nla_put_u32(stats, TCP_NLA_SNDQ_SIZE, tp->write_seq - tp->snd_una);
         nla_put_u8(stats, TCP_NLA_CA_STATE, inet_csk(sk)->icsk_ca_state);
 
+        nla_put_u64_64bit(stats, TCP_NLA_BYTES_SENT, tp->bytes_sent,
+                          TCP_NLA_PAD);
+        nla_put_u64_64bit(stats, TCP_NLA_BYTES_RETRANS, tp->bytes_retrans,
+                          TCP_NLA_PAD);
+        nla_put_u32(stats, TCP_NLA_DSACK_DUPS, tp->dsack_dups);
+        nla_put_u32(stats, TCP_NLA_REORD_SEEN, tp->reord_seen);
+
         return stats;
 }