From patchwork Sun Sep 9 03:14:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 967696 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="prP9TBm+"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 427GWT57WPz9s4Z for ; Sun, 9 Sep 2018 13:15:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726603AbeIIICr (ORCPT ); Sun, 9 Sep 2018 04:02:47 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:39757 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbeIIICr (ORCPT ); Sun, 9 Sep 2018 04:02:47 -0400 Received: by mail-pl1-f195.google.com with SMTP id w14-v6so8218798plp.6; Sat, 08 Sep 2018 20:14:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=GhY3DmQ9BsvZWqdEEN8HV7YTQMSzzMSmMd7WY+M+bZI=; b=prP9TBm+I/plKQo6oZXy/J7sXSXTcxCSzI66qtK6TWtd6SJ5Qr9NmKgbJ5kHIWHaQk FIDrq5Y+/7XAtIiqkAIMF8QcoqvYDDpJdSfc43XN1odc764HQi2UfpmMCPspi/iqb6dZ U8AsNGZ9OTD9isNrQEeZSReRtskSs1wuWJI98RHiFnBWB3xVZdiSsY0HzPplb/Em2tK6 x8If+4CvOuvsxQ0HiWtmJR8x2R2lu4brkqVKzS8wnQnBa4k5AESTA4j53McvRQ2Z/RKZ U5xvzM3ki84vHhxwpzT4bnl6IWprGSI3iSZTk7t28+3TNxqkXh8C9Ob1DSfukUvJRUb6 VjgA== 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; bh=GhY3DmQ9BsvZWqdEEN8HV7YTQMSzzMSmMd7WY+M+bZI=; b=VafqNLX3cl6kDHLB0dZq2nrOTK0UGo1Th7EutNFdiHYpDGwUw9vBOr1GC9piPUQh6T igrzt11MSbeYFqiPnLJeXYbgjBreFf3nZ9nNjVn2IQD36uxXuz066uW/+fS4Hr2deJJw zyvaE6N6Q1NUJQLAfbtbyC32QIvsAKG6FEo79KEnIhWM4ySURo1IzKT3l/w9ty2aSeWI dQC6P+gut8KoNBSLC598qCQ8ZCvvG9Cba8xjHoz7B1ceB47nVDk7nQG9BMbxQiTh4EwA vB8+uTzrYTDsfiam3DAGaDLrLRjc+JxpYtwPnrHKYiJ/am+13hExngqoZgMm3bPdHljv TNoA== X-Gm-Message-State: APzg51AXqEugRqe1cwCqKIUaTWyeJTy/U4TLIGls7tsE+d0FMKo/GCUy tsyuzq1HtQoj4eEVuaieRLA= X-Google-Smtp-Source: ANB0VdaDL8xMyjcgraNYiyjwVfAlRIG5cMN8CRs0vVJ47hOur4zE60/Xpu/dJ8JLpCrgH3V7KDH/8g== X-Received: by 2002:a17:902:6b4b:: with SMTP id g11-v6mr13002053plt.19.1536462885125; Sat, 08 Sep 2018 20:14:45 -0700 (PDT) Received: from bogon.didichuxing.com ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c17-v6sm29086961pfk.187.2018.09.08.20.14.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 20:14:44 -0700 (PDT) From: Yafang Shao To: edumazet@google.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH v2 net-next 1/2] tcp: show number of network segments in some SNMP counters Date: Sun, 9 Sep 2018 11:14:21 +0800 Message-Id: <1536462862-11767-1-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It is better to show the number of network segments in bellow SNMP counters, because that could be more useful for the user. For example, the user could easily figure out how mant packets are dropped and how many packets are queued in the out-of-oder queue. - LINUX_MIB_TCPRCVQDROP - LINUX_MIB_TCPZEROWINDOWDROP - LINUX_MIB_TCPBACKLOGDROP - LINUX_MIB_TCPMINTTLDROP - LINUX_MIB_TCPOFODROP - LINUX_MIB_TCPOFOQUEUE Signed-off-by: Yafang Shao --- net/ipv4/tcp_input.c | 18 ++++++++++++------ net/ipv4/tcp_ipv4.c | 9 ++++++--- net/ipv6/tcp_ipv6.c | 6 ++++-- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 62508a2..c2ce334 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4496,7 +4496,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) tcp_ecn_check_ce(sk, skb); if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); tcp_drop(sk, skb); return; } @@ -4505,7 +4506,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) tp->pred_flags = 0; inet_csk_schedule_ack(sk); - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOQUEUE); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPOFOQUEUE, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); seq = TCP_SKB_CB(skb)->seq; end_seq = TCP_SKB_CB(skb)->end_seq; SOCK_DEBUG(sk, "out of order segment: rcv_next %X seq %X - %X\n", @@ -4666,7 +4668,8 @@ int tcp_send_rcvq(struct sock *sk, struct msghdr *msg, size_t size) skb->len = size; if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto err_free; } @@ -4725,7 +4728,8 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) */ if (TCP_SKB_CB(skb)->seq == tp->rcv_nxt) { if (tcp_receive_window(tp) == 0) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto out_of_window; } @@ -4734,7 +4738,8 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) if (skb_queue_len(&sk->sk_receive_queue) == 0) sk_forced_mem_schedule(sk, skb->truesize); else if (tcp_try_rmem_schedule(sk, skb, skb->truesize)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPRCVQDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto drop; } @@ -4796,7 +4801,8 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) * remembering D-SACK for its head made in previous line. */ if (!tcp_receive_window(tp)) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto out_of_window; } goto queue_and_out; diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 09547ef..23d7cb5 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -475,7 +475,8 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) goto out; if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) { - __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); + __NET_ADD_STATS(net, LINUX_MIB_TCPMINTTLDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto out; } @@ -1633,7 +1634,8 @@ bool tcp_add_backlog(struct sock *sk, struct sk_buff *skb) if (unlikely(sk_add_backlog(sk, skb, limit))) { bh_unlock_sock(sk); - __NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPBACKLOGDROP); + __NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPBACKLOGDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); return true; } return false; @@ -1790,7 +1792,8 @@ int tcp_v4_rcv(struct sk_buff *skb) } } if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) { - __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); + __NET_ADD_STATS(net, LINUX_MIB_TCPMINTTLDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto discard_and_relse; } diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 03e6b7a..bbf7667 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -391,7 +391,8 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, goto out; if (ipv6_hdr(skb)->hop_limit < inet6_sk(sk)->min_hopcount) { - __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); + __NET_ADD_STATS(net, LINUX_MIB_TCPMINTTLDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto out; } @@ -1523,7 +1524,8 @@ static int tcp_v6_rcv(struct sk_buff *skb) } } if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) { - __NET_INC_STATS(net, LINUX_MIB_TCPMINTTLDROP); + __NET_ADD_STATS(net, LINUX_MIB_TCPMINTTLDROP, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); goto discard_and_relse; } From patchwork Sun Sep 9 03:14:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 967697 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=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kCFckXzC"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 427GWW424Tz9s4Z for ; Sun, 9 Sep 2018 13:15:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726657AbeIIICt (ORCPT ); Sun, 9 Sep 2018 04:02:49 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:38217 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726084AbeIIICs (ORCPT ); Sun, 9 Sep 2018 04:02:48 -0400 Received: by mail-pl1-f195.google.com with SMTP id u11-v6so8222821plq.5; Sat, 08 Sep 2018 20:14:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XgMXMw7vLyiClYXa/YUL47+R2Bnaaf4i0uaksEqUno4=; b=kCFckXzCVBtxZydq+vv+wTX2R83GmS5C8h8v7UdCfETEz0JaVC1dwB6HlIJmIxWByb 6d1Vq7yI6bjJVIVeoyzsMok5fWeiIINOzWw0jP+Ly7Dgj1axnR7XxLkDgBTaKe7i7eKn Wv7XS2KS1UBaDxEWDEHC8i37ks6GGT1GSb9VN/tJUZZvYrbcs6LJ8GGjwmEhVW0koqa4 686IKe6YkeEzeT1vyZz3PN7YQnvxqbptmq0cIwJ1/23bhmNoXL1eJgDNBuIk4joEVIIK I/jJLwx2SJ4V1quZUqQdnP+p4neJaEaABWv8CIsxXwtHNbgFe1WF7X5tBp6U7uuth0AX ba/w== 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; bh=XgMXMw7vLyiClYXa/YUL47+R2Bnaaf4i0uaksEqUno4=; b=BwJjGcp9vjPXu5cWe9uPp/Opok7UGK/40mYSAu+hgUgrvs4lJqScVCMI5YvharEgWl CkHbp1tWqCd6WUEuK4hKKqXpylpo3cDuTuzJnvh1mQV3l8itIu4OL8PfDREiDtSHGnX8 7JCJ/U8CYnQ9i85rMZsRUwOCIBzfPloGIx2oWIkajhzyToOaf/FZjmG39lj4oUAw12+k 5xWfH5kqwp52j2QY1kNB79UQ/S5+QUplI+RnnkySJsQlAurJBWhAQ/C0qyOk+IQOQffB uLKXJ+p5PKjEL63S8UaMsk66nCCEnuDvqNm4UGycYz/V18PsA09hpi7s7Aukc8tEr/PM qgfg== X-Gm-Message-State: APzg51BarQvXc8LZlJ3ljXJ0GtPqRafdarfm5N5UtnkGt2aNde7JGC3x ewKsEoeKsMqQ/L055Ez91YA= X-Google-Smtp-Source: ANB0VdYQECsZe89rrtYMLqdGT2XPlMB7IjdQRsNsDH0cP99r5xxyLPRW10BOQEy3Sb3ol287oLKqmQ== X-Received: by 2002:a17:902:bb0c:: with SMTP id l12-v6mr15313656pls.5.1536462887458; Sat, 08 Sep 2018 20:14:47 -0700 (PDT) Received: from bogon.didichuxing.com ([203.100.54.194]) by smtp.gmail.com with ESMTPSA id c17-v6sm29086961pfk.187.2018.09.08.20.14.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 20:14:46 -0700 (PDT) From: Yafang Shao To: edumazet@google.com, davem@davemloft.net Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Yafang Shao Subject: [PATCH v2 net-next 2/2] tcp: fix the error count of tcpInSegs Date: Sun, 9 Sep 2018 11:14:22 +0800 Message-Id: <1536462862-11767-2-git-send-email-laoar.shao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1536462862-11767-1-git-send-email-laoar.shao@gmail.com> References: <1536462862-11767-1-git-send-email-laoar.shao@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In RFC1213, the tcpInSegs is the total number of segments received. While currently it is the total number of SKBs received. The number of SKBs may be not equal with the numer of segments because of GRO. So fix this error count. Signed-off-by: Yafang Shao --- include/net/tcp.h | 2 ++ net/ipv4/tcp_ipv4.c | 3 ++- net/ipv6/tcp_ipv6.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 770917d..66578f4 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -310,6 +310,8 @@ static inline bool tcp_too_many_orphans(struct sock *sk, int shift) #define __TCP_INC_STATS(net, field) __SNMP_INC_STATS((net)->mib.tcp_statistics, field) #define TCP_DEC_STATS(net, field) SNMP_DEC_STATS((net)->mib.tcp_statistics, field) #define TCP_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val) +#define __TCP_ADD_STATS(net, field, val) \ + __SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val) void tcp_tasklet_init(void); diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 23d7cb5..2b98242 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1703,7 +1703,8 @@ int tcp_v4_rcv(struct sk_buff *skb) goto discard_it; /* Count it even if it's bad */ - __TCP_INC_STATS(net, TCP_MIB_INSEGS); + __TCP_ADD_STATS(net, TCP_MIB_INSEGS, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); if (!pskb_may_pull(skb, sizeof(struct tcphdr))) goto discard_it; diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index bbf7667..8d4ef46 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1441,7 +1441,8 @@ static int tcp_v6_rcv(struct sk_buff *skb) /* * Count it even if it's bad. */ - __TCP_INC_STATS(net, TCP_MIB_INSEGS); + __TCP_ADD_STATS(net, TCP_MIB_INSEGS, + max_t(u16, 1, skb_shinfo(skb)->gso_segs)); if (!pskb_may_pull(skb, sizeof(struct tcphdr))) goto discard_it;