From patchwork Sun Jun 24 14:02:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 933918 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="uAxOYZDW"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41DDXz572Mz9s19 for ; Mon, 25 Jun 2018 00:03:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbeFXODM (ORCPT ); Sun, 24 Jun 2018 10:03:12 -0400 Received: from mail-pl0-f67.google.com ([209.85.160.67]:41858 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751876AbeFXODL (ORCPT ); Sun, 24 Jun 2018 10:03:11 -0400 Received: by mail-pl0-f67.google.com with SMTP id w8-v6so5582761ply.8 for ; Sun, 24 Jun 2018 07:03:11 -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=ZNZXYE3+xRxIZ5N8kSeYZFBUt51B+mp8pyraNup2bpc=; b=uAxOYZDWzHjU1shea8tPJgCXX0ZCO1lB1YzaMF/iVf05/jLJ1+lbzhNiKokZNrcn/e KFCh869TVn4dtgoLkWuumLc32e+GxXUwuoJGEEuQob8gtswQmrVlGFZCDBjnJLq3J1ct rNJnJQwehQGVIE6KZCI/3abDQM0yoVXrKtFZ3m3VpFxvGpzD/9zWM5DJ43gTgMdh4mag Jy8Fv6RQAUVkjm0Z2xoHUAqEHAaVUgoN2Givk4FcqM5bpDHOecIm1ZeYjQZ/08q/Qel+ +TKy6771XhYuWwJVYnFLMu8Qe/OVUldCU2lsdKYb/jzC2+Up5VQN3Qn4SQTLXKley0iY WWhg== 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=ZNZXYE3+xRxIZ5N8kSeYZFBUt51B+mp8pyraNup2bpc=; b=W5SzdwU0LmxDni3wdp+UwYVTNSJfQSZhULD3/vtY9aXSC+Aq0Yo6e4DYGzeY8O5xQM jiq5/0IAPPuYmyonTu376ndtkDnZDf0coGxZiu45HgVAWO5/+bL4AjdJ18U5x0laUQHB Ihy2Kr6VMSVHgFIE8BUU9KxmE/PVHbYlFeRcEga9GIluEJMUuhstWHqgUYMp7b/lba92 nVAwQ0iZza6sS8MP4LtpVZMIb/jHrXtBlu3ztP7uZJYOnBz0QMbykIlAkAxzVHWqMErV d7ZwAJrBk6fFMAqULT9jj+PZLzhScHCCfPVMlUTutfrQvCA0z1ChVFUJ2Z1IAKemD67o 0gGw== X-Gm-Message-State: APt69E1HcwiTRRLBoqMdYhpjXI3a9uWDgw0IjvT3Ny3xbla7XHwvKGez f78p39EDJ0pXHUnbatHY7gzQZw== X-Google-Smtp-Source: ADUXVKIId5oCgOgeQ5wCmIOsCVznQQxOfv2XDaBNSb1vDHimY49RGshxrIdmRpOUMzdL6Yy6nPk29Q== X-Received: by 2002:a17:902:600d:: with SMTP id r13-v6mr1638659plj.70.1529848990833; Sun, 24 Jun 2018 07:03:10 -0700 (PDT) Received: from localhost.didichuxing.com ([52.229.160.192]) by smtp.gmail.com with ESMTPSA id p73-v6sm31502151pfa.142.2018.06.24.07.03.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Jun 2018 07:03:10 -0700 (PDT) From: Yafang Shao To: davem@davemloft.net Cc: netdev@vger.kernel.org, Yafang Shao Subject: [PATCH net-next] tcp: add SNMP counter for zero-window drops Date: Sun, 24 Jun 2018 10:02:54 -0400 Message-Id: <1529848974-6384-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 will be helpful if we could display the drops due to zero window or no enough window space. So a new SNMP MIB entry is added to track this behavior. This entry is named LINUX_MIB_TCPZEROWINDOWDROP and published in /proc/net/netstat in TcpExt line as TCPZeroWindowDrop. Signed-off-by: Yafang Shao Signed-off-by: Eric Dumazet --- include/uapi/linux/snmp.h | 1 + net/ipv4/proc.c | 1 + net/ipv4/tcp_input.c | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/snmp.h b/include/uapi/linux/snmp.h index 750d891..97517f3 100644 --- a/include/uapi/linux/snmp.h +++ b/include/uapi/linux/snmp.h @@ -279,6 +279,7 @@ enum LINUX_MIB_TCPDELIVERED, /* TCPDelivered */ LINUX_MIB_TCPDELIVEREDCE, /* TCPDeliveredCE */ LINUX_MIB_TCPACKCOMPRESSED, /* TCPAckCompressed */ + LINUX_MIB_TCPZEROWINDOWDROP, /* TCPZeroWindowDrop */ __LINUX_MIB_MAX }; diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c index 77350c1..225ef34 100644 --- a/net/ipv4/proc.c +++ b/net/ipv4/proc.c @@ -287,6 +287,7 @@ static int sockstat_seq_show(struct seq_file *seq, void *v) SNMP_MIB_ITEM("TCPDelivered", LINUX_MIB_TCPDELIVERED), SNMP_MIB_ITEM("TCPDeliveredCE", LINUX_MIB_TCPDELIVEREDCE), SNMP_MIB_ITEM("TCPAckCompressed", LINUX_MIB_TCPACKCOMPRESSED), + SNMP_MIB_ITEM("TCPZeroWindowDrop", LINUX_MIB_TCPZEROWINDOWDROP), SNMP_MIB_SENTINEL }; diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 76ca88f..9c5b341 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4668,8 +4668,10 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) * Out of sequence packets to the out_of_order_queue. */ if (TCP_SKB_CB(skb)->seq == tp->rcv_nxt) { - if (tcp_receive_window(tp) == 0) + if (tcp_receive_window(tp) == 0) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP); goto out_of_window; + } /* Ok. In sequence. In window. */ queue_and_out: @@ -4735,8 +4737,10 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb) /* If window is closed, drop tail of packet. But after * remembering D-SACK for its head made in previous line. */ - if (!tcp_receive_window(tp)) + if (!tcp_receive_window(tp)) { + NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPZEROWINDOWDROP); goto out_of_window; + } goto queue_and_out; }