From patchwork Mon Jul 30 21:59:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 951289 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="InxBKai9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41fYT30s4lz9s2g for ; Tue, 31 Jul 2018 08:02:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732023AbeG3XjH (ORCPT ); Mon, 30 Jul 2018 19:39:07 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:38889 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726622AbeG3XjH (ORCPT ); Mon, 30 Jul 2018 19:39:07 -0400 Received: by mail-pf1-f194.google.com with SMTP id x17-v6so5128928pfh.5 for ; Mon, 30 Jul 2018 15:02:06 -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=GL+sVlRKH3U9cRN2NYFCX1AsDSJ6TQfLV+0GUOMjSIk=; b=InxBKai9c/SK42whIQjmBdVFth5ifmrZ6KFbHSQFn0OcwQjo5+0ZVj8p8N48HE4RaK L/wKee3ZIRNgcYF130JdlIe+vP2W2y6wIvxtANXKC2oGpa60c4zzluqopBA5i6hnlQi+ 0yrK77EZQT67oOxcjB6OYReC0fNZ9cbWH6KedQ+T5ifdRfE0wyazZStCFdgMCEGQ3VS3 Z57FlNu05YqnWDZnptjegXBKK6B+VmThKLBhrycRrPKNfH9Euo7N0//SEYZ5nIK8bUbK ymaCv+EWmGO9cXjoF7i/tvW4hOl6uJrCcNvW5YCy4jay/TMt5oWWUrBAWTgKk7+swVu4 Qvbg== 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=GL+sVlRKH3U9cRN2NYFCX1AsDSJ6TQfLV+0GUOMjSIk=; b=qBH2eI6SOgrnKdAA6Di0Cdbyq8ivYxk49OwVxU8ifNcvXLKZCWihntlBKxL99FB7Uc +5WPI3/4ITLiKn5wUR6FAIyZzqmPSipW3vhXARRz/4jXPQZRkbcXnvnvoPzD+hbqOxiq lkLjruzBGKh2C0yNVkGVzRLNu5Tff5V55YLWWT+TWyGi9CJoO5YhuYmZJtQuQAOfU9Gn zU8xWEbaf7QRKloZUvxFTnshuzXjwqs7aiMcYzgy/+gT97HBg4/jjnmmittrhtskBRIg tPyO6Rng6vINhfSI4BbTmxRL1c0odyONuYZC1B1YpXa7gtLrRClwGjx4QDnXhOxL5+xZ QLJA== X-Gm-Message-State: AOUpUlEblBDydFgJ2GEA1yaHvOauYND1TZvkqZ0gTf+xShEkN+HO6ESQ tKXGb9sTZXGtNebK93R/DOm4U6ws/eebVg== X-Google-Smtp-Source: AAOMgpfdpeJBitNLYKgyLF+gFUA9lqDu279h4lrrD8sFvH/cUgFXRnsWzv5jgjx0pkKQMCWmtE8jlA== X-Received: by 2002:a63:4002:: with SMTP id n2-v6mr17686970pga.285.1532988126114; Mon, 30 Jul 2018 15:02:06 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:9310:64cb:677b:dcba]) by smtp.gmail.com with ESMTPSA id u4-v6sm6368162pfb.168.2018.07.30.15.02.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jul 2018 15:02:05 -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 1/4] tcp: add data bytes sent stats Date: Mon, 30 Jul 2018 14:59:08 -0700 Message-Id: <20180730215911.209895-2-tracywwnj@gmail.com> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180730215911.209895-1-tracywwnj@gmail.com> References: <20180730215911.209895-1-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 sent (RFC4898 tcpEStatsPerfHCDataOctetsOut) 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 | 4 +++- net/ipv4/tcp.c | 7 ++++++- net/ipv4/tcp_output.c | 1 + 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 58a8d7d71354..d0798dcd2cab 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -181,6 +181,9 @@ struct tcp_sock { u32 data_segs_out; /* RFC4898 tcpEStatsPerfDataSegsOut * total number of data segments sent. */ + u64 bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut + * total number of data bytes sent. + */ u64 bytes_acked; /* RFC4898 tcpEStatsAppHCThruOctetsAcked * sum(delta(snd_una)), or how many bytes * were acked. diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index e3f6ed8a7064..1c70ed287c3b 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -235,6 +235,8 @@ struct tcp_info { __u32 tcpi_delivered; __u32 tcpi_delivered_ce; + + __u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */ }; /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */ @@ -257,7 +259,7 @@ enum { TCP_NLA_SND_SSTHRESH, /* Slow start size threshold */ 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 */ }; /* for TCP_MD5SIG socket option */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index f3bfb9f29520..53d3db4a3d39 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2594,6 +2594,7 @@ 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; /* Clean up fastopen related fields */ tcp_free_fastopen_req(tp); @@ -3201,6 +3202,7 @@ 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; unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(tcp_get_info); @@ -3213,7 +3215,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)) + + stats = alloc_skb(8 * nla_total_size_64bit(sizeof(u64)) + 7 * nla_total_size(sizeof(u32)) + 3 * nla_total_size(sizeof(u8)), GFP_ATOMIC); if (!stats) @@ -3251,6 +3253,9 @@ 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); + return stats; } diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 490df62f26d4..861531fe0e97 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -1136,6 +1136,7 @@ static int __tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, if (skb->len != tcp_header_size) { tcp_event_data_sent(tp, sk); tp->data_segs_out += tcp_skb_pcount(skb); + tp->bytes_sent += skb->len - tcp_header_size; tcp_internal_pacing(sk, skb); } 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 From patchwork Mon Jul 30 21:59:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 951291 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="vmIbojZd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41fYT451kYz9s3x for ; Tue, 31 Jul 2018 08:02:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732036AbeG3XjN (ORCPT ); Mon, 30 Jul 2018 19:39:13 -0400 Received: from mail-pf1-f175.google.com ([209.85.210.175]:35179 "EHLO mail-pf1-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726622AbeG3XjM (ORCPT ); Mon, 30 Jul 2018 19:39:12 -0400 Received: by mail-pf1-f175.google.com with SMTP id p12-v6so26351pfh.2 for ; Mon, 30 Jul 2018 15:02:12 -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=nvaIzmS8qz5wIUItnqazmbYctsu+IqhkO8csypXMfww=; b=vmIbojZd7F3qZomfeoD4/rdEdJAHUsEv0BMIUnNE84qjpaxwT3ziOVFz4GN44XvHsJ Ub4boT2oyrjSha1gnKj7WBITbffV1LJbG7d+kFJrT7JvhZerpsDOst/KAENL5alO2MXb f3jtAtEhaPPcRZsM5fJtQ8SYpploHLEswgkWTHInkbPiEueQbe+edo5h3vvuPY9kugT4 udB2a2Cy+8xqQ/XN534TfAq1WGGm++0k6ykxbZF3vLSkFWT5k+TAlJZSmIDBX+XWYYcs Alm1YYZeXhtt499MYPksWxShRWVpNlUAuhHSXZ7aLv61KdOloGGQGFttIOPkExMmDuDn NQSA== 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=nvaIzmS8qz5wIUItnqazmbYctsu+IqhkO8csypXMfww=; b=B2rK81omaCwmSUaF0gOR70H3Ij7e1kxHNzXXFrcq6k2vkFAlTSv+rMSKbX1ldQPGEW bwkPUTAJeJNdFprKHrPpXNRySRsQ0HlmX6PoLeEww/Xsq7naUAcIQsQM+CeoVn3Jj2xU tuj6M+U3PnIC9QGY6ZIeYcaPHTGd1aj0euX1gNBL7rj8MZjp0W24FCcf2rnge/pjPYfC kndvg0KUxeFtSrA9ioiTP/1iau5bxxx8r5J2lQqlvoPf1IcuiE1eEHcohYKareblTcGD mYewbjul2nrmP1KDF6Z0kp8yEn502QceZdEbb3XCx4x/uBDGg/yeLjrx/a+1KGcSC/Ox 7PrA== X-Gm-Message-State: AOUpUlGM3FABAuo7gLqhxiaUjyqyw7OdgYbdsnbyWRT4y3b9wIWGEALR ep65WKUrRDvMSG29He8Cut5aug== X-Google-Smtp-Source: AAOMgpc5MzDwUrUn4EE73dMH//aDiokMsLGLz/ZYs8OerYPI9t0A2OZQLCCc5aoG+dU+e9jnQD5apQ== X-Received: by 2002:a63:81c3:: with SMTP id t186-v6mr18180455pgd.413.1532988131669; Mon, 30 Jul 2018 15:02:11 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:9310:64cb:677b:dcba]) by smtp.gmail.com with ESMTPSA id f184-v6sm37460960pfc.88.2018.07.30.15.02.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jul 2018 15:02:11 -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 3/4] tcp: add dsack blocks received stats Date: Mon, 30 Jul 2018 14:59:10 -0700 Message-Id: <20180730215911.209895-4-tracywwnj@gmail.com> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180730215911.209895-3-tracywwnj@gmail.com> References: <20180730215911.209895-1-tracywwnj@gmail.com> <20180730215911.209895-2-tracywwnj@gmail.com> <20180730215911.209895-3-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 DSACK blocks received (RFC4989 tcpEStatsStackDSACKDups) 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 | 5 ++++- net/ipv4/tcp_input.c | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index fb67f9a51b95..da6281c549a5 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -188,6 +188,9 @@ struct tcp_sock { * sum(delta(snd_una)), or how many bytes * were acked. */ + u32 dsack_dups; /* RFC4898 tcpEStatsStackDSACKDups + * total number of DSACK blocks received + */ u32 snd_una; /* First byte we want an ack for */ u32 snd_sml; /* Last byte of the most recently transmitted small packet */ u32 rcv_tstamp; /* timestamp of last received ACK (for keepalives) */ diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index c31f5100b744..0e1c0aec0153 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -238,6 +238,7 @@ struct tcp_info { __u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */ __u64 tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */ + __u32 tcpi_dsack_dups; /* RFC4898 tcpEStatsStackDSACKDups */ }; /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */ @@ -262,6 +263,7 @@ enum { 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 */ + TCP_NLA_DSACK_DUPS, /* DSACK blocks received */ }; /* for TCP_MD5SIG socket option */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 372357a035e9..a8ec6564a7ec 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2596,6 +2596,7 @@ int tcp_disconnect(struct sock *sk, int flags) tp->compressed_ack = 0; tp->bytes_sent = 0; tp->bytes_retrans = 0; + tp->dsack_dups = 0; /* Clean up fastopen related fields */ tcp_free_fastopen_req(tp); @@ -3205,6 +3206,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 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; unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(tcp_get_info); @@ -3218,7 +3220,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) u32 rate; stats = alloc_skb(9 * nla_total_size_64bit(sizeof(u64)) + - 7 * nla_total_size(sizeof(u32)) + + 8 * nla_total_size(sizeof(u32)) + 3 * nla_total_size(sizeof(u8)), GFP_ATOMIC); if (!stats) return NULL; @@ -3259,6 +3261,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 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); return stats; } diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index d51fa358b2b1..fbc85ff7d71d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -874,6 +874,7 @@ static void tcp_dsack_seen(struct tcp_sock *tp) { tp->rx_opt.sack_ok |= TCP_DSACK_SEEN; tp->rack.dsack_seen = 1; + tp->dsack_dups++; } /* It's reordering when higher sequence was delivered (i.e. sacked) before From patchwork Mon Jul 30 21:59:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 951292 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="l3VfXePr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41fYT55c39z9s2g for ; Tue, 31 Jul 2018 08:02:17 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732044AbeG3XjQ (ORCPT ); Mon, 30 Jul 2018 19:39:16 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:37321 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726622AbeG3XjQ (ORCPT ); Mon, 30 Jul 2018 19:39:16 -0400 Received: by mail-pl0-f67.google.com with SMTP id d5-v6so617730pll.4 for ; Mon, 30 Jul 2018 15:02:15 -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=yOaSMr0jCjbhlidtTjqakWbcbE9opcAFUrsQ/LwNXrA=; b=l3VfXePr9YmZSsENKF8Dqk09+Z6DuuN9atzZzVwi8ZDCYI5UFmHMn+gEts1G4e7Rql y/brzLfuGQff6lqR6yRjHflnbsg7mVhtR1MUa5KrZWiN7Ko+ml1nds9Tqy2XzU8X/uxQ f9LnvXvzRtk1FdryS5BJeGtB6WIeb51Uq/sGiv3Kt+W6Uwn7fuUCNrKl/MGrgDnlbVpB a2oX1Ks/OorYaNIvFa/9D5q0W/c3Ikt7t8557KLc5f4h6cmI1DXL97P5n3NWTaJGW5IE E/25ax1Q9v0OagDRlQi3KGWQ9A+2geQv5pInoPbYQIgpvhUXHqtUv/uUVvSuL31fwt5n Jmaw== 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=yOaSMr0jCjbhlidtTjqakWbcbE9opcAFUrsQ/LwNXrA=; b=uH0q8hpAUZdwZCZ6LK5F5oO+0PXOJurMVVzC40LSbkRUJgIIwWMgx3KjMdavFzEAuP A/ekcZiqOFVQoTTVXOgxqkvnY7dvERsvMflGu3UZkjPtwapb4C/3SDW3VkUIsenqlpB4 ys49bPcsZAEk3Lak8Bg6XDb8GuZRfQOj1r8KbifIJ0Icq8dw1ZagpXbQY6MAluzb3Yb6 AgL1pUYtqa25ExSBeV6qPoXi2Jtmo8IOdPm+WFoZYSLN+ljiqluH5BxOnKh51ANcSn1i 7B4ZbpXXtkp7gUK8RixhhPNnDteZZMxyUHxtvuU0B79ESUK7YkwCfXZaaBq6Q2LixPlT VLXw== X-Gm-Message-State: AOUpUlG7En0++Ti1RbxaKc8ySDKH6UywciVjizyOYfMJLIVqhHnayMVD Immf1iwOEq3QqxqjP2g9N4roCQ== X-Google-Smtp-Source: AAOMgpeVuUEtlOPRZuskxkReLo7WArLzlJ0iKyYor0s0ZoXu2KhdEBqqnF/u2JsMzn/zlY3Qf9+45A== X-Received: by 2002:a17:902:8645:: with SMTP id y5-v6mr17974938plt.334.1532988134964; Mon, 30 Jul 2018 15:02:14 -0700 (PDT) Received: from localhost ([2620:15c:2c4:201:9310:64cb:677b:dcba]) by smtp.gmail.com with ESMTPSA id o84-v6sm23478834pfi.165.2018.07.30.15.02.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jul 2018 15:02:14 -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 4/4] tcp: add stat of data packet reordering events Date: Mon, 30 Jul 2018 14:59:11 -0700 Message-Id: <20180730215911.209895-5-tracywwnj@gmail.com> X-Mailer: git-send-email 2.18.0.345.g5c9ce644c3-goog In-Reply-To: <20180730215911.209895-4-tracywwnj@gmail.com> References: <20180730215911.209895-1-tracywwnj@gmail.com> <20180730215911.209895-2-tracywwnj@gmail.com> <20180730215911.209895-3-tracywwnj@gmail.com> <20180730215911.209895-4-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 stats to record the number of reordering events seen and expose it in both tcp_info (TCP_INFO) and opt_stats (SOF_TIMESTAMPING_OPT_STATS). Application can use this stats to track the frequency of the reordering events in addition to the existing reordering stats which tracks the magnitude of the latest reordering event. Note: this new stats tracks reordering events triggered by ACKs, which could often be fewer than the actual number of packets being delivered out-of-order. 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 | 4 ++-- include/uapi/linux/tcp.h | 2 ++ net/ipv4/tcp.c | 5 ++++- net/ipv4/tcp_input.c | 3 ++- net/ipv4/tcp_recovery.c | 2 +- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index da6281c549a5..263e37271afd 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -220,8 +220,7 @@ struct tcp_sock { #define TCP_RACK_RECOVERY_THRESH 16 u8 reo_wnd_persist:5, /* No. of recovery since last adj */ dsack_seen:1, /* Whether DSACK seen after last adj */ - advanced:1, /* mstamp advanced since last lost marking */ - reord:1; /* reordering detected */ + advanced:1; /* mstamp advanced since last lost marking */ } rack; u16 advmss; /* Advertised MSS */ u8 compressed_ack; @@ -267,6 +266,7 @@ struct tcp_sock { u8 ecn_flags; /* ECN status bits. */ u8 keepalive_probes; /* num of allowed keep alive probes */ u32 reordering; /* Packet reordering metric. */ + u32 reord_seen; /* number of data packet reordering events */ u32 snd_up; /* Urgent pointer */ /* diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h index 0e1c0aec0153..e02d31986ff9 100644 --- a/include/uapi/linux/tcp.h +++ b/include/uapi/linux/tcp.h @@ -239,6 +239,7 @@ struct tcp_info { __u64 tcpi_bytes_sent; /* RFC4898 tcpEStatsPerfHCDataOctetsOut */ __u64 tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */ __u32 tcpi_dsack_dups; /* RFC4898 tcpEStatsStackDSACKDups */ + __u32 tcpi_reord_seen; /* reordering events seen */ }; /* netlink attributes types for SCM_TIMESTAMPING_OPT_STATS */ @@ -264,6 +265,7 @@ enum { TCP_NLA_BYTES_SENT, /* Data bytes sent including retransmission */ TCP_NLA_BYTES_RETRANS, /* Data bytes retransmitted */ TCP_NLA_DSACK_DUPS, /* DSACK blocks received */ + TCP_NLA_REORD_SEEN, /* reordering events seen */ }; /* for TCP_MD5SIG socket option */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index a8ec6564a7ec..250b73ccb644 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2597,6 +2597,7 @@ int tcp_disconnect(struct sock *sk, int flags) 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); @@ -3207,6 +3208,7 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info) 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); @@ -3220,7 +3222,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) u32 rate; stats = alloc_skb(9 * nla_total_size_64bit(sizeof(u64)) + - 8 * nla_total_size(sizeof(u32)) + + 9 * nla_total_size(sizeof(u32)) + 3 * nla_total_size(sizeof(u8)), GFP_ATOMIC); if (!stats) return NULL; @@ -3262,6 +3264,7 @@ struct sk_buff *tcp_get_timestamping_opt_stats(const struct sock *sk) 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; } diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index fbc85ff7d71d..3d6156f07a8d 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -906,8 +906,8 @@ static void tcp_check_sack_reordering(struct sock *sk, const u32 low_seq, sock_net(sk)->ipv4.sysctl_tcp_max_reordering); } - tp->rack.reord = 1; /* This exciting event is worth to be remembered. 8) */ + tp->reord_seen++; NET_INC_STATS(sock_net(sk), ts ? LINUX_MIB_TCPTSREORDER : LINUX_MIB_TCPSACKREORDER); } @@ -1871,6 +1871,7 @@ static void tcp_check_reno_reordering(struct sock *sk, const int addend) tp->reordering = min_t(u32, tp->packets_out + addend, sock_net(sk)->ipv4.sysctl_tcp_max_reordering); + tp->reord_seen++; NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRENOREORDER); } diff --git a/net/ipv4/tcp_recovery.c b/net/ipv4/tcp_recovery.c index 71593e4400ab..c81aadff769b 100644 --- a/net/ipv4/tcp_recovery.c +++ b/net/ipv4/tcp_recovery.c @@ -25,7 +25,7 @@ static u32 tcp_rack_reo_wnd(const struct sock *sk) { struct tcp_sock *tp = tcp_sk(sk); - if (!tp->rack.reord) { + if (!tp->reord_seen) { /* If reordering has not been observed, be aggressive during * the recovery or starting the recovery by DUPACK threshold. */