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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42BF0C61D99 for ; Wed, 22 Nov 2023 15:37:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344363AbjKVPhx (ORCPT ); Wed, 22 Nov 2023 10:37:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344452AbjKVPhZ (ORCPT ); Wed, 22 Nov 2023 10:37:25 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5C28212A; Wed, 22 Nov 2023 07:35:27 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A737FC433A9; Wed, 22 Nov 2023 15:35:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700667327; bh=DXWQiyLgU9KG5vqLf7rRBTiYef9MWXIIeD0Uae/lM+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T65cXr0tw+uBzYhd1PLclUPniUCavkXl9Vgm0VvNs2UWwWi06bXP5MT78IPcfb4sU F89ouQqL963tjvvXjPVL3ebBLo3rLCT3gaCoWJ3LaSCB7T0JCrafQsxPaxDEnGdRY+ JlXpxvsFEch57zD6ALwf/YmWk5SXRITLAHh9R9M/7Qx/q86G/sVKn/gGquoZhrr9H9 uD8Ox6sqLj75cHuqHuTlh1zObDlsgDylyRtIVFiCOmLCsJhwDByIhJDqKoehpiO77X VNlN5olF1+IzgXRfOdlAA22Z2WFirR8uZ7+hoiV0cgNhKtQ3bZl3bggCttIVAeLAoh /rTN6tSQrzRpA== 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 5.15 5/7] tg3: Increment tx_dropped in tg3_tso_bug() Date: Wed, 22 Nov 2023 10:35:05 -0500 Message-ID: <20231122153512.853015-5-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231122153512.853015-1-sashal@kernel.org> References: <20231122153512.853015-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 5.15.139 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 946b4decac0ce..fc487a6f050a2 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7880,8 +7880,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