From patchwork Mon Feb 17 09:39:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13977421 Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013020.outbound.protection.outlook.com [52.101.67.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EB4921766B for ; Mon, 17 Feb 2025 09:56:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786188; cv=fail; b=crIsuMoRUC9V+l2lakHglVMqNoMUDKnWeWtOdJ0JvNA6UOAmxFR2Pd1okwqobIQhnaAgMlib19ETResrZBdpXAff3h128ecTGo+qQw02eIIc2zeyiE/UVHz0CB+C2wslkdsbVbgoKQcdOynxhl86CtcJUKctTyAR4dVDSChuOd0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739786188; c=relaxed/simple; bh=Z5MLH+FRnOZi/8gfSUJIPu/ziRJyoqyDeDTH88SWovM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=nk9KFNHDl3BI74TTA5IgQDSGwZbihlfFOJ/1sqNc9hhI29kyG06h6eAhaZIq3Sfh+X6+cSj+N56OKEvzrKMxPEXnfWQYgvimLoAC5cFa6oVJEr0FGLlh+h7CALmqRR129PI2UQdpYISEGjJHhH6P/tL9VhpwP3mnq6c4WS4hXys= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=j8ZBHNPD; arc=fail smtp.client-ip=52.101.67.20 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="j8ZBHNPD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GNXiKGF6p/jOFNKGXs+8JMc6xkv+LSvFdjiKsLIjKnZrs8+D/jOpY5Dx5I0yNgev46IdfsUALD/Cd1h7N4gkP9ebUOrfidChao9ogzpuJqLV8dbv9Q2e/tyHY2wVJHdQnD6s3V1sxpDmyzUgcsAQZ++EgnLubndN4sPGTpZNo727+nmmtjQQRrGze8I9Xr4UicqYkoU0cB+XNTjQM24EnmFPQ4vWI+wGq3bgOZgrBdzwMHNJUkG6QvDpCFcuJMTUCdsoSw5E7G0QuS/My30Cecsuot3rXMK+nWOXI7z8jY/axNmkdNBEH3zGEvBksp5nasZQQxF45JaI2Ya4MMKwNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8V5bxYjuiFZc0YoMYFLe4abEuLcZOtZuN1nUb32Hos4=; b=zQp1lH1B6qSLBJUwiqUFGCkk5/gXPoaaqCFwOepLRDV/ANeClDnXqT7AIC1EI3NLnOs5fR8jeMzRbLuNBU8vLiij0ahP5bPqdmj7Vs+GACm1I9FgGUgZU1d4i1sGmQr2WmJ4s2DuQA44uRGGCDvtaR2az8Guoc6oiX9jj7WLDXXCqDBxzrWFjeimIgkde84jNntcw47o/rbvDMR2/h2EKCGHMi3eZN5ov/nFaeqPsh+PjpQijsLjZuWuYkLZCrAyBBBg3K6h5iq7ezts4Hd2SFyE6e8x0BZnu9FkImY19RSVWZqCQ/9IxyRRjqEx8zgC+f12PSQirj0Sm4Jzrjsz+Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8V5bxYjuiFZc0YoMYFLe4abEuLcZOtZuN1nUb32Hos4=; b=j8ZBHNPDlsje5+PVIjmEGZV1Mz7DLbpSpYZyWejqMERFa+GJwlRGNaaqUc4SYIWP1fLkIqGTTIEZIJgYW1YPpy4/LEBJG984+b5KKhed01BL+hlaAyZEqMFfOx1Z4Iu2NUcJqlufn0zLxAMW1ZXJ3uOChic7AKXl+fEgIwaBycJxuAxQwEt9pbrOW4QomyIbWUQFGb156XqhNtHXsFYf3ahT0ATTdhO6sDkzDFMfhNAzqWGjWryoWzIkFPqwkym/gCVNTZHjR2Ve+nKZcoJKxxAAxBSIdVL7C+cW40vAYT5K91SNj43pYIvSal5FQoCSZ9NimIJXGBpjTXYv+ZauPg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) by DBAPR04MB7287.eurprd04.prod.outlook.com (2603:10a6:10:1a4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Mon, 17 Feb 2025 09:56:24 +0000 Received: from PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db]) by PAXPR04MB8510.eurprd04.prod.outlook.com ([fe80::a7c2:e2fa:8e04:40db%5]) with mapi id 15.20.8445.011; Mon, 17 Feb 2025 09:56:23 +0000 From: Wei Fang To: claudiu.manoil@nxp.com, vladimir.oltean@nxp.com, xiaoning.wang@nxp.com, andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: ioana.ciornei@nxp.com, yangbo.lu@nxp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH net 2/8] net: enetc: correct the tx_swbd statistics Date: Mon, 17 Feb 2025 17:39:00 +0800 Message-Id: <20250217093906.506214-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250217093906.506214-1-wei.fang@nxp.com> References: <20250217093906.506214-1-wei.fang@nxp.com> X-ClientProxiedBy: SG2PR04CA0196.apcprd04.prod.outlook.com (2603:1096:4:14::34) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DBAPR04MB7287:EE_ X-MS-Office365-Filtering-Correlation-Id: fdf92d99-1215-4413-f61f-08dd4f395634 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|376014|366016|1800799024|38350700014; X-Microsoft-Antispam-Message-Info: h7afctV5AkP2PYAuQRmf3K5w4d24cNG2F5ir/B+e4ReDpcrnLooVJUol79/iygray5ImNREVoyBY41uq6unb4zcPORgdV05aUk6tzJ8ShcndOhUqGY1OFesXsXumlevC5ed+o8X3/jxWPFZauyyVohd7VF9AFSm9wce/SwfvOILs/pKkHmxNceAZCotnyKGsHeO374rpv1QM2Py89iaOPW5TXTI5BoU3s6aJrGdjODZuSK+JCUOAHkyUTVbV4/ZBK/X2QY+qyxzs6gPGYTCSZvIBLDswSKZNtKo4OrMd6C1E1DpYpaMc9OILE62bol9z+qyUsNZA9iQAwG2y97vFcahT/eRM4AlsxIr4w+l+qMXqT0/OlNsrNR6lBvTYwRTJbaNwMYg9x10nCKoQE56vcZ6C71yyU0JgmEjs0TPF4D5KaaG9YOjATzz7g60gspUNvyllncSFTkXeaP7BMIbikwnKx4rBPoaFFClm//bVe8Iu3LnAsP113Dlmx7fbQrKnuAUmPkngY2pyeMMJs9SNYpP6a+yBwHlNEWnEGQxn0lV0+g9HxdZJ+ZRayw4T5TqT6SMVe7wNxhfg8l+vTkA7kXccQ2UF7aqc156abzmLEtjFUSTOIeAIYSdK8embU9rgSIQaCqm2g87GWzPhYSv3LA1t4rfzeLlSAtNAqNZdYVl/dKWeDvVaTh76KPYFw6daM7/W9239Dm9k/XyY0hjtti5y8UBzs0kyM0guhQVdb71jMeWWnr0GTE2NpYVybGLOMTiERwKg4U8yoXEmShFRsjIb854ZQw7EXAhJjhXZnwMvBUMhRGgQCZDDJ4RLJA0zUTFZQsW8EDqCMkmLs0Bql+3OoAcGkd9Luow0a4GNt8c9658iBX2Kwq1z8t51gBNOPjc+oLBYfQf2gwvjKvsuyVv4qi3vzIVYDlzAlv/7eEPu6UXDjx0v7t0PzrpnkMS5g8Ev2baeuV4wWLxmChyj520P1m+5l2e5lc2ztZQBfZh0Sb9WF6s2MV+nXIOVsdZrn15SHlhtjJgEIAe/9I7AJiFZIAQsujXf2pXHL2yCUITS/+QxBSqLLBGWAJS7thivf7vwkLJXrTcwgIpiVSiOIPTGVAh0WDlICdrUyW/C64Kx/tqL8chu6VgO23nF0kQUon/ekGsBJXVmuWaHTNF9uHquR6z2hrQ03T5cjKlMJCNGl3rTHdwBokYlOR2gPpBYX4/wHocTv8JE4lt0xTcT0JYGJuD1gnFhyvBbrZc3ntFU/fuwqAJZcRgouvgEM5A487DyCvaJpJ3Rz5BpnPekYcLnPJoNG9GWJ02V7hVPDMzS4WRCR6DZnzhkR2ipoVtMpSs1KqMI4qkz93tceUVsgegqvAnWqcYbgikhs33mX/bUkpq6C+MfiEQpaEnKXpGVpwUJ0vmHir8Rqq077t7agyP5r62v89k4R/A7xa0OFIGntKWjcE11KhnEftEOBSks X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PAXPR04MB8510.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(52116014)(376014)(366016)(1800799024)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AuykpByE1q7bOxuTHq2LDxr+XeEG6Aqj2CUhiXXFtgUsXTaU9e8W44Qzbe1oiRSjA05lOCQMZ7lBPiW8HMsP1PslMNGUPKYw8kqBlMIY0UAlKKMMo5+r2IKi8o3qV1aNJJ7koJA/DaWlsTx8DI249bKfm3l0/XhFk08uVFBL6AT9Phi7LrbMFqBnQDxo+OG9T2vot2YJ9PIyWaU3go+uCKwxutkuWkt2yf9OchuIARC9vDK4yOsDPN1BD72GdTNrGiKHtJ+EBOTNLTh2+41P4IajkrpTHXX7tEK1Zg8SZEr2OToHHax3av3+QsyRJIkB8yDJTKyzugMux3CmPYm+BjltbGOoPgSnE9pCqbsOI9fcc68p6Udy+kQ/mvpOw1P8yDVD34cSdnpv+Cmas6RdrEqha0ZaNXIfi5sEoY6+1UmJsWFr5mVJQkwZW84faY0xOgzWg23DJKSspMZsi1pSdMpfGXDajkIWT4Gk6cniMOsG1Kh5EZ0YB5Cle/8bix6sad2vXXdHuSOBrETZsN+jxEYltnOo7Lh2GFmMuUKDyllvDhBmGFz4N7TNX84KVb6oO8Eo7WFUNlJn5PDl0ZfKJxEUaMny3s4Qjf7V8mDVG2sa0KycBCXHet18ZVp55Haa8Re8PuLeGjQ8XRwP4umxojYCxKArTHR1ryDW4lqUlfAkcmxymZv0lYxn7IvUFbsysmMr06e35GYbo+Bg3XsWVbxTdsvN6tHvXInQ85YU+bn4Nd9JY6ZHbgzYWDdXAj1mWaL/P6kBjsDpdnp8n9SLbIcP2YgGq63ZFomWSmF8iTQ8wl+B5evpiXimEEWvE+OFFnzJSbwqLm598LgSD+eFmlE42bq1D9oQR9LcvssGSj/I0w8ybf7CoN5nhUl2y0elXso7cVrYbRb0TxA09skkY9HZXg2+kc1bCdFyMfvN1jyv3MbmH/iieGcFJtWh7zL8iioZg5qHe+gKoJc/UJBcAWE/aG8oIde/izwdMluJJRmpKbpot7//nPVwexWFIgDnEITQh3pYvxeyl+kEuIa6YVDpOSoDpvWWeNLSh5jDOaiNdijf1pwp3KD7fa5liNGt0pQWqTQxh686P7jrbWSBqYjokWYAMkI7cifxAsJHa8Zt9vIuV65xODn8SZPQ8asu6V0h5TsP7bXVUAEa4J3WIMXhBXKznXPLXLa8eL64NEDfGXRCXF86KhbTxUSWjU9Q4DMGw6YOdou9gfM6lQ8L21hakpYWTXY3hG4SLRCQttE1uFwdlfUhYO/zHDew7cm6H1frIyyIjsJXKw7HOMIfb1lOoaAen64GO+w/yfLJvhN8K9TooKW2E+lJ7DBI7iyZTTgxZoIz5M0oGv6SsE6afSnstJPl6QuG8i2CB8xB/BM1wA8pbXoDo+bs0Y3h1K5VTOB5QlZ+MZy8ZNQl0WBwSDTljRFew6VzoefH3wWnHA88XUrhdKPpsWquIWsUEDWB2U71yW73v2zP/Iw1cLZ0G6UScVb57ONeDyjOS3tR6Te4WfATfcoRYrM5pXVjMyRqfyzajKA7WT59AIDK6Y/bNAZcw2G0JU1rr+IkbjQBBi1wytr5B4a+VCR30jCN9qYL X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdf92d99-1215-4413-f61f-08dd4f395634 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2025 09:56:23.8186 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: spdCMnOeQeadlc1nnfHjW5siTFQGAR0Hw6GkFB9Xbjda9NxILMu7Oxf9zu1QeNLY7alULxZHnEDgM/QSta4PHQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7287 When creating a TSO header, if the skb is VLAN tagged, the extended BD will be used and the 'count' should be increased by 2 instead of 1. Otherwise, when an error occurs, less tx_swbd will be freed than the actual number. Fixes: fb8629e2cbfc ("net: enetc: add support for software TSO") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Michal Swiatkowski --- drivers/net/ethernet/freescale/enetc/enetc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index f7bc2fc33a76..0a1cea368280 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -759,6 +759,7 @@ static int enetc_lso_hw_offload(struct enetc_bdr *tx_ring, struct sk_buff *skb) static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) { struct enetc_ndev_priv *priv = netdev_priv(tx_ring->ndev); + bool ext_bd = skb_vlan_tag_present(skb); int hdr_len, total_len, data_len; struct enetc_tx_swbd *tx_swbd; union enetc_tx_bd *txbd; @@ -792,7 +793,7 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb csum = enetc_tso_hdr_csum(&tso, skb, hdr, hdr_len, &pos); enetc_map_tx_tso_hdr(tx_ring, skb, tx_swbd, txbd, &i, hdr_len, data_len); bd_data_num = 0; - count++; + count += ext_bd ? 2 : 1; while (data_len > 0) { int size;