From patchwork Mon Feb 24 11:12:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987855 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2055.outbound.protection.outlook.com [40.107.20.55]) (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 1EE66265634; Mon, 24 Feb 2025 11:30:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396605; cv=fail; b=f8+eQFXVD9LaAEVEaNbury+r20kF7gJc2+LhyyhlxhXMuqsf8WWff4BciXnRLxvdxLF7ogqz3Frmm9mny6AO2VXfmFvyNWfjvzlnVL50tQpQIjjyiFOYnbn+8hfgBeiFCUJ3NcFTcT4+WXye5X8OVcqlie4KAMrGVvX2U0JzU1w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396605; c=relaxed/simple; bh=NUy+ZJm8Ui6giZ+exkhf4/n7Qk2OmUqy+MM2O6DhyGk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RSGvTfeJKh8b+dDFhSZd5LaB8owLyCcuoVCgROmTj6qGeRuUJaHZNfevdyUsDeQ/pVLNsZdJ0zmb8Ec+WSLToqBro7T6W2a7QvdIyvexnwBqCgeXt58opoyzeZPIGkwm5xAp31cztIR7C5nmM0jgJrbwlCIoi7jD+cKWPPXEbCI= 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=UuHfgihc; arc=fail smtp.client-ip=40.107.20.55 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="UuHfgihc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ZprzPD5ZMxCF+7DeGwUc/C8692owjwgPhl5NkBMe0RwShnq0SzT7CJmtS4R4akRadurgSSx0gXcyK0STta8ENz6jqIuM4bqbS+qmDidGNibHT1SYC/gH9nNqj3amplKBymqcxoyYyoSPURS1CZK5AnnPY+Zy+Bj2pTia/kk8tZNaUIhRQgVwVRvkN/m9p7HG6wuTqlXBi4HYD0y+H56/8RjmsdaGWSgPfXZC02Ya+Ww6nkgF+ZLfbFggJEhRiKSp0Gw6XQE97a1kIsvSb0g7WEbrWrvXtIsm17JfQAL8WJ/KeltZKoy2N39R4gehumxrlB/DLk+z3IFQe8XiGVK65A== 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=jQpt6bOxgYoaIPTdlOEuQ3MWYTCAdZjfzIU6wchEEIk=; b=kMRVMlDPPUcdejLqyW6etMFJrBuatc/90sNsKfRmIfMdUlst/Sezi9/Spo4xzopEgiE2WeuFvPT8if4m5ih1vfxlfRovVtFvpQqqNxQINYLCIzWP3ODjYZJiahf3Tb0aGXgAOPi41UxIRtScEbb2cLp389A3712Q+A0hOmNW4EZ5tEget/nfUFOs+epLjaEEfE/+Fy0SAzFYzRwhzn5wxiIfcDR5ZdDLdvuvU4xIA4J6tnlMr6bPRbKRQVtZf4sGKh3sJnx3Pc7NwaDx1JHROoVcQhsepwRbjs7/vJCrLiWcvzMJnntcv97WD1veVU74669CjQMgRs+kyPT5zKQSrQ== 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=jQpt6bOxgYoaIPTdlOEuQ3MWYTCAdZjfzIU6wchEEIk=; b=UuHfgihcnLGrmTZF/Q2fiwXBCZj5VwJ/2dibc3DBFn6kxmrMMq2ZaZJxTFuJPglX+B0jIVHTYjbSd/eNK86wG/SUXz1Z0vHKK6lQFphPTR2kyKadDQKgNXh1sfiLuWe/dBZjnJT3WXscFXJi25kpq3pxq6gf1K8DJg/AZRWyMuBbUkPrhKZkdtF6lWZWEnL1A4Jw5B/rH2481x1VcB3Y5sp2UDz+fYlD0mgsFchOfIc2gj/ZhoDh/rkY4O6CapjKguWNNBZvO9OWHRUclRW4LeLFsPgQ779TXDZVmi4rzOtKhIG+6zbj1YhF9y9vD5km5GSi53LpCf17isu75ED5ZQ== 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 VI2PR04MB10979.eurprd04.prod.outlook.com (2603:10a6:800:277::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:29:57 +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.8466.020; Mon, 24 Feb 2025 11:29:57 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 1/8] net: enetc: fix the off-by-one issue in enetc_map_tx_buffs() Date: Mon, 24 Feb 2025 19:12:44 +0800 Message-Id: <20250224111251.1061098-2-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|VI2PR04MB10979:EE_ X-MS-Office365-Filtering-Correlation-Id: 306fd9ec-948c-4406-aa1b-08dd54c69152 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: 7IefXTgseQHGQT8oU0b1TlLHOTPuHS7q6kkdU0Rs/OFzkBAyvCs0udykmunYkFyaHQGYm3ve0G0eumG/fu+WVgqfaxnZvJhitgWlaGPHNYY3HmwDgoQGhKDzgvD77xgvLxJd3R7qgqGJaaEjaRVAgZgr3IbG3rWYDGh03x0WkRHYqT5W703uZMPu7NfebUE4UgnLMlv7Djc1zwJPVr+lUAS80kS5ee13S897l07T4ld0cHGMSx0F+dtnsus2YsBlGmt+jprAWj7bD2zCWHfpLCL2Cp6HzFPERVRYFZeUOgkVuLZ6FM1NTlg77gSxQseyV9RV7Zm3R7Sm02SEeC7KjQSDJ/bKQLVT1+htj5iEOjcQVGGpnui+uFtLcpCOwNIonKB0nzYkwDJ0GYwSHP7u0k9nk/2RTBbjBUWxH0Mi39iLT16JEyQAn9vGmvXEbitfaJWtoFB0z8SD/8gzIaM+VfYgyZ5FeMhtjLeoIFlVjGRGtM6CFKGty/BRWiw6UEKJsge95Is74HhFHz5UTNP+6xMlB17yDOsanNaELXUtTprsRrDIDMcHvIyQHzGIXy98r3Rj62Bf1UH3PIj54UKy+kXmypmWl7xOdsIDYtE/l7Ov/D6MiMYc+vYl+s5vlEl9auEk6yagK77poTlBtDn47Yd+vyGz7mW06yNveraBl1J2PSGRtioMxZJTwRGUCtG0Su9FqLb4fLCoEYWug7uxs9+xn9n0OGIgJNANUsnvoTY7G54v2XJdOWzYaXjlXRvzeIFgvg8SyYjKr/fiPTt9wv13Z8pUzUqvvYo9Ao5R5AMQ3l9c9q3s1ugGAzWqeiKFquuUryLetLmJ1VeWjq5AzUMKT4k2U0bvFMP8ab2hCH8hZQPCZZx4irELgxYy3v0S23Yqd5hUPg6+grV97pyWT3+bU3E2TEJICCfdpxby01Dq1xo4uubyYXf8vTLbjWoqvG8O/XEMYBdxHJM1KZzJHkgGQgVFnjDEE+c+prvwoNlZ+Rr38pzTzzyju04P2K0YD+IfBAqMTEBx71KmYysWS2Uwdt1LainUnlCV00bixqVFDdDXRoKa3fRO8fIMiZuTwo/1DHjWl1ZeAi70mJLz+H8gfwlQeMTvS7Nu022ATgVHnBmj0u3ORjDbMlG3BglapLE7T6F6iwOU3LP+CA/8L3dsJvpvu0tlTEtLc/nCMPT2r5q4EjQB7yHFyaxVHPzTJxoPjMWLvtOK4RqBo8iYx9l3KEAa7TsCHsO5iV2MBHjtYMLe43CJ9YfiqjM1PDbuivp8DoJN3G4pa+L3RC4DNvNR+yuKmRk4Zoinww3VUM0h9YhtgRmN/CAAx01JV65K9Qp8pfrezX4xHct5ea7D5oC7XVsAjzvhJJDK4+EiSZMXh6t+nqjnZyU0jcauJiBZvTHZdhAqne3BkI690Qtts8EwAS+85aFvgsLwEHx2lo9mg/WIpZAU/H80TCnIJBhH 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)(366016)(376014)(1800799024)(52116014)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nbBL1WeqE8HeEYVdNrMag2HIBmSedu47VLtsdrxgnhyMUGNtWuNGDx/r7m7yxvZBn1tnmMPbsmwjFlcKrjikZaIFxKO8OUMN35fc24gs/MI5SWm3o/55XpLA0F7IhWVom99gRjH7ejLTlziEzK/9TfGCXOiN4jD/1idCqTeLSCXopW0Xpdd4WVdJBGCLJIBMfEak4yrLFYxXTd2Dq5eKL3UB+cxBk4JuaR00uT5KEBXxoNu/rI48DUXWV+lxBf4vLjFU8KkHewobQ663BePcnZ/Db8sik0otY3NMQfA/NCZ0iLCMsnsXvHCoX0ks9gITHJeeMW0hRCxAiuUMlqNG1IUcER6bga8Y6PdNQGJSc9GaChsLYPvwsEeEy1s/67/6jOQUqqn897S+DueapT6zop83KPtPETpnhnQrUT7iZWYeYtYPqpKHCCmgnsHFvIQxpMjWQkb4rwFWrBAGhXYzeyNYrMBPeYV+z0fks5ixCcuOBzdwuXd/tQYczxbu1ePKvjRQ4iiruH9Db10I9CQ3Nz+v9F6nnNnYxOIHgQGPARa1le3m9RqY4/aXkkrin0nXOrTaHBYx84SN+4ScQeITe7QSjzNprUD29DT1aGKJmme7YZzRI1yvl6GDvoXgsRTclmuUVaRBBUdrjQjhEV3Z+L9iJOHFOyrenwyUt+7SkQlRgbLmP1s58zXRxEm3rs8dhsocMJJVNrpUxdZDNKkyrjv5M9/pEQA4h9PMvmhoTFCE507e0JpXnpBJWdUNfjGoq4sNJqRKoV+mFmFzzbgTddYHOsaMMMnLTXCPIMtTBic7aAPI9bHgPC82cHEHJHC7YMCvL5T3BxF+14EcrOIYbE3ddlWajdCYQYcircBdIiN1pk8IQ7MepdfpnO/tWRFC7TXFEQv6Uc8ji+wAEe1LzFSLuCakEtpujqSX1pk5uNcOe5UXXkdoSRa4iBF6COpWzW51SvZLfsnxz3pFUatKTuEtvGJ+Sksc1uduxf4CdvuZ+hszHRtMAKj44oTmfdDEbdILkNKtGV8KP7O/UP3GpzpQW+PA10CQZOUhXp/NaBj8ct5GzlogCkqLqROsEUtzswLnXfva543HDcxNgVTM+ciOgf2r3RsERFsloTG68a0cS4uCC5jLpNfXGR8zuwLZ7oRWmcTZJd2NEQ/tunLmcTTTqIbc0m/+6+Lm3M79TshMQjG/qlKxNWndztWkrcbqNfCw3nwgE2NJkZ433/VaSlTjaJBC+VnqTAr/ahKjT1wmFKw+cPFRvnVBMJ275+TO6E7GsXP0cDdN3gls8B/lo/j1pzuYADjfxBz9ChZRDMzmL4gY6P7ZCR7pTndmiZhj1czGGiQ3FZcZKX0XsrjP3RX5rH8fv3auY6GDeynPDnH3AX+OeVb7CbI3khRZ1eIFqB1lQ/Vxx8X9ap15nNSCyLSnFJ/qf/qCc/ilFkLBILtMziuDdFgyKH+YsdYsD2JhHVdYh8r/d7O4y/3v/870mmbQr53iIqQG74UHP/rvv6fcXWVMJIwZMmpsc3FO9DCn12G83n85HvjohRuAtJY8SNOOFT/kaknuVI8cZ++aNHmVf2jX7PZK7Fi6QgSwFJMG X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 306fd9ec-948c-4406-aa1b-08dd54c69152 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:29:57.7530 (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: 8+mzlKkdOf3FCrw8JzU85lf4rXRMJA/wqfXLRsn7f3RSH3F1mF6mehq1gYLCDrCtS9BKFTZnezE0ge/AdEgGsg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2PR04MB10979 X-Patchwork-Delegate: kuba@kernel.org When a DMA mapping error occurs while processing skb frags, it will free one more tx_swbd than expected, so fix this off-by-one issue. Fixes: d4fd0404c1c9 ("enetc: Introduce basic PF and VF ENETC ethernet drivers") Cc: stable@vger.kernel.org Suggested-by: Vladimir Oltean Suggested-by: Michal Swiatkowski Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Reviewed-by: Claudiu Manoil --- drivers/net/ethernet/freescale/enetc/enetc.c | 26 ++++++++++++++------ 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 6a6fc819dfde..55ad31a5073e 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -167,6 +167,24 @@ static bool enetc_skb_is_tcp(struct sk_buff *skb) return skb->csum_offset == offsetof(struct tcphdr, check); } +/** + * enetc_unwind_tx_frame() - Unwind the DMA mappings of a multi-buffer Tx frame + * @tx_ring: Pointer to the Tx ring on which the buffer descriptors are located + * @count: Number of Tx buffer descriptors which need to be unmapped + * @i: Index of the last successfully mapped Tx buffer descriptor + */ +static void enetc_unwind_tx_frame(struct enetc_bdr *tx_ring, int count, int i) +{ + while (count--) { + struct enetc_tx_swbd *tx_swbd = &tx_ring->tx_swbd[i]; + + enetc_free_tx_frame(tx_ring, tx_swbd); + if (i == 0) + i = tx_ring->bd_count; + i--; + } +} + static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) { bool do_vlan, do_onestep_tstamp = false, do_twostep_tstamp = false; @@ -372,13 +390,7 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) dma_err: dev_err(tx_ring->dev, "DMA map error"); - do { - tx_swbd = &tx_ring->tx_swbd[i]; - enetc_free_tx_frame(tx_ring, tx_swbd); - if (i == 0) - i = tx_ring->bd_count; - i--; - } while (count--); + enetc_unwind_tx_frame(tx_ring, count, i); return 0; } From patchwork Mon Feb 24 11:12:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987856 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2055.outbound.protection.outlook.com [40.107.20.55]) (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 52E4126563C; Mon, 24 Feb 2025 11:30:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396608; cv=fail; b=s+/zMeA6+iAp6ieN9fHa5JnsJhTFEwsHa2HVxMzfkf61rqnBj3W1aLXFwMGkYD8x11iS0dBYid/98Rb/Vvflf2lsthIWdzKEDLMmQNlCZfinc7bcbVjTBGwQCmrSETMVtcr4qnD1yn+IiHYjQE03Om1IKtQGSJZaDQEow/8EMRM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396608; c=relaxed/simple; bh=KAAJDoalKTwsCpB7ZllPCcya0N68c24/H7dxq53ILQM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=e9wLz9TygJgRWvYJeFB56ftY6DC6gpTCFikluxh2MCYpTUG3ICENw1yswT/g9qHvhJHogzTUoUFkjUoIHa8D3chSBpVlJRlWCSV3HATmCztMoO41JC/jIAKY5OTaHjckmtxYqd7m33oKQIQNQPNTKBrxnuXOQruCw1na61wCNko= 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=BPu8HozV; arc=fail smtp.client-ip=40.107.20.55 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="BPu8HozV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TVSa8BBsgvYcycbzs9nodfTigM4G1KVPSkpDTz/VlEOPjweQpfoYS/T73EyOiNKoZbBi8niQy6d0v6F0X8vCmQ6OwFWERGHCyRwUKF5UpW+VuMqMfVO16rC2J6bnWhUFY9Y/ANNz2ENMgoQrlTiyWR4v2p0GvLRMOUdQ6rNcKksGclmTBF54YOvZKkigkjMvYw6dJyfWRrxeAKIgj+iHU3yqZlAavYfFDbo9rHAvcLEUqbaGue5eKoSoyGXXyHaUZVqTTW0fMP2Mm2j/2MXnpaj10YfGTLEO3xF4n/hkk8YCh5A1SINWUxy1wy1TGzHaNAIPG8MHXJe74f4Z2r7qkA== 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=vZKeshtd3yFn09Lnhe7ez6jtphUb3/BzQxKZFmJzMaE=; b=FZtTVJkVwK41KPhhD/tF1vUbya8Z+LfwlJDU3a6IHH3KXIwJBEHFUFCNx+9vt3AXSpRMWImT5NJW0447+e+uYTxzzWJfI1l0SIWybTJQyYR9RWvLg+SrqIkrEyHJ2a5e5pqUD14gUXbTsgy6ki9oG9BxyeMfwIytiXpTL0DzKedIR2Ae4L4IreWnZjmRDWMxiB1gLrgyeWMDqws5AKarTixfjcyRPH49joQYkXDFo/HukZup2SDOZuEaUe0TO4wCtoqxfNkKdIhuIjcQ+GshajxBcUiNYz7SZKQRnscevbcB6OEHymNmr3oVwOaqyrTPmYAflYXnUvz/3EUZ0YfwGg== 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=vZKeshtd3yFn09Lnhe7ez6jtphUb3/BzQxKZFmJzMaE=; b=BPu8HozVULE7zA9AWZfpZUUBpbZizj0vuRcbMjHl0xmkGCYQc1il3rJNp8Bz62a2vUgW5j+uExLXOH2zw1c7AKw04dNiz3w/yenGDGcyATwEQnBqbeOKDZXQJkNbKedpT0CTjr8cs4Ao9Vk+az03A5ex8dEjycyiwEmjOdWRMVkbxrLjqODciuhwH98du3PAPuDVJz8cY/g8GlzPX/jmXiKd4K4BQBdmc8KqELxwG/5lLCRzC8qJGCe4Lwm3HoPwpl0wufLiPvmzRGx0wRUViLAorplGEjF5CIXfv8kepRyFQ9hakX7JHsMK7UlGgbj5eyguqt0proNRD0exZjxhFg== 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 VI2PR04MB10979.eurprd04.prod.outlook.com (2603:10a6:800:277::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:03 +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.8466.020; Mon, 24 Feb 2025 11:30:03 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 2/8] net: enetc: keep track of correct Tx BD count in enetc_map_tx_tso_buffs() Date: Mon, 24 Feb 2025 19:12:45 +0800 Message-Id: <20250224111251.1061098-3-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|VI2PR04MB10979:EE_ X-MS-Office365-Filtering-Correlation-Id: a7ea305a-dec0-4b45-8a36-08dd54c6941c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: v8ts9hON2lmqXfbome9ndJoM7kmDf0nUkgoVaAQnFe296hmeefjM7/uydosB6hDYT6fs++8OcrBghTIOF9qTXvEJNn6ALxspxKWMtRTEjp4ZZGUmU77Hn3xuE2g6WSQU6xDh4xq6Y5lyN6I6Qdpd9LVkGEfQOG2NnS580phpV7gtIOWUPk/+lmVraIKdY9AjRjvsVArmn4eedaSjz/nxpERo4OwA0wH0Omugm7Qt6t11c/FhQSlWYfiMXtBbhMz6g9KIrO+k4gz6AJdit3fRkYoLa5bGleGQbiDlBmKcXG71SMndfKiCx8wpjr2DQTPvuhUH8X8GaDcTGxaDztc2VsQHBhNClqmZ0ynG1ntO7XJr6YCRfr+JhF5KH+CbbKCq4l8E0WVIabe4bPuBCvvky4mO8MDV8IQAdeZxPqrOE8z+7lKSRm8A219iCldqVeLzCT+npoiaIuGtzSLjeXKgthZgIZJ58I5G9tw4kTjqkkCoZL4sPvXpp82BGvXgtIlMKSe70myhlXIDpb0JgrlrNb2wii/3ulSQRXVNoMz+iAf9nhDpUO5rG5Vsugj9k2pA28LemlACSOeu3fhodmFtTecYF0boit59C1sjnltH7QVRDG68DpEp/hfWY6SMeapz6MbEPzxFo/dyBu/C4mqbNhbxO8UxmzI0+EV+uiVm6mfUBcWCuqRjBkucNv5niKYlu1ioar/CHu+KFAE9eu+zye5/Ga3qji+qDw2dSPcsqsVgWivTNfSCDlk02Oo0Etm1hWW7WbFy8vfigQOTRaZFoaoyGOS2wg2llShbJibvg5K09QjolXtP/IeMPnPkRV+w+khMnZ5FUdnvHLgmPVWtonj3FLJLK/V+Dw5YfdWLXTY0a8AGuB9ZiqYWTqnSoqCG3GYXGp7OFSvTO9pef41n7ahmhyVW6d/wr2N3sJJCOsdkzI8gMc5hlDU/M+iXPTWfgyQC4VG1jyAia/MIxPV/cz366tBwVDzczklbsSfRNtkU4bFvjlnIdar9U69KaeqbieYu5eJRsQm+3j9PIz0WPoowDFP2zKCF9artsmh9iLceousnsjsgv4+jKJYSoV5rpbbjvx+4fPgx9p1zjj6N53kfRQPGy3EnPubiJvNrZG1ogOVuZjBbsmeiHnYJn5QkUxYpxZrcZZ4NtwID/VH9H2B14SwzoIensOk1f9NCPMOeD0LGTKSobmEzJaWVmoTrswLdmFHypCs6OVhTeXM/2qsGKZA0/IsknZhtL1QV+JWW3EtEf77meAWVVk5B68/pN7gwtkvDatD4c7o4oWr8Sgd3vpyn3aq1evtlW/vcToOESl3AskGg48b1dT+tLaEEDeo3jIFe5ccNN/EEIHyGt9sbrpTYisfJjxxCRXkOB0IHYGATgaM4+uVixeaRvlm6OmLCEMAbWWLZ7fn/ebvtDULY6pnXwX97xIY44Dzo2PCUTGEVegaCw3JO8ZE/Y1xF 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)(366016)(376014)(1800799024)(52116014)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n3KeTlLUp/YFc2LHsE5aZyvcpfJSBOvyVAa78O4jCL4xRlzqNt+/nIF5I/Iw5pQE8y6wltwd1YDdRQvqQp0tsOl22//RD05B6vKDjyInPaRyLrL2az6D6wQx2Sb7fnh5m6qElP6yJmcQtqZf7DGafbApGw+Jtpg1JtVBz85W5vcCWa/BL2d0Zt23Zoy2Z9c/973rotz2fhnBqkZYn2Hw9dABxr54V8ZPmDg9r9rYgMjrojfjc66iFgFFXy/2solcTP0bOyQ4Eh+9GyVTt/jXyDzOTnVkQHGrkPAEgBeR/NXUDsOFtjHZNdi14l+fgF7xTqFBiG8qBhJNmz6fJ25ogWHxaRONEp71YEKF5h8yys/64V1cHcI4jep4IPViZIPRb6wH6mNYWCJVn3yU6sWwaBE6NOWVdg8NTfqbcwpGgIJd3nDLWpsc1SVFt3S2YJDsrXU9LuTrbdlgIfILWPTyj9K9ouCDpl8ZVnSAtQsjVvCDBqfrVeSq/RSZakXytjhn09A6G6ErbsiWVugZTkiE3JuuQ40mMeaH0AqAAG2PcOJGzLwkTTShor8quoscWJg3IDASeWtqvbvL+uuY0kSarorLEyjlr2gJqyqOCPo4IwXgXEiUT4okvS9GwipxcP4MCxJ/eQ4sLHfvwOo1+Q+fYQr7VICIsPeMPrrca9Fnt4qZrh/oDtqTloB07SwGhqy6Wlzofp82GQkNQW39QhzuFWyeInjdCwFecFIP6Cg02IohJfUCdZldNzjDW0/sdUCi1hiNODKokGSapZta/K08rg+IKtfsUpiNbpY0RLy5gLPgB25u7wanFbLfBfQtTVyLSuTO9vKHr5hU8fkpYE2p2XbWU3Ik4ILOONje0WGTO9FDvnW+eCF5+wn6ztwYEcXmwm32yrKIqOHEHd6O71IcD5l0N3XAnYnGGlUJP1R+HnrAlV+OZvl8npyk2LMjoj1cc52Hu2xLG3BEfdiAomcQgsy4hSB5DkVJlKbIAnKNI/+TNAYa8btS3NU7XfsFKWhhDHRwTRi1axzA08fzo8v4AewVWhynPPySKwRtWlMBDEFCJv7FVvPM4pzIB+ptH4oqJa46JaPOmiZhHa3OS7y7q6kVqZbOzlorQ6LiBMnv2QpzMMUSQGDkwyrBDlsdhy0A/jLS/x+J7qVVraaXL8XZAtIhPXll6bgyriGXs+jCa1V3oxS+OjWVNXEMflBrKcOrOcN8fVOtun32NIIb4qKVORjPAmZg/hysH6x8AhKJdyUIseoK7E0/5HszW7zP0RIDOB8GLK0s/34RyzTpLZhPmStjc0YQgrzY0DuTilvZYL/aQfMuM87kNMOHO8hWIG934efOQuco2kgy0E63nfdC7CuWaz3d25YfgIn1FtPeEh3SAJv8sBc4uaKzORfsAgLhEuoKxKfMUmz5RQkdxRaFo87o+jyqu+q5RVj2HUmGO5rlvt9mtc5zom0ZAtTHgjuO1BUlZFIYxg2ve7mAd2N+qDqTFpzSwOsi+PE2w+ATXtN4fBJc5EeOxxlFhX8JAQ924EoVx+onT8g8c91Th7wROJeFmDBMJsH0NVMA7VDXZyCDGiI/wyvBoGo0rXiddeh5 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a7ea305a-dec0-4b45-8a36-08dd54c6941c X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:03.3684 (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: ji+xDBtgiFOKY5Kxq+8acIm83NCdwSSpXNnfS3IBceno8IcbfdbAxQ+IAuvf9gOsRj3oIpKZ19mWXQswWFa+Ug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2PR04MB10979 X-Patchwork-Delegate: kuba@kernel.org 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 Suggested-by: Vladimir Oltean Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Reviewed-by: Claudiu Manoil --- drivers/net/ethernet/freescale/enetc/enetc.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 55ad31a5073e..174db9e2ce81 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -395,14 +395,15 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) return 0; } -static void enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb, - struct enetc_tx_swbd *tx_swbd, - union enetc_tx_bd *txbd, int *i, int hdr_len, - int data_len) +static int enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb, + struct enetc_tx_swbd *tx_swbd, + union enetc_tx_bd *txbd, int *i, int hdr_len, + int data_len) { union enetc_tx_bd txbd_tmp; u8 flags = 0, e_flags = 0; dma_addr_t addr; + int count = 1; enetc_clear_tx_bd(&txbd_tmp); addr = tx_ring->tso_headers_dma + *i * TSO_HEADER_SIZE; @@ -445,7 +446,10 @@ static void enetc_map_tx_tso_hdr(struct enetc_bdr *tx_ring, struct sk_buff *skb, /* Write the BD */ txbd_tmp.ext.e_flags = e_flags; *txbd = txbd_tmp; + count++; } + + return count; } static int enetc_map_tx_tso_data(struct enetc_bdr *tx_ring, struct sk_buff *skb, @@ -802,9 +806,9 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb /* compute the csum over the L4 header */ 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); + count += enetc_map_tx_tso_hdr(tx_ring, skb, tx_swbd, txbd, + &i, hdr_len, data_len); bd_data_num = 0; - count++; while (data_len > 0) { int size; From patchwork Mon Feb 24 11:12:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987857 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2075.outbound.protection.outlook.com [40.107.20.75]) (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 80C3A265CA1; Mon, 24 Feb 2025 11:30:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396612; cv=fail; b=E3B8EEcbfRDRP0RuOYodzOt8MuyV74L/q4+/5KZyIfI/+dFTVYbn+Dc01Yw4Qsy2ApMyq0GWEeWuTFXknC/97TqeDkuRL53QHaZmDh6fu8B3icC7aRFUK1Kd6tdSaMAzD6+NsW2jZUhikhwYGRdYPmD3YDNtMfWM6YGSU7sJr7U= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396612; c=relaxed/simple; bh=9o8FKHeSGr6vgEztE1GG51oMr3iFaTMfwNNh6t/6yMA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=uMOIxGOSoePUzy8RwMZuiKcry1vBSLhPZjyAzsydid8Ssj4uv0LoThwLn8G2ZddDczgPb54V6EiMbrsGdQFfNHil/QKFCVy9Z3NLQqCjTRRDQP/snzciWWs0gkJ/0ev1ctph5e7KudAARhdT3jJPeOAUw0fnoyNQ2fGAs2McRiQ= 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=XmZAodlv; arc=fail smtp.client-ip=40.107.20.75 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="XmZAodlv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H5j+HAUL/PC5RIfIZBqlKT9r8eAqpLhab92u+lIFOdcOVdJqQ6DxC3wYZiWuacBcN3s3OvxN2HBnJaESMVtDt2pdsTSWZxlJzG9Zm3pb/tcXUvdwNkvtdfgWrqOrGNHyQ1G8L1HlqU6S8JUPt7wymat2Q78UhJCmnTRM2XrJZgWCF6G27BBBCvtlyEJ/RfEPgWWTMCKR9UCOfFcp+lW3qPnKPQtUZibkkxNxAbNIQboENFWQmo9j8aSg7VukxTTpRKDggGpXM9xKaU1ESh6QgIJ9YiMp1das0iqw9obD8tP6e8vi6mtfDD+pg66CcJYtW2Yc9+ECdp3jTX4Dd7q3yA== 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=0c4W3rUmG8bmvkYkxIZHDtDHwzuBGlmU9NFFMnlI0pE=; b=eOOkuQwacRSFbqk/MYp4Sfo20Lb0s4nrhWktlWtNF2d6G1eFkwtfnPsiNlPJUtwcq5et8Bj4Wf2TUivR06naN1eMNMJzY+SPhBU47sS7IauWJEzcK+S2Mc7T3yUMNhCFESuxAyP55xHoO2vrMhd+4YhtxZq35QciCFBsx4UuAUqaXj6KamFLBcczX0pGlDUPO74cYGZP25vsh5/+Uhe2+UUlm0Rq5Za+EUSL3L/08Q714kgdGHmV6zL4gnLOqTGP6dJp6rZZtCpq9n/t+XWWqCKnLma3EZCYmuVKScNkTz2Q8G6q3e+wyIzV1K7Nk+CBb0Hft33Bk2Lk9mro3SgGog== 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=0c4W3rUmG8bmvkYkxIZHDtDHwzuBGlmU9NFFMnlI0pE=; b=XmZAodlvqVgc70t4t6OOQD9OCrCDAv/96xLqx4rWbqCJxGfi3SlrDJz9Ab2kVTC5CT5uVI9Ki6h2xmEwNUNpS034fAH/+q/t8OBzJ2NsbTJ+PCCZMBwkqSDndBZOK1tthnmQqUmCMP9GWx/LCWsL4NrM7DTf4LQuiwKpAY60Yw7T0L2Tcd4TAdHUdoEkCaHuXmTDmGPSGstT9hiRqMBnRgGohxp6LNU8bQ35H48NmT0eo9PNYXHNasG3Q6Ub/Sx93bXBIGGrjdIdzTXklQYQ9wnsBXLWCo4n2Lg7Rvrt/hwnqeiFkOvVe01ghbfQgIhZLdcJApcf/ZhJyeXL3YXO3w== 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 VI2PR04MB10979.eurprd04.prod.outlook.com (2603:10a6:800:277::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:08 +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.8466.020; Mon, 24 Feb 2025 11:30:08 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 3/8] net: enetc: correct the xdp_tx statistics Date: Mon, 24 Feb 2025 19:12:46 +0800 Message-Id: <20250224111251.1061098-4-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|VI2PR04MB10979:EE_ X-MS-Office365-Filtering-Correlation-Id: f54e2eda-f881-4fd0-6b2a-08dd54c69762 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: qX0CkKlWcrJZG6fJKq/AXWPxAnOjN9s6zUZc7dgIyVckDKiKMXSZVxmMtwPWdwYoScfsghm+ItBbNslT0gE4nPL55gWTmAmqhQ0e6tK68SjfsEAF5bzojrHUk2oRVCTtzr0FOe2vpS/pRcYw4Cbk/LU++xNPEdS9xjnnRXbjdt4xM7v6s7Ihk6ejPbKnwAAaj12MEHxYbJkfhluvrOrEJsrKtvqrO18zIZaVDhtestwZ2S/vgrO1RIAmKG8VZm2PQeuUxyRMGYoNZfkxY0yUZJ5+n3Nd/I4bWKe42kAvHcHCYSWiOFsHi0/dK5dyfB9IiV7zFUL5KC6lljNVfr//TD8/pPvVHQmSUyEsC50xY8grx5vNYb4YoS+VNqjbAxrhZgyjYzxKVYX7tIqIQpdm9ybiZhU566lwwnz9+zDnkwX0efm8HSc6y4pMT4GV5OfIxV7ildUs+64UGTCNDrMqLIo1dYwZYlqMzZwMiMpPen1QsLKM+fj5s+svnt56bDuo0aHeH/LjsXgy1awKDNuxHsW7tfFVm4WYQTrZPaAFA6+OYIbmjdDk74sNvtbj/pL3z/2BIcxkTD6DUmtpHtFjZvfjkXxiKUMO4YwxZB3Y8rNuaA18uiT4IDGoMmoxk4QJZ66ezNFKRQhL70pnUFv13D/J8D1C4jJI+SRpenoSJWcdT6DplgLifgY/RYhnWSIu0bk8Oc/NgLEBSegCa5628Vq3ZJF9Epz3I7OFCroXYthF4UOXWIcoyiGYBZsRZSBWxJtUUsEVS/5IS3BlKWWASE38msIlelJTgIhViWIxy3GdBv44Djq6XJ0sQLTGH/PwFsixmoYSuM6MfagfTj4U7gvzRyi2XIUCq83HE40rj+hi44C4SWI5Sv3sMbaaepgJPkK9XUNmrPaUUJjELQuo7l5aFIMdrz2y86h2Xqd+Srsaqu0AA38PkDzaXMUnsGHu7RNglwxADmLV6ea+nJPLjPBUTJyKFJbazG9GyEbpjEDMxP3wDO9QqW3pTLFaci/S4AR0BhGCuHu44NLMAeGq4XD2iGUJyIca7gIiD8NM4j3afx3Uv813QDgnh9V7oa0DtMMIzwb4o9JM4KoSPXAXB+YJVsmuuod/erlxtcxXPqEc8agNaOfXINKEXAGqX7uCRzsNl+o3DBaeG6ODV4JKS8R86tPC29oVPtEdWMQQ2qtKLZQrRR5LgdChRljy5IwZI6fmg9TBdria821T8A+zSi6aGfklV65v+I9uvOeU5vQuWLCDh0QdkJqi5+Ud5CDWyQ7fvMNcGLFGeZ3X0LDXhivtLqdBQ6p2V0hgnyWNrxvnYM7PK8OhzyeHlnfFJvW7QoJc4MVsL8pYOr+SrlADGQX8GuMKOJQgcMde+bUZ6YHBHssQuranV2c13SqudpndLtThVZ9rsoyrQe4L9oV5Jb+jnGvNBPutBKnYZdV/Bs1yEWctbotgLGLi6JwN/icJ 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)(366016)(376014)(1800799024)(52116014)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qRIo7H/eOjLuFqGbzJkCWZezDUehAWeydNe2bEoJRuV9uQUlRj2zMUtgqdZp51MApb+oGYi9omqMORp49ak8oDXJtManv/+p7NmFFOZTmvNIPWtvATTD9JQ4N2AKLUL+cTSQL4HbNWvhgZcwUh/4eXe6hDWQV5JQXv0XabF2o9dQqHx2uwX2tgU0mrqa+ex0uEGqucJJm0QJJyIW+xmKl64jeFz3v1wBJ2H+sXbtue4C8zRHuNV9sQ07puOM+0e+17ti/KXi6pp3AvKJJq4FsoO2l3YE4K4fFf+etii8FfjtSO1u7UKTs6i2GsJPJYNTZ8WxUydkFd9n+TW0MTDbMdeVubluLggJTKyzCJjxP3PCJ8PRK0/nUbKvPOyllUQkCmTd6G+E7jxDQr6uvSnSm6rr24uF1mI8348sZEFI56/dozfagl3OzM2BT7a47t+AKksEtv8Uj2NyHHic2mNc429INe2GJtBOy7jD08BgNDe9quJrXpxj4c9XNM1iyxzp1QFjOYTEtLE0ET4TKCjKrK/7L0aV+GLs9ZznklBRsCvAll19F/ikeEf5oY9bVmSuqpgmWTkeyYfcU+9QDKqW18Xaggl+kwB5YS4ZAsjTqPvamW8jDa9GuDCi3oc2tVLznWTwgmIYIFiBGDAFECCGcxZ3x16pHKIjLfBGuSFiuUkZZFO0XkcZWXUulkxiBxd04T+QtIHC87SkO0qHNnTdVoWEbkZfJWF3AWOTk1C2apxx4AGssZaynhfplLoEYPvReo8bpzQr6IbCy7LZ1cPkPTHOJH5hUxJ08CMm1Wg+ArFWcFhjA5S/aJgvz/Nz4KV9uCAaap6FW8eUyw+sty6RfKtnI4Zo+Gg+jIN4Da5TN2U9kKFc2AHWlo5YDR7ekp0KI9KJz9a4wFoNTtZhhyslLMOO0imw83/zJgtAtCXwo+ahlKnLdXPJmANbsgOXgcBONsICKBu3y/CWsqFMkWenEl2xuZdd/1HESEPF3KTnrXvRWOjBc9KMIQRiVY7f9RyDX1fjRkFrPpJgstTnFXG2OESQHN+7CXWAoMtLt2CLyp210txVQy5mh887nH/93wkew7ichfhxI2mP/yXpsbZPbsx00bBCu1pPaj9QH/rwtWCasBNwpv66ZlPa64cZDvRxljutoAw8XkCnx8cAp/KCb3sTz5tqO4QVEsKyagWbm543U61vdKpomibGG8Glzd4IJhDel40JL9GdOigILs4Pal27TPhbAOmPD66NPJRTrt2l7usiOFQzWdiuxPrSiB6jxIT9x2iQULTL2VlXvOIusiwqlGLBsb9YFqFH3O8Nu1kVw7bFiTip5yLHFcn+kM0eWvAzawA5duPvbJ2r96ssGZeOOqBYValyiSTvCEZ2Ftdu0Z/Stnu0USLR4WDmFkfzUI5PXJRBQlQwYe3DvuzjDind7f3RrQ8QQMqOLorgc9GqzpMtUUeDqb0wCLqKI/8VpJu8qddty4zUHomw2hbL+LN9Qu0Uf/kwTvz/cQPHZT3Pk3d8+G3oCJ8oiNpklid51zQUlpXKay/YfgNACE4PlsYmPZc75H/CyJ+9m2c3derxpQcPKFXe265iLBnG7Nyw X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f54e2eda-f881-4fd0-6b2a-08dd54c69762 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:07.9839 (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: rarq1EUiH61j/rA9+pRVLUAkD0uTPq9sfUivVKORirhQRcfZlVu3MO7e/Ova+fBPGM81VO6OGJTwV/1qJ/pToA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2PR04MB10979 X-Patchwork-Delegate: kuba@kernel.org The 'xdp_tx' is used to count the number of XDP_TX frames sent, not the number of Tx BDs. Fixes: 7ed2bc80074e ("net: enetc: add support for XDP_TX") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Ioana Ciornei Reviewed-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 174db9e2ce81..3cb9ebb13b19 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -1917,7 +1917,7 @@ static int enetc_clean_rx_ring_xdp(struct enetc_bdr *rx_ring, enetc_xdp_drop(rx_ring, orig_i, i); tx_ring->stats.xdp_tx_drops++; } else { - tx_ring->stats.xdp_tx += xdp_tx_bd_cnt; + tx_ring->stats.xdp_tx++; rx_ring->xdp.xdp_tx_in_flight += xdp_tx_bd_cnt; xdp_tx_frm_cnt++; /* The XDP_TX enqueue was successful, so we From patchwork Mon Feb 24 11:12:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987858 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2045.outbound.protection.outlook.com [40.107.20.45]) (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 62BC3266564; Mon, 24 Feb 2025 11:30:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396619; cv=fail; b=k5WKqEpmfu7V7b+kc/PMBCuouryZ10pqgFmD1GJYqH9UWhk8PE5Qt/NUG/tTqm7bZTWYrpfDWS+DAkOnhxzxgVyXdm+DXR397cBQ/JA8Bj6QRpOsAxOmWefxG2ldD4VgxK1RbZAV3NcPNTGP+rI6pcn+XYl0C8JOFB7Mqc11eoM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396619; c=relaxed/simple; bh=d95uTb4E7SjfBKYC6VeqEdGb+02CUvsjO4h8I3h3iHE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=PIPBjK4l29hdoki1mwb0fdzgiw6YsQUWjKQfbmqpnVjLbrOlMG0USVW7gNyVN/nwWyg2hJJ8VtjGESGwhlSdyG9qja4qBmSZWG5ysUevkP8eg7ZPZYm301fI/a4AXnl5SpfkFMeLkjB45sUVJoWIURimMatAoGfexHJWw2cFo4Y= 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=kgTOixJj; arc=fail smtp.client-ip=40.107.20.45 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="kgTOixJj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l4M6vexMeXP0YnaSIs3s/LqKnjYgKYYedYH5sSmQhq1CbvPRA8ihPmcg3GN8bPKBk5MtfyH92UsyRw8q6hNMEThudAJjFbLJIFYQny8KXlfYwmRKji5VUgCAN3uhnXTw9tjSnn/IdfbawyYRSx8d0UtnDerCJVyb1rjx/tBE9b+qXim1Ae/mFCsWVuX+wEdhDUoRmu1/iOPtOLuftwSuUYKg3QZ0TR1ImX7JjiOWCfth93a8SjAB5JIRrdk3q409cTTf5Obunl61oYqdp7UqX+csb6nNFzh9dCqm79hhMwXm9VNUhXZi+tA2JUGOB9OyqOw9RYqULSSgnX8VqFWcaQ== 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=ij8UVt5/IyMuo38AK4TIiXaYZd4zaRYhb6VVENBCn74=; b=v2P0h2zEztXV8Q6CXPg9PNuI1R9nWFyuDrXe9w2HReI3+XLM7DD0YAuufs98zF8ms25m2zZMR2O02dbM5SrQE1YUMDJcG1nUSFoCsQyVHrMDx0UUzO1GcpH78JaRy0jCSEsDWQcN6aLWovB8ix/Io/CcK7SFqs1MDYXbwpBFoa2zKB1cIzFoSw0yi1KCp8BpIiEn9hD7q6iMCdU2BsSB+cfr/rpPr7f+cstVcUdvJ0ZN8Cm169XbTsiT0LA/aSPDAam/omjUuFh2l/a2su2xmWuK6uEOGOG28jY8v+2ciDH90+ZSjmtvQall1XHCyHwLQzpNhPuzLvCbcpAymBs0+g== 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=ij8UVt5/IyMuo38AK4TIiXaYZd4zaRYhb6VVENBCn74=; b=kgTOixJjydcqvKVzGl8F8kDsH0q74DcCf+LDVDhT8hptI8lwpMbL1cb4ApU/T+F3ynf4dCB5abWe0V8fh+9oJ4hBTIpd+Q7to2Yz0MntNjc0j6E8sG7SxuQbMyiLfVwJWY6msoCt5WKn8i2xCohUw/lJuyf+jDWM5vbyLYvREZEKPSVLGHIqM/exL2dJlS31UYJIKf1ydwQmKZ4E4Q8xP7AHWDM1rP3e8NskdaJ+Gv4uERum55EaILjbHfsxcNC0N1AsU4hRRX0JHbJIzdhXzv+3W9sctGXgC1/AC5cplcIYTU5CHVmMbIBezN2vbTl9oZjrrr8ikXVuA+7d9pMk4Q== 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 VI2PR04MB10979.eurprd04.prod.outlook.com (2603:10a6:800:277::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:14 +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.8466.020; Mon, 24 Feb 2025 11:30:12 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 4/8] net: enetc: VFs do not support HWTSTAMP_TX_ONESTEP_SYNC Date: Mon, 24 Feb 2025 19:12:47 +0800 Message-Id: <20250224111251.1061098-5-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|VI2PR04MB10979:EE_ X-MS-Office365-Filtering-Correlation-Id: 8bb36ff1-9b55-48e8-d0d7-08dd54c69a24 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: Ms5dRkBcZnQ/Pm9OIKVcSrM6LpN4ULwRBXqs4eW1FbWYmOlheDXkuvYWOKM5/e6HSA9H4D1j+o/+ovr0HK95gX0QEBbRWQ7VOFdvyYV8eV2FOZOItheHscrB0em31T3/qVXTTiukZ3DDeM1TVxuarUrjopAmMWOWfxT8f8I6KkHTUb6N+BWTaSRhohnhLG40RwSm9XbwxdVKB3aezwKna0X6l57Id4sv1rPSMkXpukTrAhYUm1HgSoWgkL014Q8x+EwICFzLVnNAg65K95Zkkg2IXxpZVjVOeJuS06EGGKUrsY3z17tYWrvb9Ka9eLKiwKWr7xnWqGPvES0K1OplxsOXTBT6H9eamlPnXx4GruNghErHS0ShlA+qRm5AaIOyN+JPSComevrH/As18YNTbjBAEBE/yD3Z3d3cd+Nou9nsBxR4ZICpEXmH9L/WRebTOFn5+cNxEAUonm1kvPvBhD9+eP07UQlLOBel4lzHKSATnl5e1UQZ/2aivwkN7ZN5bHnRb305sAo4FdbX4kzOnBayoogDYuwYbtJgKbT9vqF00kOf+v6ojsmjjGOAHNwNFwfSOO0OhfCFTLuqPNMYPkWxaV9CibAnVTmU7NpvyaIaDBljrGrvh6GPVYG6cTsHTKGJOIcYNgat+Lh0D0813u20sVZI6TzCAyDB7wJPnyfQfB15qVa8YoK+FISnDONd88PyG/EW54DMCD3ioFzzci6hWjbol8Z55TxEo0y47nw6xwss+24tDJtyZwT0G6EfST32IdQIIThbeo/GR0kgjjZ00Y/gFLS067poPmSbUvoLCB/Q9ccpuGP8C0RG411v+rdWt1YUSGegebzFr/55iNy1xEb4XCYSfAym1N8zsjEXfNUN3+2Yd4z0NLODSMdsrG5rZC2Kicqxbk73ttSHYGIVeJVZHDbtcg23ZSWXnTO7gGNhJutao93Er4FGokxbSB1vRNF3UkCfw+GdkFq5UNF+q3qYSwGBhhJGD0XGYrc28Wq/YrVs0UUdMPPHW9vFCH9tQXFUU+tVA6Azgy3AiHzQCu5ll2jE/UvHW2R75VtYJRAJ+JdazAK7dHd+i/sUmlUldDmhN/2egOUma4IktrqnPw6aKhVj4qacZWsr78leFkDmCPPKpLDmcbV1z5UPs0G3Up5F4Q7KEfVVveZODO6W77fX/M6MLJYnakc8D1RHiR1SnATB3sVgsBJkNpZZ3T+/Ylvbn4Wd9OdZNg4Pnhb5CYW8M3PUbSs0u/Vhb8GEHTXcJq0zzRi2QH5xVnmlpAPx4jVMfFkY3AoIy7NTacPm70snAkqnFVbubW/vifFTUVGaopI9UXuxkvmTaR94CStXJqP+hQhzRgFxzwPDwpXVdI+NRtsYjTdUaT4RLX/zZvEogZfgPKyzOahb5Xb7sf6Qf3ZzrKVzu+ukBgw14KybuCjw/k62NNzfFhs2D8YmU3Hr5jKsegvTAROnHKL2 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)(366016)(376014)(1800799024)(52116014)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Sm/9B5PYinPd2R00i4nSdlvghfwSKB2LzioixRuDAly1gIf71ZeNevCTx1tO5w7MxLVpw/hpvTcH87HdJxH3ibvKeDnxXGF93wnKZ9cdyLPjMceiS4xsAm8j8Fk6Ah1iJS2wyOcP6JRKMEUtdpYl4azyK/gLheLWffSsTm0hRPvK1J3NweCkECa+1vh9TcZCtsG7lp7trOAkkTtmDFKUo+PPkjI/MS8kWAHnxKEZIKS9XjOQ7dmbifdxLZa39RwrLg5Zvm3NKum+UH2XogB7BTDcQBOchLEK61pd+CB6AQpSeXTeKzMdSZWRP00d4sVY1hcNkas0iAc/wC+WAxErv02HQlF2vpVwf3mNH31dTKGk17BVVUSxePtfUUhF54lnDOC3675Od77BqYe+uFXj2FDnB+MH+jc4tkyWRkDlYsIfOR9WhTLrFd1OFCTY7ViiKqMhyajMwk2UvAsTOBZxrQqlGmDV1okScqT/8pwpXb448rgDU6an9N4E89anDac15d8r5Ja5bdu0FCyNmYOsrvAcMBfE4p+AqBZGAYaP8mJkWBmnvd9ptDz41yb+D7yer6evGKB5vcIVzKUiAhWtmMY0lVkYaQV2DmHBE6S/2W5+HgBXjBCafZQpRczZCXULZXoQrkncQ5/ShHZHP/QgUuILt0gzHbspHDh4/IyDSs9LyW9tyrKG1/XhL3ZNZTcqtaWKOWhW6NJmLp0nmBdV1G5k2dBACP3xbShTQB3K0RRRSrtDkeF1yVQvFPBlFr83ZavkJOOdN2Tz2IE/iu/G1RP1DxzfrZJLVUvdw7B7eAu0k4GLo+EMAkrxlGz/jLvgqbj6OKIwIjVqSv5LvDKo0DGLytHZDtQXj4ydV+BmyyOITDe6lnz1itW3DTlkFuhlDdH/HkNzADj8YiHkRley3Zy89zhGnmlXzcUeqxznutzSmLFY+OOZLVvFebeO+w46sX/UAb7HdXL0kdnivM2Qn1EpzeLoePjBa4t7jzuBFkMXR8PuK3rNIRFB1/wqjKRH9iX9covM6HOTZRRQyjD5SCthBkO7p+SBImFz3kc+IgImMshBAp4Av+D+eK86dQOLDOw7Eyj9NFt//zr6Vt4sX87c1l6J6jkWqyaSnzWrq27Gi7noMOdKHV6oBjzjrpX3cbV+jivV/a7s2QRVD5J5CdyOtgJw0QYdQMs2J31FH9Pi4xZNha2pOEbR88PU8fF1qV0IjBVXl27ChixSn7EiEO5ubv9sA3ZgZM2dPkWdnznq9X+7yTeDBeJBaUMg5uhQwnbUnTZUG9ZLWaY4YBN6oCWHmvsFMRFujrQ8Xe86GQBRnwIzjt4ZCrzTLfNS0AMj0X1ii7zvuFkrRIOEa4r1e34BIl6nseW4zkmCW7n8l5lMUlzfWXbAUISLZgFQLLy2qcN79/9SIRSxFxBsOC5uRMSb3kxDFa10sW0h3qBvqdc4dPDm3j4j826lWiOi5rS/kcerC1LwbYtD1eMpCHM3Gg+HJr3gt+uqRGr+VtyPZUG6iVSrcb7BQK+kPbLgQ8dmBCMRYhO/TfFSYR0BVi3iYFEAa+mReVKCr9wmDCxcgXUK3j6gQkYC/SNsvzVjmyt/ X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8bb36ff1-9b55-48e8-d0d7-08dd54c69a24 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:12.5023 (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: hiA/nSfrIYTbk+GsRljzeFekksfp0bnkYqQcE8XFVVsPlrX/NqGR5ZAkgBd+nxalVpT7h59YFHS9g0XRMGuFNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2PR04MB10979 X-Patchwork-Delegate: kuba@kernel.org Actually ENETC VFs do not support HWTSTAMP_TX_ONESTEP_SYNC because only ENETC PF can access PMa_SINGLE_STEP registers. And there will be a crash if VFs are used to test one-step timestamp, the crash log as follows. [ 129.110909] Unable to handle kernel paging request at virtual address 00000000000080c0 [ 129.287769] Call trace: [ 129.290219] enetc_port_mac_wr+0x30/0xec (P) [ 129.294504] enetc_start_xmit+0xda4/0xe74 [ 129.298525] enetc_xmit+0x70/0xec [ 129.301848] dev_hard_start_xmit+0x98/0x118 Fixes: 41514737ecaa ("enetc: add get_ts_info interface for ethtool") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc.c | 3 +++ drivers/net/ethernet/freescale/enetc/enetc_ethtool.c | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 3cb9ebb13b19..e946d8652790 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -3244,6 +3244,9 @@ static int enetc_hwtstamp_set(struct net_device *ndev, struct ifreq *ifr) new_offloads |= ENETC_F_TX_TSTAMP; break; case HWTSTAMP_TX_ONESTEP_SYNC: + if (!enetc_si_is_pf(priv->si)) + return -EOPNOTSUPP; + new_offloads &= ~ENETC_F_TX_TSTAMP_MASK; new_offloads |= ENETC_F_TX_ONESTEP_SYNC_TSTAMP; break; diff --git a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c index bf34b5bb1e35..ece3ae28ba82 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c +++ b/drivers/net/ethernet/freescale/enetc/enetc_ethtool.c @@ -832,6 +832,7 @@ static int enetc_set_coalesce(struct net_device *ndev, static int enetc_get_ts_info(struct net_device *ndev, struct kernel_ethtool_ts_info *info) { + struct enetc_ndev_priv *priv = netdev_priv(ndev); int *phc_idx; phc_idx = symbol_get(enetc_phc_index); @@ -852,8 +853,10 @@ static int enetc_get_ts_info(struct net_device *ndev, SOF_TIMESTAMPING_TX_SOFTWARE; info->tx_types = (1 << HWTSTAMP_TX_OFF) | - (1 << HWTSTAMP_TX_ON) | - (1 << HWTSTAMP_TX_ONESTEP_SYNC); + (1 << HWTSTAMP_TX_ON); + + if (enetc_si_is_pf(priv->si)) + info->tx_types |= (1 << HWTSTAMP_TX_ONESTEP_SYNC); info->rx_filters = (1 << HWTSTAMP_FILTER_NONE) | (1 << HWTSTAMP_FILTER_ALL); From patchwork Mon Feb 24 11:12:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987859 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2045.outbound.protection.outlook.com [40.107.20.45]) (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 AAC7D266581; Mon, 24 Feb 2025 11:30:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.20.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396622; cv=fail; b=l6UeLKA8TJDeAmDeo3yh4lzhyP4fwkRy/HBRNsGP8nweW/bC7QEV7uQQEvdeVWYrk6z9dyTpE53vwh7dgB8KE/BDFU+rTJblSxvBWNEatw1XRAnOmlKaIkemai3Y5moudDLnfjzR+XXQoherCV30ksNQsWkWAco6MTI0+LskoVs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396622; c=relaxed/simple; bh=TWp2qYJ9Fniz09X+etGvVri5zCWGgpzTjUxx3iQEdBU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=KK1piYxIwxqtBJ+9Ksu1qqOdRgHQ1QixHxu1sWLp8XkEh+qxH6lBUAl0g8tqnReoIc7eUs0xPoisJkHQddgD7kEhf+EVJ9SFcIothJQXbqyaDOpCKWwygNZkIMHApalvnYVmERxe85ItFTtopS32c1SSKk3ulKXiiCKptdjIe+M= 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=oA2Qz0sU; arc=fail smtp.client-ip=40.107.20.45 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="oA2Qz0sU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IZASCOKpGrLbpjpIcXZLbThFcrviXgpZnumroR/d4ZD8f4u+2EFswz+mKyhMIO3w5G6mm7EVrfeIaKYwb4WJFBpV2ZnoIATeHv5KUOWRQRjUy8FEEF8lgAilmsV5AyP3uy1jaluCXCL46oQDsHjrtdX/lR9b93CpfZtjYJ7V0hTjlFV20/EPS7R0JMYeAvrR0v5cg5xQNlEVlNEBV2iCCXSpVp399FIBE2kyJBReSL9mGF/AeVFZzIOtlGm98Ovv6qphU1SwsNbXZDkQQYJwR7dt9T/9y8+dlzbGYejcyPqKF23oLMMCMV7NeXLjjmEQMCwV2MR7qZ42SDmfiuuH/A== 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=E8jjXs3s2VKwq1bjCxgxPSjcBFmZeDuxYtCzP8VvxUY=; b=To/CUxcU3QTRFvVwEh2MvnkTX1vbbCDxPwKr/4MD88Caxr93YtYh7NSqHHzXWKWYVtm6Os2Oo/5b8OCN5Vo0/IDOVlZ8yzLD9hGV7xt3nFMv61r9XaxbGhgMIloJ7TPV3OdvsIX8uLG9ypgn5xr1TrJPmAD9ibj6xj06qtDRN5Yb67OLoHLebKUCxoInR/zmviBYoNlanj3QSB/xNH8obH4mm/bXf1JUjiD5VlUumlqR9vDIsUjm5rCTlWGmJEr5X2u4gPs/LCHN6v963cMfFMx73883Z2s6OEUt5RGyy6RcmIzp8eyXtFUyUspewcNYE1REhULyD5A4d2P5omCVRA== 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=E8jjXs3s2VKwq1bjCxgxPSjcBFmZeDuxYtCzP8VvxUY=; b=oA2Qz0sU2cuqe7eiSO5H8kqGU6zoEdlyf+K0L9LVOJ+fSCEEaoPBtJpKQwt9DAcJm//3vogMH8MLD2DA0S/5tA5v6oc6r6YDrQtxUgxM5niMUS4ItuZBDuIS35jUjqc8CUC0uiIAmUVIl+NE0icjpF/UylIot06dVLbljtKca5j5Z4aWN9MYhgX3H/i6s6hSwAZ9CGxAVgFSSIr1FztZAPan2KYc0pMQkzlsZHpPe2DuVwBf4sMmmJXkG/XMG68+Lwfwl2DlxTc9o0GtpFKePTZ/+NlAm6+gktcNmg1ynl6yteOFeGX4cBpwc5/ul3/CUtNaonHuEqCR2Xd/oHWM3Q== 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 VI2PR04MB10979.eurprd04.prod.outlook.com (2603:10a6:800:277::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:17 +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.8466.020; Mon, 24 Feb 2025 11:30:17 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 5/8] net: enetc: update UDP checksum when updating originTimestamp field Date: Mon, 24 Feb 2025 19:12:48 +0800 Message-Id: <20250224111251.1061098-6-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|VI2PR04MB10979:EE_ X-MS-Office365-Filtering-Correlation-Id: d574f940-cb84-443d-5b3e-08dd54c69cd6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024|52116014|7416014|38350700014; X-Microsoft-Antispam-Message-Info: dJbuLkLyLxAXOxqJQwzWmh6NhE5OvNTnKzgTAKOj5a+hdUAG2Ffk+6Lt6O8YwIbdohgzyykXM3eCpM8qKYMMu+SIG9r0h3yVjdHOziCpHLOaqSBHwRRSrnhew0MFfX9YNvVin4dcoEM3w0uvAui3u3TGPEmPTvMDdyxoNvJEdGmEg82TNbXE/O3q5Pp4Onxaq1Lgf0EgQ5Tlq7oIYnGi5jaNk2E3Pbx6v19IruD1uG5eQ2yW2HXnnGtpL1ZL7n+VmTWb1JJfrXE/sCpSkk3qs2FG/f9Wy7Db1ld3wh7vRu3ObnwY4sJK+33UBg52bgMhAtiM9SpMhfYYoy63NSKb7wpX5aedZ7NH1rRw7FsRprzKmWcMsw5TJQi6p8xbJXxrLv1iVaEjWo7SnMoWS3OhM/K8s1FSo8S9drwBS/hKqoo8k3VMHu1zuU4YhP2OOGvxn7J3m2bp74X3uFTnjkaePhPGOtqEBsTKmzhBvdHFMbDulym6LzjMuSGrcPX67trlQzLlVfVi85tWBtSfTqxsGf9Eb46+ik713fUx7SucAtCkbpo12o97F48DRuAhSKfiqRHtaWcK1cJYtNwkgTRDYTwe0qWfOHnYo5Pb8TP/rQvpgWrchudkxcuzjIRuiPFM/V5Hnu9gk6CUjTLN5XW98+HWRS59G3FInFo8rUG4PNchhJ5Zljv72sfAZF9LLILq3k9XTx5GXKlglmOd1p95HObHmBXkLmNbbwff3YUnwCb+0fQGztEqm4/5E2MQFyaqyrtAP9AJQ71DIzvWaw2z5CQV1OKnnNsutTY5rFOpkza2sKIbFQK9Ze8Uywn9z82FJsy/ojlNW5ULdI8O3U47TvJ3Mss4aiPgr0nd2gZfMplY5fBFVztp792Ajw26LPqt2nFgtu3a7znBcabVMypGRcFwXscAyqhbW/1q8JosT7ICl2cyJ+KQgsSncrjBophXe1lpu54JlMZXfJX+/QGfsE4hCNUm7OVF0aNXw9KhNdkQtCekrsFn7iG2U6er+rKHIXQDG5HHqh3H4sRCHXIXGWOk524V/Xvz7I147Kx9wLHb97bc9aVsuM5g4FN1oMqugZanUzH6G1pfIiKA72hwSluGvDR8qAmSqCfez/03MOwKnHQHvq82YGylcSkT/DrWrCwka7I8nn/lxUu7ghElnorBwejS3ybZFrTGCzQqdTe5sK8Y+hRuwwTojSNRrZR5DiykiWhdNGNpCe+yyLyUJecOnMI2TuVUfUFbdh/DGBNC/970KroPSyoaXNphBQiyyshomtnGK2Bq9dExwtgcN43LdDl2fd85/X1w2uujhm8Rh9gxYjz86y4ywPucRRtuE9C7iIhDvrG/G+YN2c02Rot0LOmngSpaNnhIyWYMHf+m3mOoMjfqhdqW9dqiXxhxpmVBzSgzobZtipW/BlvwoFI2EIXSJ3CF16GLg9OBYN7tu9OFgaN/+HdWniLIa+xp 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)(366016)(376014)(1800799024)(52116014)(7416014)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XRt4ID/Ehvl+MesqLpB0/b+04j/lNpd6EvDUjY3lZ4Nhi/E57/FiW8e3ItcVk+bGMcsm5zmfpKiLjkxndTgxwXbaYDTsS1dDaxqupv8CQG9sdu+mDO8crXO3SLGwxVB8gWFwGpDpHrj9rndmvhC4i1q+ZvOCcXCek4taNqn+ObfKAVjJ5C6moRPegIINxkmbWCYOdiJJop65LX2sbrJrPwbXUur86gGVzBf3Bu4ipq3+haUDgEo6h+/4BhP2yEmCBOui1UhNsJQ+6QVS23YbVJFruY2CI3ASJhOiwQJDUQAbDcwvKgZZp3WikFTbqaBccSPJf+zbhOWboF+hap9C9l/hSOCWSjaIOAIxH/nnLiMSUJkja0syWMHqKinL8KOLqjbsGN/dFwlSdZI9O6w3aE4YH2ATfRE5Mof3wN+/LvyH79jt5pcnUs1n929dFdFArQATl7uEOyV0V+VlkKEOxiE3q+DrQCUfd0+9rFFeLhnrCAeUCFfIraI9RvxYvU9oistfzdbJUobhWFYmwSXcRIiFwss9uShMQ1UQ6a5wMg86VPpfueg/z2XukTBffcdN7AiMjrCo7QrnucVs4/gp7xv1APoVlzeiSBIRu1/wpIJaxgP6QKOP4bbrlCQTlelG5hzoL8jC0Z7nz94eqZjhw/YOLK1b9qnlHKJd/Z1T3ue99DHor/IF3thV2kIOMlsxcvlXPQhE/+gWYdndhXoOZWdbo5g8uU+ctIi1JRW+OrEgYYFAFtxVgdjrfG0HimL6gs4dspb30CN3/9CQFy3xFFh03bVUu6XeqxFqdx3RYMFaBEXxvfEuTLbamjCEeKb7P9+zyO+2RObvon0fswey2Ili/GoBYQiSg8CZ1A5BUUdFSklr9ukz4Q8nnHlK1Ae6594A1TvWAZzoWf58isV9aX0DeecB82MKhSQy0x5RQxnK1n/QJ0+2jYL71CrGkn+Ov8oCSUcMd72VKLtVoo4AzkLbcMF/7N+D2zcH2Obrd6xXpNDW/6Dxh9zJ81hSmLHLflMPcMr139psl0s00ctf1xucs7VPVINX101O4FtDKHd+QiWsakNTRYhKCDEMCvaltbmQ2YUIxatOj5fEI0a2Gzp82/ZzghoQ6mmhfhJmz/BoPY2/+afzEFEtoIEtkpwjcTE36MKzIGBw+VQgSf9ZlM2wSSp0PkS1BR6IG2MzjiJXnEptP4I22CGyXPLwHzwaDMxjS/EbmCu8OautCu2LJNOAtr1BCfRtHDXp80mbXEpviYaNSUPUUmAf+ZTDCWtdAfiqtXzldQAtAyoFY1f3UFnLtLdO/7INQGt+rX7ql5mcwKEtSat24a2N3KrQkiuxLsO0f7t2k/WsaxJGRpaz9U2/Cnz/iV2fmy6abQtu9UMo5pxpWX5fMXotbz29sNbriJ3ycn8Okhu6VneyTkQlUMdMgaRZEFWpWBxsE1oA+KgT/aH067FJt85749eLWzV87m2WQ24iTLCo130l89lnvw2w++xH4xlUO9XmYle3Jc/BZBiNa++ShgrlBGorQ/OBU7ReV9EoxCxfsCIJgzJVEzT6wIkdgjPTwMp2RVtQg+/+m6rZJqRpHZ6vHZsNNNv0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d574f940-cb84-443d-5b3e-08dd54c69cd6 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:17.0675 (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: wBIhdl3o1nh4i9T3TaNf7N4SCbbxGXTghnLDUFY8zz7YKaqfJ55ri5Su1fXTmOXXfGJ5OFvqn8GY4NPF9zLmzA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI2PR04MB10979 X-Patchwork-Delegate: kuba@kernel.org There is an issue with one-step timestamp based on UDP/IP. The peer will discard the sync packet because of the wrong UDP checksum. For ENETC v1, the software needs to update the UDP checksum when updating the originTimestamp field, so that the hardware can correctly update the UDP checksum when updating the correction field. Otherwise, the UDP checksum in the sync packet will be wrong. Fixes: 7294380c5211 ("enetc: support PTP Sync packet one-step timestamping") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Tested-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc.c | 41 ++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index e946d8652790..9801c51b6a59 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -297,9 +297,11 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) } if (do_onestep_tstamp) { - u32 lo, hi, val; - u64 sec, nsec; + __be32 new_sec_l, new_nsec; + u32 lo, hi, nsec, val; + __be16 new_sec_h; u8 *data; + u64 sec; lo = enetc_rd_hot(hw, ENETC_SICTR0); hi = enetc_rd_hot(hw, ENETC_SICTR1); @@ -313,13 +315,38 @@ static int enetc_map_tx_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb) /* Update originTimestamp field of Sync packet * - 48 bits seconds field * - 32 bits nanseconds field + * + * In addition, the UDP checksum needs to be updated + * by software after updating originTimestamp field, + * otherwise the hardware will calculate the wrong + * checksum when updating the correction field and + * update it to the packet. */ data = skb_mac_header(skb); - *(__be16 *)(data + offset2) = - htons((sec >> 32) & 0xffff); - *(__be32 *)(data + offset2 + 2) = - htonl(sec & 0xffffffff); - *(__be32 *)(data + offset2 + 6) = htonl(nsec); + new_sec_h = htons((sec >> 32) & 0xffff); + new_sec_l = htonl(sec & 0xffffffff); + new_nsec = htonl(nsec); + if (udp) { + struct udphdr *uh = udp_hdr(skb); + __be32 old_sec_l, old_nsec; + __be16 old_sec_h; + + old_sec_h = *(__be16 *)(data + offset2); + inet_proto_csum_replace2(&uh->check, skb, old_sec_h, + new_sec_h, false); + + old_sec_l = *(__be32 *)(data + offset2 + 2); + inet_proto_csum_replace4(&uh->check, skb, old_sec_l, + new_sec_l, false); + + old_nsec = *(__be32 *)(data + offset2 + 6); + inet_proto_csum_replace4(&uh->check, skb, old_nsec, + new_nsec, false); + } + + *(__be16 *)(data + offset2) = new_sec_h; + *(__be32 *)(data + offset2 + 2) = new_sec_l; + *(__be32 *)(data + offset2 + 6) = new_nsec; /* Configure single-step register */ val = ENETC_PM0_SINGLE_STEP_EN; From patchwork Mon Feb 24 11:12:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987860 X-Patchwork-Delegate: kuba@kernel.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2040.outbound.protection.outlook.com [40.107.21.40]) (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 6F42A266B67; Mon, 24 Feb 2025 11:30:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.21.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396628; cv=fail; b=O9iLdqaJ5W9+ZcLtN7cJlZ08b9rxLlRRkLWD+SBRX7h6VWcs+mu1dvD8YK3fuyOBUBRyLo1qoK462oZ8PwN6PLafGoUqj7YybLtVHnNg/TmmyApt+czulDtUCTT7dxK0ScYFHI0eC5fc++jAySNRS7RYIQK7donSQsnyvxbqrN4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396628; c=relaxed/simple; bh=PVcUNP8tv9WeTuKGuMSHTfJybsSOpK3+43vdiYAP1hI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=eFqAOmZScExer1IC6PBr7BFkpQE3bjKDUvkqsKrhuDMDC5nnpsTyUvC8P1myWbRbLKoYXEb2o3OPY238yr1twbHJ0gpKS7YAKkQpbXihbDUlxit4qdzkWTKWkloprekA0ZOL5gdzYPyx3fEdjYPOCikYbqIE25SP9tKEd6OSvJk= 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=IgBccFIT; arc=fail smtp.client-ip=40.107.21.40 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="IgBccFIT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T4nEAyOFXW1p41zJn8koewFqp9m5bHPrpi+gRcDbejN5OhcF+h+ZMYIOmZSLsULHOtaB5eOJKEK0afM4Z/qi+Ai6Uh6tWJVS0Kovsbwby5KtCoVPp6AoahgLNjBnTgbdprg8P9olLDTq482PPrZib/4bPJX8uygANyslWOVX2AuTQGlIarGdaHtm8SMYahWrdq939cRbWn06LW43NmTCL/zv6cQUwVW0QZtGmhjlRn+PpD8Pasx56QEI2obuCU8a89FLkVxEZwwLWvGAkwVWkik7lZ3JZ9q8WI75ZSC2CD1/8W4w7hGVafdM1F+19yyT0eizZi2FPAX+mAwb9FWYww== 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=oyxKsfHD9ssUcFxEmaHOYxB+iAIERoKaa7iOZ3p90Jo=; b=eNacM9ErVjHjjvrdjanlePQt0wfBupIyTO+HqSDza9vF2bRNTkTMYIfxWgRzmPyOc3jiCG+P30B+voC3luMu0BSNBzzusmyagEZPddOr+tQQyqJHGhHhUMRq2GgPkmN3b3Y7KAHSGaWOk4ch36p/MiXzm7PC8oCX7S/hOWkB5AzAxAqXqGc9a3FdQH8GuFvegswMYDiEgKIucXI7etEK+lgDdc25XHQPniw7PM9oF3qZPEA18feKP+OO6EoXMk12SFRMzwJvshHVREFE2NbMmvz+lwz9aJLz04gWvQjhIeTCo1VqeC9/YyuI0eTPmprpkHn9qXpRj+S8Fe8p1VNBZw== 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=oyxKsfHD9ssUcFxEmaHOYxB+iAIERoKaa7iOZ3p90Jo=; b=IgBccFITVeop5490f4bnfRbOf6XkB0L+F5UTEp+SUoFpx45RxXNWjAq7hM4sYPyBFBROm6xf5zilJy4d2PMeyNNzkR7atv5xqVWHhg8lqykO6K2dwxF2bZpudupcOqp3C8FwUXteD36o4q7EBDsjMkTow+8FMddmwrDxXe704dl0tNEDk6jCWsKgHkd8F7wBhfDr8WlsX5/CDZmmg17sbgHTzpXIDqw2IYjf57NlAI8eFYSKb+K1TjLV8YAFKytt1HYB329rA8ck0f0Z5ibk4aAY3q2wZ2EFGOsoPItaDz1STeG1HT3hsX4vQMZ7xAH6woxtA1ozj5dwDye86x/9qw== 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 AS8PR04MB8135.eurprd04.prod.outlook.com (2603:10a6:20b:3b0::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:21 +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.8466.020; Mon, 24 Feb 2025 11:30:21 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 6/8] net: enetc: add missing enetc4_link_deinit() Date: Mon, 24 Feb 2025 19:12:49 +0800 Message-Id: <20250224111251.1061098-7-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|AS8PR04MB8135:EE_ X-MS-Office365-Filtering-Correlation-Id: 30e9399c-4ac4-46ef-e5d9-08dd54c69f8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|52116014|1800799024|366016|38350700014; X-Microsoft-Antispam-Message-Info: L0jdFFj9rlAdLbaBi2S7XHmtbmPXA2c9JFseF7rdVJQnsTPw7EvofVieV25P+L0R6My97XgqjgT3RvUD5xklQ8on4djA1oVTZWo1tp0wcJXnMqhQ+W1BOWj81tz77kkA5mLiKn64m3tI65CYlOmtGH0fBRtb4KecCTYw4vAi3Ic+Es63XiMJQB7EZcE5MGFWWCgCOp7UBtq7+zhknwNdSsFrmw8IuoQySndhglJ5Dd4SvxjXDp+0nuZwtNRNpiT1riATkVChdEHQwgfzhJg476zPqvhpQZG2a/GWerT1Xx3TYFB6gf2h77wVEosrZktLlKQYJPknldFeq/6MX5VEBEQt0Oq9Ft9Gq5aTEn3N7x1QXLT1kuVeqOKkh63YKFYT6BFL8eMliFBtLCx/mHJapGXM8oloi2iTwXtBvBgVe+FWqD0kQPffmR4nks/AfAiOkdjJ2MIqH9ZnkjomZsAdfZdU2knNIed4rfbSRbOXMWx9Ok0AW6RMoaFwrPhF4fIIC/OmKM5wc4tUZCvGSn/BISLHzNl/+qYI4l/VsSBPX2Updag6gRNvfOimr+KQAdDzLvWg4kJpmm4Bod4HEuZgkPq19xlVd8sJWtVCZ3gxLkAZKM2941wcFlGW34ce89eNVVrn1BVKPxynTb8FfN8Drr8vCpYyc+WC4dyiKbOYSeuSqdmf8qigd+BuRw/jo19cW3lA+PGlZoENWcQqAe1qx6f1lZ9haPMoDUZV4jWLtdTa4jvuGJxbcmmyLDPs2l+Mk9SWwnuH1LV0cglqqCrF4s8/4NE8UHqzqNbxTvHpUaGfPHlC2uf1bPkV9ScWlknIocCyWA7irz4o4uoXukNS+nZmxSCYst+zgkzow0/eYl1uOIZsecqgZK8JQk8Dt5uCWCbw7Chqu+OiZayeIuvInpymBnEVr2X/FsRmIIGKIUgUzbnvrinXuBzwXiXYbOfMX7ApHeNaNO+AvGTlmHq+N1t3XHGm0S5d1M9hGR2gRk+xd07BulSr0ZVPNXkfZC5Ks4295DZRR+IaQnXZfHHtlJBgl5ppgMPejaehNI8KA8nFc7rMGND6BMKj4IBOhdqI1TNTFx0i4IgmH4NZvJ82rPaF0EtQzT8QVP2dh41nymXc9AKAmNInOnOINBaA2p37J0HswbSKFJ/2xTS+H+NtZ04EMS1x9xLVXILc0x/w4XjLDaI1Z+8RkuI7AUg857zEqkKKyzb5yQOKgZZELEobLE9APxYH7f4idKiLcU4hQ3FQJBTlTiZ/r6HrQ9wFGf702D54+AIuniXTULnOcC9xkOzw1M57k7P0Yq/eHI2IfBBj6kKl4ymV1WNujNTeW/jgv1PggqZ41e6WGkk8WSvjpHw35kzY9K+dTppxedRyPZYjjHkSW7W+dPq3Cp/Sw0tXIIgKXG7aUsf9uqI2wJ7bnNGEK09cqrTT2Zyd7nriWGDfI6qFm7rXGboCFGfIuiN7 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)(376014)(7416014)(52116014)(1800799024)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ogqvUy4IIOx8h+/r4kbFut08yoDV8Vl7KQ2FJRIU+MqB6L4TdkqhSURf8ax7J70CFvRumT0HkwIEUUJt4nVsLwptKv2T8NSMHclrrBAJldqQf4sPmTd/iXHJH/m0GsRPTdnxZZBHhDmlYbjB1GjmuN+Rd/Xal2saRRDthaQ8LpR7mVplCRE00gZJouruMG1knbFOt6l9Jsxhh++lww5Delfmek6ipE+68xu4NvrINiMJ57ePiS+wh9IdjDXmkPmm93RnN3SJ/UcFeYiDg2Yq+WM+VAv69R0VHFop1DIfMrzu9cRbOZ8Mm54NZAaGL1qdu5x+PJ+Uhd/Et9Bx2W2AGbPtM2nckLzyMKXG7vFWyEOaUYZ9eoBbikIJX8UzeWJsSpzwdHuN/Qge28TXWd78YqeZV3653gDGSpp4xgbODriADmzawVv8vkYKmxzV29OAJmqTfZVZV99z38YErSUUOmI1QloA+qHzzhwTgKuBVayUnXWKUiGDN7dC6YbsFF7YeJORsVa6cT4Gm/eDQnoCQHyvKKGs9ocNk1gWKUPgUnyQWnWe55wQQJVULousfi6K0dD4Kip9tsh8lDTpTIfzZ3jahhOumGT1UuMPW6gm8aGodlQzZQWtbduD0bjkYHquMFMU/xY6wPxjc9oRkrhcd7iPb7FNjk2gE9u1gTmtDoWiw2ly/dNNzInmwtCrINy3M2x2EOExMiLLeEDCjZm+L+clMJiYbjyf/IcE+1rSG/+qnvWO7XlfNbarYs4ITGjTcKZKDxw8+UWoFHzt4/2pn2YqYG2C8ONYFgKt1rMEqEKFiVYkQd8WdnT3NO02iEZSNh/86CT90WLnQtGwN43jzwYbHwavkrxMeW3g8HyXw1R8mIwfzs7G0oFmb1HuY8dOWNiebmihqbugyamRsuwlKRupzuowyieq3wizAFJxllqfc4HEeCEu+7JF+XdWtz4DpXKuN/uSgX5VjfHpFvovYgwN8/SlIvXghjHHAmShNlJiwi9a9WIH/+cTA1yPoP4lERwBEQ+q2RnLr9aJefpFaLZ+axvEF0MR1bHjEXbgTOvGgk2rpTKn9GXg+/tC6zy83RYCXToANABFxjKuC7xunN0CjPSKgd9jPtewcuQGmvIZvDB/5SNPpv3TJyQfqNzudRI9qHp07NEiLstoET6Vn6Rtm3B2DmxTT0q8q3bhLnP+BvU5TZR43dRwy+z4LWpUVrEmj8Ujt8tTQ0flEuA/p7ys2b4iVPnHpbS0eVLOOnAfh3LRYh7ts8apOtfUUTPBa3vl4Daarg1AYBrPb3AB7ButexndpDUxJbLx0hiRAB3GRHwZRB73/EFdXtftDmdHKn+sD106wKdhNzqLngS7hfjjSnoXG6AUo37U6mCLlJzHxci1aGJnP6G742eQAuaS/xtSjBJmX17QeS8XPa/LNAVm1R/HEO7MRgEBXZ81uDIFCugvbUic7UqDErUl7DCf8o/zZDqNhbhUif5tMcuPmv9+XY0Mpl8UvNcG32Bed5f66yqsAaWuT/VcMrwWv+lsTQqXUJvw7OunvU1UvB0FpRZ+/kim04tblutnsBgql7WZidKRwVt4LaPppw35tSrl X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30e9399c-4ac4-46ef-e5d9-08dd54c69f8e X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:21.7047 (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: wauXLYPng65IEivUnV72Ri5gASbrzXCeKvpEt9NZvlWW1uJ7qHRCpQtLysMMI2qj8fvGyvDdO3l9T2qID5Velg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8135 X-Patchwork-Delegate: kuba@kernel.org The enetc4_link_init() is called when the PF driver probes to create phylink and MDIO bus, but we forgot to call enetc4_link_deinit() to free the phylink and MDIO bus when the driver was unbound. so add missing enetc4_link_deinit() to enetc4_pf_netdev_destroy(). Fixes: 99100d0d9922 ("net: enetc: add preliminary support for i.MX95 ENETC PF") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c index fc41078c4f5d..48861c8b499a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c @@ -684,6 +684,7 @@ static void enetc4_pf_netdev_destroy(struct enetc_si *si) struct net_device *ndev = si->ndev; unregister_netdev(ndev); + enetc4_link_deinit(priv); enetc_free_msix(priv); free_netdev(ndev); } From patchwork Mon Feb 24 11:12:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987861 X-Patchwork-Delegate: kuba@kernel.org Received: from DUZPR83CU001.outbound.protection.outlook.com (mail-northeuropeazon11013013.outbound.protection.outlook.com [52.101.67.13]) (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 79B89266EF0; Mon, 24 Feb 2025 11:30:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.67.13 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396631; cv=fail; b=BwZMvAVAFv6SSpIfu1UQn49ziJWVr5ltouXBKtwrVdnIaBusPCcUqhDDwmqpOWIYzAE3LZ42u50Ofzvts32mMEZj6OwmLsl3lOxIIHCEewSf9ebB92E4VHZN0uA51Jb3ImXSMqi4GIxbN/4TULhz5I7rQcetn4K16ApYVLcf2Us= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396631; c=relaxed/simple; bh=aHuVQywoRRhKCcIeRt1a0wwI1mup6/YPzQrsVnWWfDw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=riTp97Dusquc+hRxsk0HDBnpG7Jrfh5I9gzWEvS+5XWqe4kWHIP/+64NutxVRl0KL/UVltjFfM+PKzNsm4eZqqwIcB5EmdxWSdhEOSATc+xshIe2ZMH1AagajbMmtWfr4uxcCdi7H4aNiwQhtCnqQ+rbevx5SiO8rmiLWNxkcTU= 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=V1CQSXbs; arc=fail smtp.client-ip=52.101.67.13 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="V1CQSXbs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JlmX0y6j9IPGN6WO4td/Zfjy4x5f4v3Xao0dCFYWZvqNPmpLTfA/mXczeZRiQ8DnBUEpdEhbxUXGwVeKDnj7dHtJDTy9doF8CANaQKSKKWjnuVhDFVk9MUW8kkrWeqVaXB7esC7pfp9dZ5Ne7k9R/6iFXwwABHIjeeCZDyzicLRzLPz/PX+FRe+3HMYJErUO+EPPGaXBxAsiKapEoET6OgSucWN+0lDyg4+t1rlOzI0RvTw0fCEW/z4+FBZIFRMZP4p2li/mhBlmMmzE9OFQJdTwloFwjEg7rB1ro9mtkLXO7hAWBzn2O5J7hbyMQKp154G7VqABm+0D8jJOsQeGBA== 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=ATmIexkfbLsalPnqzPcas2nW2/0RylfAo6ffhe0fUJE=; b=lsoJFA5jxGhk9/xauV+oG3dMhChl4Q2nDJWmKIcYnuaYTMYcAbJS1v684nqtVqy4/LnmhohfRXRH74N/palaAG+gBpfwdx33Zjglz2ps2V0YnrnBCur966umXjfqrVDN1M/J5ABJ/02HI7tjDC2a4uJOereJ5BKTzaZycisjW1iF0A+lqIn2DMx+iddThS3sgB1ulWwhmsl7JFudZltr3oeiuMOSas0RsGpS5oqJdkt5BsmVLp9vV5C+aD8tLkiOMUubBR+YGZiSQus80g6d3gkevfVME3/3OOQDnSiq75h8E27MKNEQZQG9lGv5rRrcJa+iKTPfrkakg+9kNzTMNg== 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=ATmIexkfbLsalPnqzPcas2nW2/0RylfAo6ffhe0fUJE=; b=V1CQSXbsZT7dyDtXitR63qi3B3fuKla8Gggky/MJA+L20eNN0KJmzRwApF5Gbs21GcwWTY51hAQwspDu0s66OY3gz2M78GzBKSJpQ4w2VCByQioUDLuTEt/w8ZBGieDaqoJFxIssyrDp5JWlQ5YktqPeRE1GUVCitqH0x6nhMwa9o3bduIbUSIfTqW3pUkBytB+FSFSgaLl9hvx4FRfdxvU2roG+GlhOKAYEPM3pfzoOnVES4S3PB8HncwSsGsDnP5jSMtQhAYcF01hGB1G63EttTAcZZLAdnWgNDItawzRnOEQVH6kVzNKmSoarTxuZjYu8c4iMCgVylYq/9d1Cgg== 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 DB9PR04MB8346.eurprd04.prod.outlook.com (2603:10a6:10:24d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:26 +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.8466.020; Mon, 24 Feb 2025 11:30:26 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 7/8] net: enetc: remove the mm_lock from the ENETC v4 driver Date: Mon, 24 Feb 2025 19:12:50 +0800 Message-Id: <20250224111251.1061098-8-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DB9PR04MB8346:EE_ X-MS-Office365-Filtering-Correlation-Id: ac18c0ce-9f1f-4be4-48ad-08dd54c6a251 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: u9hymlnzUzPRSMgaryxpiw1icKhQ3Sg7SFyGArbv7jawt3qOtfpv1dTx36KXcPcPczYK/nhAA4fmOhVbjc9rT12Ol8o+X34k1zp7Y4qFGf6MlP0XisPQCZcN6pdLzY/h4pw/cBwwSHeDQhwIq2OI8z6EQnQhwQThFjPnsLAhNpZxCO0f0fzl1nXN2GzHF426w3UGDMoJkJMK7ZtAtki5poj6RJEOcpJE0qVyKn2rz529zDK2/xOEoNR3iz0mLXjrvz5zHUMXCww4Mg4dRvWKK5Gy+UGO9+FudUMXFcEYar7z4kSwEuO3/MQ9exoCetC/7sMg/X0nWNtW23cpo1TYrXLTE4l923RGo/0xjuqKzn4+DBxSm4iHiPOaNikDy/l66wi6LJmcOpV047wS9e0QH00zsGDH6pnLnvbOjA2+HyLVj+gqGSC7pDgJC62TH0IZboU2uHSGIYaCnTCRHEN7+b1elS+BFpALn85N8f1EtXkx5ujCadNzPEUhqagrtEklu00o/+uAUK65J3AgQbLzrgIhUR4wmqb0CbzFa/wH/gZi8i4xf3wzZhcsRfPnYjgbmpdqAaTt2ztd7L9/sqciy9QbZdOPfeXDc0ShdfFsJATXqVL0rVZlW+t0aXt28qKmOdHr7+NKGGvCZMgQeJo761sO1De8BVltwtFPOpkKdWGZxXWeOWRGFMeEiWYNaIfRP4qwAXqOSsYit36NQ+bI/dpXpxWphyxZxdfSnZBOhMGGT8eWRSBHoa7osaxl4HIqus5FIJ5ECmoRsGbNqJs1CykrOP+ZSR7vNWglI2zRYFGRFCLr7Y9Lsy/SvXL/cstEVdzhvy0taHnY13Tw5n2A4SaOuJWWLw5rO2F1ZailKnezc67yCIDs6n5a6XyFy72giTJqqM+Ac0/7CBj0zJEwm+e0a0T1C0PuDu6CPvd/OrsNpvoy300HWOV1OFai/SaI/Iz5yzGZE4k/bJh9haGW49j0dSkpTJ4Lcg2VciRN13oIZVlZZrqioycKeKhQ3K3BPDp+2yPWi1fXEM8G3C4CEPORPu1z7oz2gPPZRfHx7KrNNmlcUYLfjp3jYPeMM955jRbiQByf3ln1G4VF/rcj4SVsDgSA+jfgBn7xhh71zwBMm7c7AOsQm18h7V43tBdXttgDxiN8otxtiSh2Kpwtlzz7Ay8p2Eu422Kdz1/iFhEr5jGI4WbO1hUvoxiNdBFqQ7VUo5piecHq9n1hwOdbgpVVU/wG/RHAzoWg254eCXheKTmBS2RyiX0P8+BzHvvnmAddtnFlLukux5oEe8/yXLbCgSRxn5/xLxCJsOjjNoK8gz7V60i2ywN3nTtjP+1fSvaDkVxCqeNbB5VFqu502sPi3bpKXymvS/3plR+eqz4UHOgn5EDXcwYQ93Byb8Mwj5Dde3JJObDBOzGhW3L6WLaBuyTghHS8VQKEtlSFmYFVbFZffoROxJOv5mEP+B7s 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)(376014)(7416014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 5M5m8VseOJofwGhgf++JbXoqHuJgrSr22iQbIGuh4hdZHD5aJXIIjIGGjJMWAbBFaTUVmp+ekeNnaAE2NSVhgqQ3xmWayw7greeluwgYl7D4aeiHdC84rqGQ+gDIoEbw+wPJ+8NS3lczMGAbjCG2uT/a2z4qkxjVRbBhavhy/+RzwvHjWALh6+w3gqQ7KjjTji1i8xjliUNFt3DLxc6Y3lKz65zTu9baB9W0p/3U7GpnfbqiVAiNcagnol9tyc+cVklTN6FmbHyIE6GDCnklr3C+C0QW/VNleO/jHSBX4tRlknVzBAMsP/y4Cxv4YJA+HKkdQ3wvvqlPZP0NQ8NAoTHTGWQ0eZ92SCKqx786P3K/yeUTVtSYnpxiuf6u57lKKXpfPytxLx4R3XwhwmMYHW6f0Gq6n0D9D3fc31eC+J0dh0wXeUYA85Lj3JNcD/vC8OIo8tJ3Me56HttmiDkYPgnT1j9u44bUMvRLA4pq6Wck98MUV5frUNwqhk6q2i7UlhtAbIu1P1LJlhPV9nEQ2hMAqLan2P3WU84I16FuJMiVDRnhuM00gCzF+uMUf92O56PV5nDiyvKJBg27Gd1RajgDyGdCbpYodaTRCUK9MFbkKDHDnxRPC4xXtUhPK8Yu907KNYLU03eRWB2WBwZwn3zutSuD4Kp39q3LjHbRLdua1wytj7HKCgxCbG6WQ1IHyd01xddfs4UGehOgxcJeigd+UCh48WPiWNXANcWgKkaSf9nXXeWsqKaV9/vvBvF8mIvyyuap9vW9we/07Nied1myl9qB01Z/fh1JaFBpVXtYayT7WhMC5xjcWwJA9uU8Ct37TmB+k/qi//rIfFAUTF/UugZAnA9VJYsHyFDMp1Jy3Opn9dbxYHh3ci5lRBhPSbaQr3FyS/LYsu2Q97uBIR+Lh7Dt1nBIv5wJEaEGIX+W/M/ZOScHXc2BUg3ngWBLmFLOabK9Opda1es9i5yTJHDpI4cIF1W5sca6AKzTvljXmcKt7tPuP3hVyg/zkhoiJcIwVcrxMf4lh58c7Esvq2X7VX3L/8y42pNpT/b/1o4SOjQYaSAJXosC1UnqASkn7XihsBIolsO/qvHqo19AXxUkYek4QEr4N26QuI2K3Eru2xyuqaETG0Qvf5xuTil8YRttzmDJtmX6Z1e31w/mRWYkNRv6Op5w9V4LAYwMYQCzLl/1UQbNCe0suVxXMIm54olMhVHLdKMqDtiwmBLXRtOeuStVJhUaW7wX0cOPGMg4XGU0Bd29zp4vI2yh6QYp/o68+7rduk/VKCroDzbOlmvdTGVB6yuKqAExK9jsBohC5TdJgXJrvPFFWSiu5IvP2j+PAym54puLngeBSHoGIdNBqMxkQHRF8yUHlj58/MBxNHSmjnS2XIWprV/Kpzvvmb3r2SxOOE853mBa4/nDEDUXe+twZxVNkTCxBEt7KicZmYMZfwu8fkWtUMgldAELVHo3gaSa9bQqvasAkr0dtCaA/BfGajJblQtW/mKUmTnR6OkibjzT3cKA398gqsYo/XvykI98KQs/lN1geU4tmBSHxyrnZqqYLtB/wNsC1pY/QXwxy+RmjvehyDYETtLy X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac18c0ce-9f1f-4be4-48ad-08dd54c6a251 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:26.3350 (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: Qbko5CrZ+6gKOSRjJgjMH2CJVjyuhyiSo4sUf4KR26M492rowop5oztPEveCfGZDheeFw+87QHcUwi4wYrXn5A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8346 X-Patchwork-Delegate: kuba@kernel.org Currently, the ENETC v4 driver has not added the MAC merge layer support in the upstream, so the mm_lock is not initialized and used, so remove the mm_lock from the driver. Fixes: 99100d0d9922 ("net: enetc: add preliminary support for i.MX95 ENETC PF") Cc: stable@vger.kernel.org Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean --- drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c index 48861c8b499a..73ac8c6afb3a 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc4_pf.c +++ b/drivers/net/ethernet/freescale/enetc/enetc4_pf.c @@ -672,7 +672,6 @@ static int enetc4_pf_netdev_create(struct enetc_si *si) err_alloc_msix: err_config_si: err_clk_get: - mutex_destroy(&priv->mm_lock); free_netdev(ndev); return err; From patchwork Mon Feb 24 11:12:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Fang X-Patchwork-Id: 13987862 X-Patchwork-Delegate: kuba@kernel.org Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11012044.outbound.protection.outlook.com [52.101.66.44]) (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 35427267394; Mon, 24 Feb 2025 11:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.66.44 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396636; cv=fail; b=kneVSx0d/7HgMTX+omGS2ni+UXvVmYwqk09baAw/U3xZguxcJTkjNwo1jQqrnusLctiDgRFCyi8sb46S3gX3gOPkdz/YxPyJg4ZipXHKOXmm9C5hr+EKCkVlPImdSdph8U2NojDFGe1MSb+t1hpSKlqbDMA9RZLuqkquNxhu/IY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740396636; c=relaxed/simple; bh=ppyi+Rg8YGW5kKJxsUK/X5x+gzoC+qeanrrTxHtWTrg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=krRVWhfXd6qL8pspBPhyW5lzYwXwfi8+dC0rvJIyCbzmAjno6WTzXrkWJ2fgkEHuSKB96w5pK8F11p9LPpqkA10N1ESrWvOR28nkUGF3DVo1o8iO4xqoKN6M95AxotkLtV8/n1IIsdFJMy4E1gdeTYrE3bvTBeValMKIG3lHgoA= 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=C2jhVj19; arc=fail smtp.client-ip=52.101.66.44 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="C2jhVj19" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=azyn6mVY7IyqdAacoGiVFYzyjcd/Yi8m7KOLWA2fdhTgHYF3G38ExOduEnhePtt/6CdEuwcZC0AVIzrRRcBE4ReLjtqlFKB2r6/bvWV0OGnJ+pfAREaJqBU/27kzIUyPL0w8s3Kx2FwEiJzX2eXnwCOageacWONYLGgxz1bP/Ef/ZECdWUuxJgVkxkEv4hpg17bgLUpQBTO4muJBAE2tfsjqwYxwpXTD0Cu8tmkCAwOAxv0zD1091GCfZSV4fSl85RVLXSkpOK91EUnYbKYBJ3zuOVyCowm0BwTpDRuCZKgoOnb0V1fy7SrJKhjOd9BSqj7ZQs0oMjtIVvvxmbMRXQ== 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=mIwMgLMMe9NpiZyUBgyHTL9O4AVX8KUHEVRjqz+yruk=; b=YU/orPtFU7VXuvLVEbXOj3YaxvKxLDzGNxSvRo/aZWbIc8fR8JFMxjNpy+j8yrStqlJ28U5wLbBodFbNXfmtOwItlM9w8RAkvtMnOZRY59A4u7Fdii5v9t3IAofcT8/bgQvm7NOXbVMfzItU5c4rDX3CFAkWF2h1h4wASkJOqrNqQQ1dUw3Fup8Btm3C4NryG82dY9kRdMtgJ1GAZvYOwEZNI7qo5j6ROH7LqHK2Wz0uxmAKzBtv+TAUGX4Jumf2G4NBnFVvR8Rv03vnPjbv4pZcVbT/8E2BNO4cm345xWCI9UPfj1SApVYu6Ah0NaQCYR7ulx+2qlttMBW/KC+aFQ== 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=mIwMgLMMe9NpiZyUBgyHTL9O4AVX8KUHEVRjqz+yruk=; b=C2jhVj19hVywhEGJzNFAGJ69WU3XPUWE7lv9VOpCaL7euoy7O1YxYLE0O0EcWWiyciVJ/Bg7s/CWqBLNh3zlhK5CMr/u5F4DkLZDGGY5qVEqDTTJoovTuqt5Jsj3Gnt+f9iOJtPN4Gh1suQvb1bI50qTRDMpWRNRP+Y0MaIh1FXGbVhpqsgndK5gA/MuCf+CNrGAFAl0j3J4TQHadSQiVafjqtp8PPM5gSAPCjMlEsqUMKD838/EG/yMIagWuXGFkNhF0vxbUY5yQM/izABw4ivccphzIfdRb/IC8+dzvtHbJimvoH2wIVPTvFkk/HiifSpuD4KFVzaYFHk7ERkz8w== 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 DB9PR04MB8346.eurprd04.prod.outlook.com (2603:10a6:10:24d::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.20; Mon, 24 Feb 2025 11:30:30 +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.8466.020; Mon, 24 Feb 2025 11:30:30 +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, michal.swiatkowski@linux.intel.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, imx@lists.linux.dev, stable@vger.kernel.org Subject: [PATCH v3 net 8/8] net: enetc: fix the off-by-one issue in enetc_map_tx_tso_buffs() Date: Mon, 24 Feb 2025 19:12:51 +0800 Message-Id: <20250224111251.1061098-9-wei.fang@nxp.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250224111251.1061098-1-wei.fang@nxp.com> References: <20250224111251.1061098-1-wei.fang@nxp.com> X-ClientProxiedBy: SI2PR02CA0005.apcprd02.prod.outlook.com (2603:1096:4:194::6) To PAXPR04MB8510.eurprd04.prod.outlook.com (2603:10a6:102:211::7) Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PAXPR04MB8510:EE_|DB9PR04MB8346:EE_ X-MS-Office365-Filtering-Correlation-Id: 7cc80953-6044-469a-6079-08dd54c6a516 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|52116014|366016|38350700014; X-Microsoft-Antispam-Message-Info: vPC/YvxYU3vo2MVcq5BGSGTtjvmJ9Mo0QQALpdcFdBZbvWCPLjmzj6snVjvGr4jXV7wlhT+QzrX+mRaIHaLrbAv2DcW6pjTey32obCe1k3kkOSND4Y8x/5jVnPH/QSBAFhM6tNC15g+GuwHvDWV4VtrSAlCvziTJDdeK0n9tSZZs8BfvHRXgzsXzDzETQ1ds6qTpPu1ofWx/GSgVxPBmNdnlFVCvcgRcLYbb7vNKWmP+h+KxL+vvVr98k6bkshU8BMsdOBR7GZqCC8f7XOGASV2IWQ+5oUpTtEPaCvlfELRQNKKrqYsrtq/BqxYg531Nx+YlLJscKVv0tlu4SaQd6p3xsEGOv+FJQU+VAheATkJDK0W6cMOMnlZ+dkdmcyHkkl6bONUfLuhYFQ/B7sbKVBS8UuDn5nSMG5yiMmME+M3NXiRJeNr+YWep94Og0ngVnIQ2MRPY23Q41ocdDk8XA2qtzMdWzbuIZD13R8nBM2lCnroXMltDHDgFmqpePpijUTjf0KUu/E88ozH30KFk/e8Dp8AaZn0ErEyQSxQdEEasFac7rOibr/M8PJRPqoEyXRC56zJXJDI7H9J8hgMsG1yBWv3ydaypnkyfEiObEiludIkH33bVSnUGtSN0qH+1jt3v+sMSXpuGLQWj+Nz45//f0OqNKKtPRYGyZCN5JqMQppBmzkQy2fk3QUA7ws3FtstTwBscOpaR2FhjAtGkIBUJYCQKQy0TF+Dv5LJO0WojbE9d3Y7wEUKI3c2ciLbUREFOvdODlLtQkSSIk8mZKnYXft6i4v1CJsUgVjDF7wu3Z486YiZm7phiOyP7NnJ7MMSbGMWNEB3XRYtDUZr0touLtuklMKLh8/KXD3xflhfjL35N0CTHUY/bQl4BXdhj++stUHFfdxn6lOyOsVatPcxOawmGgzse21aR0rnAKWqFW3PKRaW1QHuHHQxweTp0uVXtB62UqopGUm2pgMxzd9XGR8VLL5d3/lR0J9xQhzdw8Ly9vD00dL05k8icSGSaIb5Kjno9PPHqPj6PkfkwrPzmXrBZEniytxqHB/WL8UCdKEbYStqmlyq6Z2mS1yyjI/MjJgZ1K1oPl1/a+H1NS5kOaVyfSm+go8kK37hIz8uCtun+etGoH50mT6QnFkgYqHxvN2V7LXx4p8HkY9UoPwkBYJiRlbpNPQIb6WezBMX3VuMpTZiIxaERYobMOtE8uz+KAsMavj3Mkx1HXDhRI55vkEL4I3ETk1tyyDZGguYX3Hp5nkbKqw7bTd0u3lNLZyuC6i1aOTCKaApXNl4kfaSto60ex2y3wRZFgGUMj97ljdnfk5KIOHDVnaqnzbHIpCdVBp6sP+9tsCXDQOYLSshuKmXiuamUpE5zXlbCFMf0ro5HL5/GSB/s/bhRlCxW5qO+kE4klxQA93wWUj/XBMfj6V1Knfs3SwvGxJDMJHDdUMyE0GxIikYKbj603CGH 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)(376014)(7416014)(1800799024)(52116014)(366016)(38350700014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MBqPLgWdBLaQnuo0lZXpjemJaQBn3o63agJ31i5IvVrS1ROFoqrCLrPB218d06ZNmc6BYaqhOPzXZpz2UH1P27EO63boPBF7iko26FHD/AOHiYbR15NzB30OIDsTWR0HQJBWAW5p7QBeUbhPz8rKitAhIescHj5HN4JLhyYfgBEEDpWf6pW/yzAd3Sw7mlMSEFgYjyofs8OXYosxqvAek6Ba/WHZQeMh4ZTHIo04peSemIFHOFWAkjfpKnRaqDBGYflII/bN+cUgs17vPPEy6xILgu+6va3gdRND0b9j+S+cRrw73oHq45U3tuU0W7opW5XaTYLxwXrHfyw5QslmvI9loEuUKtaMaibTGK12ncMwYBvKly/ukaEp8A8+TmcFOh3yfb/gyKXVRjSDfhZYecUfO2UPFXeD6od3zqsqeRfKgGzYB6XLMVWOwnMJ5CTMz2aCpVyQCh5IgK6aSID4LGLrEUajaDkbVZmW2XeVscMWejnDfMrOTIqE99PKVDfsMxq6cuCCLKqObO9aYCA5695qJN8cfJIuxMHnpWuL2wPcf2Rx8SU1DUdUl6+L15pdotlhsJA9OTlX6dtuMTY8cCdU5uSw0rzW1gGF0ZPW6vN8yViM4o0RngTE7Yc3D6vFAUbfnexhWEnPjX0IgnTOpziA2HinvjJFTR65NZcV1WfBI+zQM2W70ydC9J3/hkAY8Dfl55yyyoaE0DKULqZ++fe/odSiEbA06W9+DtJRGUCtCqYW5YZqdCCP7RgmAwAj3yqvRMntIYpuX+a1l9lnaAuGgWk8YHt2ck10sICg8i6xMdewm/GGOzTe412vgqH0Ew9ySYV3sqeer2EO5pFtz9YCTXzqn1O5WI8LcvYI+/6Zk928RsaCRczt77cbJj+8PnoBnXlXpVHwxHZTK7TNFFgoK8NnrApJUgUdOQOUxl+bDxMNyuVVuMF1AB7HaULEZiurVObjLObDQ7IlCfErF25ZWMhwLnwHs1WSkCVFkaX4sX7NMfjHMYtiUZlGk9g7E0cIhBSfMI/aII4nB1PhdcsC/iAZRlGUEEO4sqYDW/fiRqvOmgdG6xCG5b5yCmrxPvtMviFza3EvKmwPFJj01hWfHVMxwWpOpvymysN37XQPg/L4tnEMlp/8OlEIe0RzOmJ48t0il8mUvKxEpvIUkZsEaCW8VRwJbeibPikjI1z8ND9Fa3kEzTHw7RHkmYPF3Uir334rULzXIgNLL/jihVOkwEi+XiaF/3/u8jXIbdMrRBNHyYoZzbe9lO5BYj7LjojDJPGvRx5gBhOW6mh7clB0sSc3td4lG6SuJrAYadZpRHbHioFlisQI7IL+9GRU4ul013ZrYndk6fhD7d7CSjz/R9ULkDmQ82BoOJjf/EyLEUiVcR5rWbyJkeMJ6ExxgfQAMnE/9rCXysqhQXYF1F3oGw6nWVBk7HHe2ADRF2cJeJtO5+KSpmZKIv3MhtDFByo1Ze1/WCEpNEmKWtvtIZPisDtVAsnjafFycr43nDhVMn9BKUBZcN1QHwMRRrGntPT8tICv8+A7d6NDS+V4HB20katudstPHfBRAk5E4BHaWbaDWTNYlIDJo98OItVn X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cc80953-6044-469a-6079-08dd54c6a516 X-MS-Exchange-CrossTenant-AuthSource: PAXPR04MB8510.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2025 11:30:30.8698 (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: vGU6wkn2n9dBILloNF6/XgYu1IQ3MGzetzrifGK3Cc4qp9SNilvzAA+0c38eyp6H1fFIyEyHSWvn6JcP1LQ9tg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8346 X-Patchwork-Delegate: kuba@kernel.org There is an off-by-one issue for the err_chained_bd path, it will free one more tx_swbd than expected. But there is no such issue for the err_map_data path. To fix this off-by-one issue and make the two error handling consistent, the increment of 'i' and 'count' remain in sync and enetc_unwind_tx_frame() is called for error handling. Fixes: fb8629e2cbfc ("net: enetc: add support for software TSO") Cc: stable@vger.kernel.org Suggested-by: Vladimir Oltean Signed-off-by: Wei Fang Reviewed-by: Vladimir Oltean Reviewed-by: Claudiu Manoil --- drivers/net/ethernet/freescale/enetc/enetc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index 9801c51b6a59..2106861463e4 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c @@ -859,8 +859,13 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb err = enetc_map_tx_tso_data(tx_ring, skb, tx_swbd, txbd, tso.data, size, size == data_len); - if (err) + if (err) { + if (i == 0) + i = tx_ring->bd_count; + i--; + goto err_map_data; + } data_len -= size; count++; @@ -889,13 +894,7 @@ static int enetc_map_tx_tso_buffs(struct enetc_bdr *tx_ring, struct sk_buff *skb dev_err(tx_ring->dev, "DMA map error"); err_chained_bd: - do { - tx_swbd = &tx_ring->tx_swbd[i]; - enetc_free_tx_frame(tx_ring, tx_swbd); - if (i == 0) - i = tx_ring->bd_count; - i--; - } while (count--); + enetc_unwind_tx_frame(tx_ring, count, i); return 0; }