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 0B45EC61D99 for ; Wed, 22 Nov 2023 15:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344402AbjKVPdQ (ORCPT ); Wed, 22 Nov 2023 10:33:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344410AbjKVPdM (ORCPT ); Wed, 22 Nov 2023 10:33:12 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B075C1713; Wed, 22 Nov 2023 07:32:48 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4240C43397; Wed, 22 Nov 2023 15:32:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700667167; bh=dHrf/UhGnXm6rG+qQ+Q2hUVJvaV28d2jFcMrQVb1Y98=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OjB9lsNNSqDd3SajEmkKaP18A/4O+P2r8HY7A4aUivPnxQCsBPUyS51woeqs+JE1M elqFVBJFyqP3PPwpuiVV6kpHLfAa+B9r15hyJeaWoF7i4yYR6azizNGnB/jHh4uXc1 Hf+5Mtucs403n/pQ9dBGcnmiIdTD7bVgznflp+VhBPiViZ5g690ej68Ew6FBeju0Zd ZieXMRxo/LEDV5tM/CWE7ypmRUZ/9LTwpos5vskNErs2RwvOHZRDVi/bNoEOfhTDv6 qAqQBkC2WbHrSlH1mAnB5BPGmQPHsqznuY0D3CRRFPBlrRBlEfnO6GOodr4xvfvaoZ Bkz63sBvZi8AQ== 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.6 10/17] tg3: Increment tx_dropped in tg3_tso_bug() Date: Wed, 22 Nov 2023 10:31:39 -0500 Message-ID: <20231122153212.852040-10-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231122153212.852040-1-sashal@kernel.org> References: <20231122153212.852040-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.2 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@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 5c18ad10efc3e..b7acd994a393b 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -7874,8 +7874,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