From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E7BF346C4D for ; Wed, 30 Jul 2025 09:11:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C8A640E2E; Wed, 30 Jul 2025 09:11:40 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2053.outbound.protection.outlook.com [40.107.93.53]) by mails.dpdk.org (Postfix) with ESMTP id 8D35E40DD5 for ; Wed, 30 Jul 2025 09:11:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jiIgNpqrHnZOxvcUV1whgRL9rcHneRO4RAJs8M5bACBdWmNFEOA9i36zx0KTCH4t/i2FLbRqTI6mfEmClrQtFtw7Wnk96wclzjmw3wkdQ6WQnYt0WWXFbC3aLS6gTgHqWCESxRgiDVFNoBp1dfo4P+aAN3BfXfOHoBFVlKKiJpVM4g96mFdJ2hP6KZLciqo/vemDm0fiGFXxocjZ4/4XFGUaSUyvi3h47jym7DXm6CcSOW4oPG7YbHg8bqXrMCYrf17zluof7uu2phrAdyIO7UFoRQXIgw0fzUG+qHWRikljKnIF6tn3HK1mFd25n4n3ebIISQ6NncE3UnrVeusPmw== 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=T15eVcEqj9CxXd2GHgdqgkPrCs2o4Fz3FQBVn21eW30=; b=dmLIHJG6h6QACvNDbkjj9jXTArONYcVNlzFMPvE3xSAJppRoGtxaeYhGCHazpoQ48AsL+/S79Gz9cj/xpsGtRWKyxndIeJeCJ7yvgMmN0xizhUgwYVUCncRaOlmwpZVWvEIM64fyZDsz7ZTsVh3/0hOFEWaoBpuxo360iIZ7eZt706ZkjDEw5OVNxCujJK+28DikRsDa7/H4Dtn77fhBP6ePfNdKjthnLbsqyEIviobmuCnvbVnWxib6EWrL0VzxeJiwnQDaCWgeIBbCqS6Q6T5DA669Q8mAsB2VCWxjQIFWL38mUmsFD/ms7vB4X2kufPL/SFh/XC0cYG0HkHIC2w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T15eVcEqj9CxXd2GHgdqgkPrCs2o4Fz3FQBVn21eW30=; b=QEHewP/3vm+tmeUm22IGev22Kps747cwbOIOmFIWW0EztZfO5SkrsapcJ30LWulo0j5NMxvmg/86KuFEBGcKftc9ADOalwBHcBo6c9xRiAJHUvLQZKIPfYzhct/i6FrIKGBS/F9zLhZl49rR6O53XClJm5PLN655Oncy5RmKp9cZoOUpJczEW+mbNpCKdyPqHyaobg1Hs7mEellGLgiSshOxDCvZOx7qeo1cT1HDLaGCO/HN3PpQKC3FJSKEOGRPBn2rvH6v6Ioxm26rcLCXDEYCt+cU9+/c0klcgUI4uIionHwavBQGVSrXMohNeTNG3uLpq0GbNAZiJ7SjJLi6Mw== Received: from SJ0PR13CA0096.namprd13.prod.outlook.com (2603:10b6:a03:2c5::11) by CYYPR12MB8703.namprd12.prod.outlook.com (2603:10b6:930:c4::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.11; Wed, 30 Jul 2025 07:11:31 +0000 Received: from BY1PEPF0001AE18.namprd04.prod.outlook.com (2603:10b6:a03:2c5:cafe::20) by SJ0PR13CA0096.outlook.office365.com (2603:10b6:a03:2c5::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8989.11 via Frontend Transport; Wed, 30 Jul 2025 07:11:31 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BY1PEPF0001AE18.mail.protection.outlook.com (10.167.242.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:11:30 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:11:09 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:11:06 -0700 From: Xueming Li To: Dengdui Huang CC: Xueming Li , Huisong Li , "Jie Hai" , dpdk stable Subject: patch 'net/hns3: fix Rx packet without CRC data' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:12 +0800 Message-ID: <20250730071045.136672-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY1PEPF0001AE18:EE_|CYYPR12MB8703:EE_ X-MS-Office365-Filtering-Correlation-Id: 938d637d-fd8c-4696-19d9-08ddcf384ed6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|376014|36860700013|1800799024|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4znJ7gsrrdlvZTBToMLqKdWqAMlaqkARz+nOtMmpWVCffkYLcjfDQqciC/bY?= =?us-ascii?Q?PMm1iNzfTSEZcIkEKm/5//VQnXxlSJE5g41hwPtJtR9XkrTwMZ6XJhWWgrC4?= =?us-ascii?Q?vo8mR00GRldBc2XYMJ2iWjrUDDVQnVYdTE3IajLUYGt5qHa8mQgbNs7viDAY?= =?us-ascii?Q?tY/a1u+BVkj9ASlfzoZHC+s5vXgYU46h1V+/AE98AHqfLjumEO/QxQLtOqxB?= =?us-ascii?Q?+m5m6lsALrLFkDE07Ybz3PbTeFHLrzWUKN5SqTsnyfZ8wbtzKWom8amBhLrB?= =?us-ascii?Q?I3IdH6f+q/HEEQuQC/Bx2WYPYvq007K0Z6MrlLjXPPIJudfq63tMXxKWqddP?= =?us-ascii?Q?YiiHO76WyCLsr62od8E8ok7tBXhIZlSdshQ8T4ARhWThzvzuCN6tCl1bEMm4?= =?us-ascii?Q?oyS543RjMkvJdPMG3V6R0+W5nSG6gWtocvY0os5I+glJNy5aB6aS3ZmRo7Di?= =?us-ascii?Q?B5RX0QlKLn3DNozJqV3+83BCsXcX+6/v3bhlp2wvOM/cO+AvpRRUw8g3Wvwr?= =?us-ascii?Q?WJItqc2hxfi1I6L4W9Zp9UShf3/kZQNM4c+6JlGK8mwSLmseOBjmyWsgWyot?= =?us-ascii?Q?4Obn8OpRiIaMgjPmoO3SA5/KCfhRDwuoMqsCY3NFsfN0FROqpS0j7L4DATTo?= =?us-ascii?Q?YdyQzICTGKnNX4cAFJpYMH8uNKi4aRnFrf5OjyCuKFSaSPeqjIVcMtPtazI4?= =?us-ascii?Q?vTpog1lIaBu1qyivEIdyxpRnGhu3ZLMetiwWXcOT1r6fPNUFEA0LSdph8+7E?= =?us-ascii?Q?O985PqvdDS9QIfqMXtpCWB1kZ4IGsx5GXR+AtJLfMmB3ytTTHrQ+Fbw6mVq5?= =?us-ascii?Q?wHcS2k5BYA3BVFWvwzA8vkrD/hm+SBUIKyzskftk08shGxx+Dr9hBi2I9Jfj?= =?us-ascii?Q?k/xK/V+VPT5Shj8VnM9Easy/CwXyTo2wzxtRJcFxv1j+mUhFyJAz/kJ97nIV?= =?us-ascii?Q?m68lXyQip4+Lzyhsxw+hxEnkBnCyHAVw9bIBSbLgfnDUUVIZW8vDv/fzYqe8?= =?us-ascii?Q?N6jvnMaS+UATUa2xBjOwdKTFj9QBhHXA2i4EeB2jzuvIawOUGvoLBdBlKJ6e?= =?us-ascii?Q?agYd4HGpNAZxHzPgeS6dfCmcEn5NA6CQ/XLnN4l96sk+n7M1gnX9R6KULdOE?= =?us-ascii?Q?hK49phdiSaJySqOfQAOYmA3VwjBxl+UTcruKL0gmTnNc+UewoSDNMWnhJ1ZO?= =?us-ascii?Q?XAWGw4R3hG6kutf659/tLm0hnprUd82nAidsiZ6gbnuS842NGkYB5jVWGPnB?= =?us-ascii?Q?qa84PsNAc6opANjxW3uMFn7ecY+LGRQhAmhUVJsCbBRJ0k8CnXVJ3xJzhi27?= =?us-ascii?Q?QNYAgktriPU9U4p1xHBomZUpVfwiB8XtCfLyvc9cqLn+Qu9lgOCX9miuonX3?= =?us-ascii?Q?gi7p0lBOBhiBdnEwi5/IE+H3WjLJppeY2bxUCwfr1MjNUW+0f/kQkIkRqSx4?= =?us-ascii?Q?mWWE4x1RolXUrVDJ4qGIAe/zi7AjbYM1PolgKEbdXwsWGP4AywMX3dsp36s0?= =?us-ascii?Q?rmPkdfPeoxJshIk90NW2YCQfoqKdf44KfHYA?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(82310400026)(376014)(36860700013)(1800799024)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:11:30.1841 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 938d637d-fd8c-4696-19d9-08ddcf384ed6 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BY1PEPF0001AE18.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8703 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=edac72158acfa4dd2213aedcb238b4eea8a627d4 Thanks. Xueming Li --- >From edac72158acfa4dd2213aedcb238b4eea8a627d4 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Tue, 15 Jul 2025 11:16:49 +0800 Subject: [PATCH] net/hns3: fix Rx packet without CRC data Cc: Xueming Li [ upstream commit 99c065da47c432e9529f761b457cde1fd8c89f20 ] When KEEP_CRC offload is enabled, the CRC data is still stripped in following cases: 1. For HIP08 network engine, the packet type is TCP and the length is less than or equal to 60B. 2. For HIP09 network engine, the packet type is IP and the length is less than or equal to 60B. So driver has to recaculate packet CRC for this rare scenarios. In addition, to avoid impacting performance, KEEP_CRC is not supported when NEON or SVE algorithm is used. Fixes: 8973d7c4ca12 ("net/hns3: support keeping CRC") Cc: stable@dpdk.org Signed-off-by: Dengdui Huang Acked-by: Huisong Li Acked-by: Jie Hai --- drivers/net/hns3/hns3_ethdev.c | 2 + drivers/net/hns3/hns3_ethdev.h | 23 +++++ drivers/net/hns3/hns3_rxtx.c | 119 +++++++++++++++++++++----- drivers/net/hns3/hns3_rxtx.h | 3 + drivers/net/hns3/hns3_rxtx_vec.c | 4 +- drivers/net/hns3/hns3_rxtx_vec_neon.h | 19 ---- drivers/net/hns3/hns3_rxtx_vec_sve.c | 3 +- 7 files changed, 128 insertions(+), 45 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 99566375ea..f14fb61cbb 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2743,6 +2743,7 @@ hns3_get_capability(struct hns3_hw *hw) hw->udp_cksum_mode = HNS3_SPECIAL_PORT_SW_CKSUM_MODE; pf->support_multi_tc_pause = false; hw->rx_dma_addr_align = HNS3_RX_DMA_ADDR_ALIGN_64; + hw->strip_crc_ptype = HNS3_STRIP_CRC_PTYPE_TCP; return 0; } @@ -2764,6 +2765,7 @@ hns3_get_capability(struct hns3_hw *hw) hw->udp_cksum_mode = HNS3_SPECIAL_PORT_HW_CKSUM_MODE; pf->support_multi_tc_pause = true; hw->rx_dma_addr_align = HNS3_RX_DMA_ADDR_ALIGN_128; + hw->strip_crc_ptype = HNS3_STRIP_CRC_PTYPE_IP; return 0; } diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h index 00d226d71c..0ce4974da6 100644 --- a/drivers/net/hns3/hns3_ethdev.h +++ b/drivers/net/hns3/hns3_ethdev.h @@ -54,6 +54,10 @@ #define HNS3_SPECIAL_PORT_SW_CKSUM_MODE 0 #define HNS3_SPECIAL_PORT_HW_CKSUM_MODE 1 +#define HNS3_STRIP_CRC_PTYPE_NONE 0 +#define HNS3_STRIP_CRC_PTYPE_TCP 1 +#define HNS3_STRIP_CRC_PTYPE_IP 2 + #define HNS3_UC_MACADDR_NUM 128 #define HNS3_VF_UC_MACADDR_NUM 48 #define HNS3_MC_MACADDR_NUM 128 @@ -655,6 +659,25 @@ struct hns3_hw { */ uint8_t udp_cksum_mode; + /* + * When KEEP_CRC offload is enabled, the CRC data of some type packets + * whose length is less than or equal to HNS3_KEEP_CRC_OK_MIN_PKT_LEN + * is still be stripped on some network engine. So here has to use this + * field to distinguish the difference between different network engines. + * value range: + * - HNS3_STRIP_CRC_PTYPE_TCP + * This value for HIP08 network engine. + * Indicates that only the IP-TCP packet type is stripped. + * + * - HNS3_STRIP_CRC_PTYPE_IP + * This value for HIP09 network engine. + * Indicates that all IP packet types are stripped. + * + * - HNS3_STRIP_CRC_PTYPE_NONE + * Indicates that all packet types are not stripped. + */ + uint8_t strip_crc_ptype; + struct hns3_port_base_vlan_config port_base_vlan_cfg; pthread_mutex_t flows_lock; /* rte_flow ops lock */ diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 1fb34e286d..9c0d4b4cd4 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -11,6 +11,7 @@ #include #include #include +#include #if defined(RTE_ARCH_ARM64) #include #include @@ -1779,8 +1780,9 @@ hns3_rx_buf_len_calc(struct rte_mempool *mp, uint16_t *rx_buf_len) } static int -hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t buf_size, - uint16_t nb_desc) +hns3_rxq_conf_runtime_check(struct hns3_hw *hw, + const struct rte_eth_rxconf *conf, + uint16_t buf_size, uint16_t nb_desc) { struct rte_eth_dev *dev = &rte_eth_devices[hw->data->port_id]; eth_rx_burst_t pkt_burst = dev->rx_pkt_burst; @@ -1813,6 +1815,14 @@ hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t buf_size, return -EINVAL; } } + + if ((conf->offloads & RTE_ETH_RX_OFFLOAD_KEEP_CRC) && + pkt_burst != hns3_recv_pkts_simple && + pkt_burst != hns3_recv_scattered_pkts) { + hns3_err(hw, "KEEP_CRC offload is not supported with the current Rx function."); + return -EINVAL; + } + return 0; } @@ -1849,7 +1859,7 @@ hns3_rx_queue_conf_check(struct hns3_hw *hw, const struct rte_eth_rxconf *conf, } if (hw->data->dev_started) { - ret = hns3_rxq_conf_runtime_check(hw, *buf_size, nb_desc); + ret = hns3_rxq_conf_runtime_check(hw, conf, *buf_size, nb_desc); if (ret) { hns3_err(hw, "Rx queue runtime setup fail."); return ret; @@ -1970,6 +1980,8 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc, else rxq->crc_len = 0; + rxq->keep_crc_fail_ptype = hw->strip_crc_ptype; + rxq->bulk_mbuf_num = 0; rte_spinlock_lock(&hw->lock); @@ -2443,6 +2455,55 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, pf->rx_timestamp = timestamp; } +static inline bool +hns3_need_recalculate_crc(struct hns3_rx_queue *rxq, struct rte_mbuf *m) +{ + uint32_t ptype = m->packet_type; + + if (rxq->keep_crc_fail_ptype == HNS3_STRIP_CRC_PTYPE_NONE) + return false; + + if (m->pkt_len > HNS3_KEEP_CRC_OK_MIN_PKT_LEN) + return false; + + if (!(RTE_ETH_IS_IPV4_HDR(ptype) || RTE_ETH_IS_IPV6_HDR(ptype))) + return false; + + if (rxq->keep_crc_fail_ptype == HNS3_STRIP_CRC_PTYPE_TCP) + return (ptype & RTE_PTYPE_L4_MASK) == RTE_PTYPE_L4_TCP; + + return true; +} + +/* + * The hns3 driver requires that mbuf size must be at least 512B. + * When CRC is stripped by hardware, the pkt_len must be less than + * or equal to 60B. Therefore, the space of the mbuf is enough + * to insert the CRC. + */ +static_assert(HNS3_KEEP_CRC_OK_MIN_PKT_LEN < HNS3_MIN_BD_BUF_SIZE, + "buffer size too small to insert CRC"); + +static inline void +hns3_recalculate_crc(struct rte_mbuf *m) +{ + char *append_data; + uint32_t crc; + + crc = rte_net_crc_calc(rte_pktmbuf_mtod(m, void *), + m->data_len, RTE_NET_CRC32_ETH); + + /* + * After CRC is stripped by hardware, pkt_len and data_len do not + * contain the CRC length. Therefore, after CRC data is appended + * by PMD again. + */ + append_data = rte_pktmbuf_append(m, RTE_ETHER_CRC_LEN); + + /* CRC data is binary data and does not care about the byte order. */ + memcpy(append_data, &crc, RTE_ETHER_CRC_LEN); +} + uint16_t hns3_recv_pkts_simple(void *rx_queue, struct rte_mbuf **rx_pkts, @@ -2513,8 +2574,7 @@ hns3_recv_pkts_simple(void *rx_queue, rxdp->rx.bd_base_info = 0; rxm->data_off = RTE_PKTMBUF_HEADROOM; - rxm->pkt_len = (uint16_t)(rte_le_to_cpu_16(rxd.rx.pkt_len)) - - rxq->crc_len; + rxm->pkt_len = (uint16_t)(rte_le_to_cpu_16(rxd.rx.pkt_len)); rxm->data_len = rxm->pkt_len; rxm->port = rxq->port_id; rxm->hash.rss = rte_le_to_cpu_32(rxd.rx.rss_hash); @@ -2539,6 +2599,12 @@ hns3_recv_pkts_simple(void *rx_queue, if (rxm->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) rxm->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP; + if (unlikely(rxq->crc_len > 0) && + hns3_need_recalculate_crc(rxq, rxm)) + hns3_recalculate_crc(rxm); + rxm->pkt_len -= rxq->crc_len; + rxm->data_len -= rxq->crc_len; + hns3_rxd_to_vlan_tci(rxq, rxm, l234_info, &rxd); /* Increment bytes counter */ @@ -2705,10 +2771,10 @@ hns3_recv_scattered_pkts(void *rx_queue, rxm->data_off = RTE_PKTMBUF_HEADROOM; rxm->data_len = rte_le_to_cpu_16(rxd.rx.size); + rxm->next = NULL; if (!(bd_base_info & BIT(HNS3_RXD_FE_B))) { last_seg = rxm; - rxm->next = NULL; continue; } @@ -2723,22 +2789,6 @@ hns3_recv_scattered_pkts(void *rx_queue, */ first_seg->pkt_len = rte_le_to_cpu_16(rxd.rx.pkt_len); - /* - * This is the last buffer of the received packet. If the CRC - * is not stripped by the hardware: - * - Subtract the CRC length from the total packet length. - * - If the last buffer only contains the whole CRC or a part - * of it, free the mbuf associated to the last buffer. If part - * of the CRC is also contained in the previous mbuf, subtract - * the length of that CRC part from the data length of the - * previous mbuf. - */ - rxm->next = NULL; - if (unlikely(rxq->crc_len > 0)) { - first_seg->pkt_len -= rxq->crc_len; - recalculate_data_len(last_seg, rxm, rxq); - } - first_seg->port = rxq->port_id; first_seg->hash.rss = rte_le_to_cpu_32(rxd.rx.rss_hash); first_seg->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; @@ -2767,6 +2817,31 @@ hns3_recv_scattered_pkts(void *rx_queue, if (first_seg->packet_type == RTE_PTYPE_L2_ETHER_TIMESYNC) rxm->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP; + /* + * This is the last buffer of the received packet. If the CRC + * is not stripped by the hardware: + * - Subtract the CRC length from the total packet length. + * - If the last buffer only contains the whole CRC or a part + * of it, free the mbuf associated to the last buffer. If part + * of the CRC is also contained in the previous mbuf, subtract + * the length of that CRC part from the data length of the + * previous mbuf. + * + * In addition, the CRC is still stripped for a kind of packets + * in hns3 NIC: + * 1. All IP-TCP packet whose the length is less than and equal + * to 60 Byte (no CRC) on HIP08 network engine. + * 2. All IP packet whose the length is less than and equal to + * 60 Byte (no CRC) on HIP09 network engine. + * In this case, the PMD calculates the CRC and appends it to + * mbuf. + */ + if (unlikely(rxq->crc_len > 0)) { + if (hns3_need_recalculate_crc(rxq, first_seg)) + hns3_recalculate_crc(first_seg); + first_seg->pkt_len -= rxq->crc_len; + recalculate_data_len(last_seg, rxm, rxq); + } hns3_rxd_to_vlan_tci(rxq, first_seg, l234_info, &rxd); diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h index b6a6513307..f182ff6a9d 100644 --- a/drivers/net/hns3/hns3_rxtx.h +++ b/drivers/net/hns3/hns3_rxtx.h @@ -178,6 +178,8 @@ (HNS3_TXD_VLD_CMD | HNS3_TXD_FE_CMD | HNS3_TXD_DEFAULT_BDTYPE) #define HNS3_TXD_SEND_SIZE_SHIFT 16 +#define HNS3_KEEP_CRC_OK_MIN_PKT_LEN 60 + enum hns3_pkt_l2t_type { HNS3_L2_TYPE_UNICAST, HNS3_L2_TYPE_MULTICAST, @@ -341,6 +343,7 @@ struct hns3_rx_queue { */ uint8_t pvid_sw_discard_en:1; uint8_t ptype_en:1; /* indicate if the ptype field enabled */ + uint8_t keep_crc_fail_ptype:2; uint64_t mbuf_initializer; /* value to init mbufs used with vector rx */ /* offset_table: used for vector, to solve execute re-order problem */ diff --git a/drivers/net/hns3/hns3_rxtx_vec.c b/drivers/net/hns3/hns3_rxtx_vec.c index b24bd47e58..daadd7e19f 100644 --- a/drivers/net/hns3/hns3_rxtx_vec.c +++ b/drivers/net/hns3/hns3_rxtx_vec.c @@ -187,8 +187,8 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) RTE_ETH_RX_OFFLOAD_VLAN_STRIP | RTE_ETH_RX_OFFLOAD_VLAN_EXTEND | RTE_ETH_RX_OFFLOAD_QINQ_STRIP | - RTE_ETH_RX_OFFLOAD_TIMESTAMP; - + RTE_ETH_RX_OFFLOAD_TIMESTAMP | + RTE_ETH_RX_OFFLOAD_KEEP_CRC; if (dev->data->scattered_rx) return -ENOTSUP; diff --git a/drivers/net/hns3/hns3_rxtx_vec_neon.h b/drivers/net/hns3/hns3_rxtx_vec_neon.h index 0dc6b9f0a2..60ec501a2a 100644 --- a/drivers/net/hns3/hns3_rxtx_vec_neon.h +++ b/drivers/net/hns3/hns3_rxtx_vec_neon.h @@ -148,14 +148,6 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq, 8, 9, 10, 11, /* rx.rss_hash to rte_mbuf.hash.rss */ }; - uint16x8_t crc_adjust = { - 0, 0, /* ignore pkt_type field */ - rxq->crc_len, /* sub crc on pkt_len */ - 0, /* ignore high-16bits of pkt_len */ - rxq->crc_len, /* sub crc on data_len */ - 0, 0, 0, /* ignore non-length fields */ - }; - /* compile-time verifies the shuffle mask */ RTE_BUILD_BUG_ON(offsetof(struct rte_mbuf, pkt_len) != offsetof(struct rte_mbuf, rx_descriptor_fields1) + 4); @@ -171,7 +163,6 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq, uint8x16_t pkt_mb1, pkt_mb2, pkt_mb3, pkt_mb4; uint64x2_t mbp1, mbp2; uint16x4_t bd_vld = {0}; - uint16x8_t tmp; uint64_t stat; /* calc how many bd valid */ @@ -225,16 +216,6 @@ hns3_recv_burst_vec(struct hns3_rx_queue *__restrict rxq, pkt_mb3 = vqtbl2q_u8(pkt_mbuf3, shuf_desc_fields_msk); pkt_mb4 = vqtbl2q_u8(pkt_mbuf4, shuf_desc_fields_msk); - /* 4 packets remove crc */ - tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb1), crc_adjust); - pkt_mb1 = vreinterpretq_u8_u16(tmp); - tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb2), crc_adjust); - pkt_mb2 = vreinterpretq_u8_u16(tmp); - tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb3), crc_adjust); - pkt_mb3 = vreinterpretq_u8_u16(tmp); - tmp = vsubq_u16(vreinterpretq_u16_u8(pkt_mb4), crc_adjust); - pkt_mb4 = vreinterpretq_u8_u16(tmp); - /* save packet info to rx_pkts mbuf */ vst1q_u8((void *)&sw_ring[pos + 0].mbuf->rx_descriptor_fields1, pkt_mb1); diff --git a/drivers/net/hns3/hns3_rxtx_vec_sve.c b/drivers/net/hns3/hns3_rxtx_vec_sve.c index 8aa4448558..67c87f570e 100644 --- a/drivers/net/hns3/hns3_rxtx_vec_sve.c +++ b/drivers/net/hns3/hns3_rxtx_vec_sve.c @@ -36,8 +36,7 @@ hns3_desc_parse_field_sve(struct hns3_rx_queue *rxq, /* init rte_mbuf.rearm_data last 64-bit */ rx_pkts[i]->ol_flags = RTE_MBUF_F_RX_RSS_HASH; rx_pkts[i]->hash.rss = rxdp[i].rx.rss_hash; - rx_pkts[i]->pkt_len = rte_le_to_cpu_16(rxdp[i].rx.pkt_len) - - rxq->crc_len; + rx_pkts[i]->pkt_len = rte_le_to_cpu_16(rxdp[i].rx.pkt_len); rx_pkts[i]->data_len = rx_pkts[i]->pkt_len; l234_info = rxdp[i].rx.l234_info; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:12.902584064 +0800 +++ 0001-net-hns3-fix-Rx-packet-without-CRC-data.patch 2025-07-30 15:02:12.763725462 +0800 @@ -1 +1 @@ -From 99c065da47c432e9529f761b457cde1fd8c89f20 Mon Sep 17 00:00:00 2001 +From edac72158acfa4dd2213aedcb238b4eea8a627d4 Mon Sep 17 00:00:00 2001 @@ -3 +3 @@ -Date: Fri, 16 May 2025 15:15:19 +0800 +Date: Tue, 15 Jul 2025 11:16:49 +0800 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 99c065da47c432e9529f761b457cde1fd8c89f20 ] @@ -27,3 +30,3 @@ - drivers/net/hns3/hns3_rxtx.c | 129 +++++++++++++++++++++----- - drivers/net/hns3/hns3_rxtx.h | 6 ++ - drivers/net/hns3/hns3_rxtx_vec.c | 3 +- + drivers/net/hns3/hns3_rxtx.c | 119 +++++++++++++++++++++----- + drivers/net/hns3/hns3_rxtx.h | 3 + + drivers/net/hns3/hns3_rxtx_vec.c | 4 +- @@ -32 +35 @@ - 7 files changed, 141 insertions(+), 44 deletions(-) + 7 files changed, 128 insertions(+), 45 deletions(-) @@ -35 +38 @@ -index 9f99525e70..50c6ed0744 100644 +index 99566375ea..f14fb61cbb 100644 @@ -55 +58 @@ -index 085a83773f..d164b9e38c 100644 +index 00d226d71c..0ce4974da6 100644 @@ -58 +61 @@ -@@ -51,6 +51,10 @@ +@@ -54,6 +54,10 @@ @@ -69 +72 @@ -@@ -652,6 +656,25 @@ struct hns3_hw { +@@ -655,6 +659,25 @@ struct hns3_hw { @@ -96 +99 @@ -index 49b6f16ccd..bde46733b0 100644 +index 1fb34e286d..9c0d4b4cd4 100644 @@ -107,12 +110 @@ -@@ -94,6 +95,10 @@ hns3_rx_queue_release(void *queue) - rte_free(rxq->sw_ring); - rxq->sw_ring = NULL; - } -+ if (rxq->crc_ctx) { -+ rte_net_crc_free(rxq->crc_ctx); -+ rxq->crc_ctx = NULL; -+ } - rte_free(rxq); - } - } -@@ -1768,8 +1773,9 @@ hns3_rx_buf_len_calc(struct rte_mempool *mp, uint16_t *rx_buf_len) +@@ -1779,8 +1780,9 @@ hns3_rx_buf_len_calc(struct rte_mempool *mp, uint16_t *rx_buf_len) @@ -130 +122 @@ -@@ -1802,6 +1808,14 @@ hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t buf_size, +@@ -1813,6 +1815,14 @@ hns3_rxq_conf_runtime_check(struct hns3_hw *hw, uint16_t buf_size, @@ -145 +137 @@ -@@ -1838,7 +1852,7 @@ hns3_rx_queue_conf_check(struct hns3_hw *hw, const struct rte_eth_rxconf *conf, +@@ -1849,7 +1859,7 @@ hns3_rx_queue_conf_check(struct hns3_hw *hw, const struct rte_eth_rxconf *conf, @@ -154 +146 @@ -@@ -1959,6 +1973,15 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc, +@@ -1970,6 +1980,8 @@ hns3_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t nb_desc, @@ -160,7 +151,0 @@ -+ rxq->crc_ctx = rte_net_crc_set_alg(RTE_NET_CRC_SCALAR, RTE_NET_CRC32_ETH); -+ if (rxq->crc_ctx == NULL) { -+ hns3_err(hw, "Failed to allocate the CRC context."); -+ hns3_rx_queue_release(rxq); -+ return -ENOMEM; -+ } -+ @@ -170 +155 @@ -@@ -2433,6 +2456,54 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, +@@ -2443,6 +2455,55 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, @@ -204 +189 @@ -+hns3_recalculate_crc(struct hns3_rx_queue *rxq, struct rte_mbuf *m) ++hns3_recalculate_crc(struct rte_mbuf *m) @@ -209 +194,2 @@ -+ crc = rte_net_crc_calc(rxq->crc_ctx, rte_pktmbuf_mtod(m, void *), m->data_len); ++ crc = rte_net_crc_calc(rte_pktmbuf_mtod(m, void *), ++ m->data_len, RTE_NET_CRC32_ETH); @@ -225 +211 @@ -@@ -2503,8 +2574,7 @@ hns3_recv_pkts_simple(void *rx_queue, +@@ -2513,8 +2574,7 @@ hns3_recv_pkts_simple(void *rx_queue, @@ -235 +221 @@ -@@ -2529,6 +2599,12 @@ hns3_recv_pkts_simple(void *rx_queue, +@@ -2539,6 +2599,12 @@ hns3_recv_pkts_simple(void *rx_queue, @@ -241 +227 @@ -+ hns3_recalculate_crc(rxq, rxm); ++ hns3_recalculate_crc(rxm); @@ -248 +234 @@ -@@ -2695,10 +2771,10 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2705,10 +2771,10 @@ hns3_recv_scattered_pkts(void *rx_queue, @@ -260 +246 @@ -@@ -2713,22 +2789,6 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2723,22 +2789,6 @@ hns3_recv_scattered_pkts(void *rx_queue, @@ -283 +269 @@ -@@ -2757,6 +2817,31 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2767,6 +2817,31 @@ hns3_recv_scattered_pkts(void *rx_queue, @@ -308 +294 @@ -+ hns3_recalculate_crc(rxq, first_seg); ++ hns3_recalculate_crc(first_seg); @@ -316 +302 @@ -index 0bce89ebaa..b602b2326b 100644 +index b6a6513307..f182ff6a9d 100644 @@ -336,10 +321,0 @@ -@@ -362,6 +365,9 @@ struct hns3_rx_queue { - - struct rte_mbuf fake_mbuf; /* fake mbuf used with vector rx */ - -+ /* The CRC context, which is used by software to calculate CRC data. */ -+ struct rte_net_crc *crc_ctx; -+ - /* - * The following fields are not accessed in the I/O path, so they are - * placed at the end. @@ -347 +323 @@ -index 9708ec614e..bf37ce51b1 100644 +index b24bd47e58..daadd7e19f 100644 @@ -350,4 +326,4 @@ -@@ -185,7 +185,8 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) - struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; - uint64_t offloads_mask = RTE_ETH_RX_OFFLOAD_TCP_LRO | - RTE_ETH_RX_OFFLOAD_VLAN | +@@ -187,8 +187,8 @@ hns3_rx_check_vec_support(struct rte_eth_dev *dev) + RTE_ETH_RX_OFFLOAD_VLAN_STRIP | + RTE_ETH_RX_OFFLOAD_VLAN_EXTEND | + RTE_ETH_RX_OFFLOAD_QINQ_STRIP | @@ -354,0 +331 @@ +- @@ -361 +338 @@ -index f2e155c9f5..8fd81b8612 100644 +index 0dc6b9f0a2..60ec501a2a 100644