From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B50F7C43603 for ; Mon, 16 Dec 2019 17:54:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C8E12166E for ; Mon, 16 Dec 2019 17:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518862; bh=gqVIozMbV8/6ED/LSCxrq5AmMOXvoBr1JTXlHi5UOMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FeMIKohJSfizU+lZt7hjLuIQhkHjx7jH2MPN7rVx+bYVubLEBEH0UZ8eHFyKU0GTl 5GbxBvYtXRiPuEMtSib+2rujHTAE/kpml6T9DDcGVtijHWN6fNgRlEuhVUYuCxIiRf zyUPYYa0mtGBApxP7zBk0mPL5LidpCV0naruCuPg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727894AbfLPRyV (ORCPT ); Mon, 16 Dec 2019 12:54:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:49812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726773AbfLPRyP (ORCPT ); Mon, 16 Dec 2019 12:54:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 502FE2146E; Mon, 16 Dec 2019 17:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576518854; bh=gqVIozMbV8/6ED/LSCxrq5AmMOXvoBr1JTXlHi5UOMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zT0BnsukXSkeWqmQGFMhhncJFRwo9KoBOPeQ06yFcg9eePqwg9zLUOoC46CUpj3VS 5DXb0pBXZ51veq1Lo46TbH4S3y5igwJCPUuHSK2EHA33BRSRTmsSlUu6MVN7Lbs65+ qi7wi5JVD0InGd+ZxlRBzG2H3ezJ21jQajuMwAuo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yuchung Cheng , Eric Dumazet , Neal Cardwell , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 093/267] tcp: fix SNMP under-estimation on failed retransmission Date: Mon, 16 Dec 2019 18:46:59 +0100 Message-Id: <20191216174859.035168872@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174848.701533383@linuxfoundation.org> References: <20191216174848.701533383@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yuchung Cheng [ Upstream commit ec641b39457e17774313b66697a8a1dc070257bd ] Previously the SNMP counter LINUX_MIB_TCPRETRANSFAIL is not counting the TSO/GSO properly on failed retransmission. This patch fixes that. Signed-off-by: Yuchung Cheng Signed-off-by: Eric Dumazet Signed-off-by: Neal Cardwell Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv4/tcp_output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 5b808089eff89..6025cc509d974 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@ -2932,7 +2932,7 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) if (likely(!err)) { TCP_SKB_CB(skb)->sacked |= TCPCB_EVER_RETRANS; } else if (err != -EBUSY) { - NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL); + NET_ADD_STATS(sock_net(sk), LINUX_MIB_TCPRETRANSFAIL, segs); } return err; } -- 2.20.1