From patchwork Mon Jul 30 21:59:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 951290 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="OHB52mzK"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41fYT367BGz9s3N for ; Tue, 31 Jul 2018 08:02:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732031AbeG3XjL (ORCPT ); Mon, 30 Jul 2018 19:39:11 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33925 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726622AbeG3XjK (ORCPT ); Mon, 30 Jul 2018 19:39:10 -0400 Received: by mail-pg1-f194.google.com with SMTP id y5-v6so7966567pgv.1 for ; Mon, 30 Jul 2018 15:02:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gDFND3pvFkFIG1sujmUNpSlgy6OQwLEc+nF4FHnppK4=; b=OHB52mzKZ/vLwbpe3qugRAmI55qdbj7kg64TTZ/10Xea9zMZNSOrJgVeOisNaDxtAH LAo21WPF6TXYn7OEBWOXyR4/wzSBeq7Ht/XZjAkZa8vs+Mb1k5hA+tx+dULy1q6wZQMa GIGSFXZ4t6JJKvlYbCzO48pt7nAh6swbEA6XIQ7qVcCYttuCpNRRv2ZGAyo6bwhE0y4C RGJV7mt1T5ta+1e5FqVQo3jG/ICZ/AHo9ghdI7mOi98zRFXqyqb8IS5rT9Lm2M/+i2Ve 47i1rYNWpaE5+RUYKVCoCZ/cgbCaAUQAD+DqukqyJLPxZilEdrlu0JvZ1+gihfRqSVUi Qf+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gDFND3pvFkFIG1sujmUNpSlgy6OQwLEc+nF4FHnppK4=; b=THTuLoeaw8oFc/VZcsYutu6lEYo9wrnjZ/hI+QrA96ENAfdrogIEDgTTIB3gaVSWpP uIUGON1hHE9a27wnvXm/0uFmTqg4xH9I0xUGapXYVn6Px/aanSdNPjAK0HnrhDrdw1AB eAKPdOEn434iaPzSu/ZenUox4sWcOCf77QrSfayNZE6FaWug705NK4lEOtgltJ+Es10w VKW0IF7DLs2P5/hBoo2I0nKME1KDCmZydD/6xMatDyWUuoK4TW+Q2Yy6ldj4sRUgsMs4 eOFdO3yp87+5GK6mB7YIkRfnUzHUCHOdvTcOvyMxXQIezuiAsnBJs27AtdMhXbDJPEOb +rVQ== X-Gm-Message-State: AOUpUlHTDijwIBnguro4Ik+NSxEctTXLYgTSwSa0bLqQOuPkd1a3yFVQ nWCYhxqT75QkTus4DCSNOrN1OMrr6uP6+Q== X-Google-Smtp-Source: AAOMgpcuY8unepXIr0p74mwFtochu5i+wDAoiwhdklh5zgs+GbhHytrXgRA1k4z5XjBFBeIeD3g2+A== X-Received: by 2002:a63:d401:: with SMTP id a1-v6mr17807568pgh.414.1532988128929; Mon, 30 Jul 2018 15:02:08 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:9310:64cb:677b:dcba]) by smtp.gmail.com with ESMTPSA id d11-v6sm16795497pfo.135.2018.07.30.15.02.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jul 2018 15:02:08 -0700 (PDT) From: Wei Wang X-Google-Original-From: Wei Wang To: David Miller , netdev@vger.kernel.org Cc: Yuchung Cheng , Neal Cardwell , Soheil Hassas Yeganeh , Eric Dumazet , Wei Wang Subject: [PATCH net-next 2/4] tcp: add data bytes retransmitted stats Date: Mon, 30 Jul 2018 14:59:09 -0700 Message-Id: <20180730215911.209895-3-tracywwnj@gmail.com> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180730215911.209895-2-tracywwnj@gmail.com> References: <20180730215911.209895-1-tracywwnj@gmail.com> <20180730215911.209895-2-tracywwnj@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang Introduce a new TCP stat to record the number of bytes retransmitted (RFC4898 tcpEStatsPerfOctetsRetrans) and expose it in both tcp_info (TCP_INFO) and opt_stats (SOF_TIMESTAMPING_OPT_STATS). Signed-off-by: Wei Wang Signed-off-by: Eric Dumazet Acked-by: Neal Cardwell Acked-by: Soheil Hassas Yeganeh Acked-by: Yuchung Cheng --- include/linux/tcp.h | 3 +++ include/uapi/linux/tcp.h | 2 ++ net/ipv4/tcp.c | 6 +++++- net/ipv4/tcp_output.c | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index d0798dcd2cab..fb67f9a51b95 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -333,6 +333,9 @@ struct tcp_sock { * the first SYN. */ u32 undo_marker; /* snd_una upon a new recovery episode. */ int undo_retrans; /* number of undoable retransmissions. */ + u64 bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans + * Total data bytes retransmitted + */ u32 total_retrans; /* Total retransmits for entire connection */ u32 urg_seq; /* Seq of received urgent pointer */ diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index 1c70ed287c3b..c31f5100b744 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -237,6 +237,7 @@ struct tcp_info { __u32 tcpi_delivered_ce; __u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */ + __u64 tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */ }; /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */ @@ -260,6 +261,7 @@ enum { TCP_NLA_DELIVERED, /* Data pkts delivered incl. out-of-order */ TCP_NLA_DELIVERED_CE, /* Like above but only ones w/ CE marks */ TCP_NLA_BYTES_SENT, /* Data bytes sent including retransmission */ + TCP_NLA_BYTES_RETRANS, /* Data bytes retransmitted */ }; /* for TCP_MD5SIG socket option */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 53d3db4a3d39..372357a035e9 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2595,6 +2595,7 @@ int tcp_disconnect(struct sock *sk, int flags) tcp_saved_syn_free(tp); tp->compressed_ack = 0; tp->bytes_sent = 0; + tp->bytes_retrans = 0; /* Clean up fastopen related fields */ tcp_free_fastopen_req(tp); @@ -3203,6 +3204,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 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; unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(tcp_get_info); @@ -3215,7 +3217,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) u64 rate64; u32 rate; - stats = alloc_skb(8 * nla_total_size_64bit(sizeof(u64)) + + stats = alloc_skb(9 * nla_total_size_64bit(sizeof(u64)) + 7 * nla_total_size(sizeof(u32)) + 3 * nla_total_size(sizeof(u8)), GFP_ATOMIC); if (!stats) @@ -3255,6 +3257,8 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 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); return stats; } diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 861531fe0e97..50cabf7656f3 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2871,6 +2871,7 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN) __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSYNRETRANS); tp->total_retrans += segs; + tp->bytes_retrans += skb->len; /* make sure skb->data is aligned on arches that require it * and check if ack-trimming & collapsing extended the headroom