Received: by 2002:a05:7412:40d:b0:e2:908c:2ebd with SMTP id 13csp1180085rdf; Wed, 22 Nov 2023 07:36:50 -0800 (PST) X-Google-Smtp-Source: AGHT+IEZZqvyktogu6WMHF1GdOvO8QTZButN2F2L3HwRwreuBYk4gogfS1QeQzA6e12j1FP3chpr X-Received: by 2002:a17:90b:4d0b:b0:27d:375a:e322 with SMTP id mw11-20020a17090b4d0b00b0027d375ae322mr2597365pjb.31.1700667410298; Wed, 22 Nov 2023 07:36:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700667410; cv=none; d=google.com; s=arc-20160816; b=DoKWBB3aAe75sQm3u5vYRbA5BTNDtagNpJnk+M5ma9o7FvsAnOHA2i0d/kfR/CUAW/ egZWT/TV99MaTFeARUJvMV8yT9nKMfb0jBODusoyc5gtvECrYcZSFMAeQk5U3kxZIVky Xbs/RKVwQ1iuKl9r//hQHyrP26pkBw7l80F3HVg0tTaXVhL09EmQ5bn912rQZOHqvKg3 umRcDUbdi9aOIewXoP9otFlVkBFLC+ABeZYt1dL6Nd2fUbLnlISW5VE5YTAE0vw2UVdE xVst7hkFOnyhJgu1cbdlK+179Pidrgt9Ju2D/amvidevWOu+myggz6PReCtQ5pwTKANp mVKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=NffoDr2iKsGeTFr4mBuMqfTp0cna//zvVKT1QHK7ESw=; fh=Cd/xchzcMG3j6r6n1fM1/8BoPsqRJ9m1DH4DLPcnr9A=; b=hw7zoA3AASQAF9I/i6xuWp6g6FFnnM1Ak/KmXvxJyzcmq8kZ6LIrYiyxVnfDY9IVKi fsfLvurimCclFezrmbvJuvkchUitF9vXGzBrOLeS+8kBEluEIKjuDZPo3ptNqigxJE1J ZM4HDhCk/nIzKALPmfvLRElamhl9LLh4iAjOheK7ER7lPL5k/Z0vv4k8KCq+DU0KrmHQ osbiY9igb39vYvF2RcMFWkUwJmzZ/ElVcvx/AqZVP27LfBSdZvwQ735WOfygwdgzOarB tuoEJEwAXWZrw772QK2mymTUW7QK+Dm+9pmGgScLgzwRJ6T63XIT/G+36Qk+GlR2wA9J 1uGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZZgEe+5J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id mu13-20020a17090b388d00b00280a4a15cddsi1768375pjb.94.2023.11.22.07.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 07:36:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ZZgEe+5J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id D227D8089E42; Wed, 22 Nov 2023 07:36:19 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344374AbjKVPfi (ORCPT + 99 others); Wed, 22 Nov 2023 10:35:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344476AbjKVPfI (ORCPT ); Wed, 22 Nov 2023 10:35:08 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0560919AA; Wed, 22 Nov 2023 07:34:18 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F28D1C433C7; Wed, 22 Nov 2023 15:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700667250; bh=jY5Pv+B2njxLc3k2VGM7ymduhps1lRcahMa6vxZbHPQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZZgEe+5JWCRnZLYGvuUL+/RswY0S5GDMBasopiuoXbdAJWphhJFa9HirI2CDzEdwp GJXxLh9PvumnObV40HjWGYdrZTFo68YvufIw+QO7skwJE3sE5p30GRAtaWC9z2YSgI aA4KmFLJqhqIRzrgpog3oLHTvapW/EXTW1Twd99Xw9FRRB7nX+Qs/Mo5/vCbYv09zC uPFZ0y2zXDnRxgNT4N260OO6tHfY+aMi0yNj2yBPzm6g6uOKK+BRQsvnKZxUFY2EzF vCdKo7JVrW7qvMn3+KEWBq2OGS+k1cCda0+UykdScZTnv/HrMn5rqs8nhWiS4qfeEC AYIAeJtNtVXUg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Alex Pakhunov , Vincent Wong , Pavan Chebbi , Jakub Kicinski , Sasha Levin , mchan@broadcom.com, davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.5 09/15] tg3: Increment tx_dropped in tg3_tso_bug() Date: Wed, 22 Nov 2023 10:33:11 -0500 Message-ID: <20231122153340.852434-9-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231122153340.852434-1-sashal@kernel.org> References: <20231122153340.852434-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.12 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 22 Nov 2023 07:36:20 -0800 (PST) From: Alex Pakhunov [ Upstream commit 17dd5efe5f36a96bd78012594fabe21efb01186b ] tg3_tso_bug() drops a packet if it cannot be segmented for any reason. The number of discarded frames should be incremented accordingly. Signed-off-by: Alex Pakhunov Signed-off-by: Vincent Wong Reviewed-by: Pavan Chebbi Link: https://lore.kernel.org/r/20231113182350.37472-2-alexey.pakhunov@spacex.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/tg3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 0480b10701d5d..1eef96908084d 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7875,8 +7875,10 @@ static int tg3_tso_bug(struct tg3 *tp, struct tg3_napi *tnapi, segs = skb_gso_segment(skb, tp->dev->features & ~(NETIF_F_TSO | NETIF_F_TSO6)); - if (IS_ERR(segs) || !segs) + if (IS_ERR(segs) || !segs) { + tnapi->tx_dropped++; goto tg3_tso_bug_end; + } skb_list_walk_safe(segs, seg, next) { skb_mark_not_on_list(seg); -- 2.42.0