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 BB21945610 for ; Fri, 12 Jul 2024 12:47:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B50A042E6C; Fri, 12 Jul 2024 12:47:02 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2068.outbound.protection.outlook.com [40.107.236.68]) by mails.dpdk.org (Postfix) with ESMTP id E6C2340261 for ; Fri, 12 Jul 2024 12:47:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GrePaQfRfrg5WAFy/sniLTnyqiOVfjmF1XQZw73j0FqnPGeLaBS0WEFAC4rR1d4plrtu0r2IF/FD+/HzBZY3DgV9ftoyBcnaxbfNzt030+Peem8DLiVgGGqrk3Cx1I17xJzMQ5GATpnf/LI6n4yOARRPP8C5PfeYtoeIAVXdMyP1dZC/NnHhCwJlVvNVQ5mg6dQJ1HKgTPIGy1Bji/plNSEOXwxSA0FvZ/0x82dBAkE4bONnNQh6+hNfh12ytqtmjlGbaw8W9w0OOnpbCuG/rURMHrKMd0Dtw9bq7JcpS5ISBBLb9rwqBFrsAtzQAHl1yNoziPCI2N4ZlwOyJSt0og== 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=1/Ua++xfG8+twc0nwB/cj0b58LDUSH18VZJKoi5C+cM=; b=HSvTwMWtfZxmwS8r5Z9vDpNECWYXieA6EasPxsM3fT2YBk77wvMZ5ICPmCTF0LtqdqF9fpRXzGz4BlABJpaIeqqqmg7G5/kbC/FQq9Dgp6n/SCCTWMEqKpECw4vmCkeWpoxkRP66w1NyXaeL9FzrEoxPtBnwjvKFdS92L8NqYdtFfwQmYmvnM1B0diLf9dDDs9Akgj75Ej/+rQ69uL3qElxamGHcrTRVu8kwgin9KRLxVKfHCyCbRViUVh/hCLDYeZ2etdBp7Yl+m40rGrof9D840OH5/P8mrImX7IinOAO7VcFp/Lr8If9Yt+DqwqrJmWboKWTX/EjO4rHFgPw3Tg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=1/Ua++xfG8+twc0nwB/cj0b58LDUSH18VZJKoi5C+cM=; b=mmp4kTOTVMLykvogcNSvkhcmnrIZx5av/fLsuniCEYygm/4QXw1SVxRJFgLjAMHC59sUrDeo3eF9XpLyEZ8A4AocpCoCSoEmTULzxMfexGUS/cwQsCuHzwyKD/MmQnuMO09/irKfpS9FAeZ7H5HJuciKp33WGlWqslmiRzbcqXTBwabwXboGc/t15VkjZvQHscjLxHU6hqian0PGFaciRs5Y8WW0YNnKmphwof+q3+OOQ646rqoQ7GJ4TFoP2h2aXmHqCgvslCLZXs0J6MZhqJo20wLqInnbLN6JDkCFxBA63Hq6UXZigD4ZJdAqx17In2z0XuOvULYXW1LY+BqZgQ== Received: from DM6PR11CA0036.namprd11.prod.outlook.com (2603:10b6:5:190::49) by PH0PR12MB7861.namprd12.prod.outlook.com (2603:10b6:510:26e::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Fri, 12 Jul 2024 10:46:58 +0000 Received: from DS1PEPF0001709B.namprd05.prod.outlook.com (2603:10b6:5:190:cafe::79) by DM6PR11CA0036.outlook.office365.com (2603:10b6:5:190::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 10:46:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DS1PEPF0001709B.mail.protection.outlook.com (10.167.18.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 10:46:58 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Fri, 12 Jul 2024 03:46:44 -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.4; Fri, 12 Jul 2024 03:46:42 -0700 From: Xueming Li To: Dengdui Huang CC: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix offload flag of IEEE 1588' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:57 +0800 Message-ID: <20240712104528.308638-12-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712104528.308638-1-xuemingl@nvidia.com> References: <20240712104528.308638-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS1PEPF0001709B:EE_|PH0PR12MB7861:EE_ X-MS-Office365-Filtering-Correlation-Id: 994ec620-bdb4-4d69-7e46-08dca25ff42d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|36860700013|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AaJ1uRakAxH281k8FrSQqOjWVEBTOsV+Wadk/VwTbYq/n+hguZj8A4SxbV9u?= =?us-ascii?Q?Uyw5OvJ7rlj5bwrF6jQ48T60DrFhT8QxgdzRE8PnVtIXmlblhgGxjkwJDFTL?= =?us-ascii?Q?7QzjXVvHt1j6xhefXwT5X+xLLl26vHXZYVhuonYusVeYtGIWB1FXSwOs0WdG?= =?us-ascii?Q?O/62ioafX33MdWPjde8NA+E6mZ82VPVqL58QKa9O3YumgXFqPsrL7946LsFz?= =?us-ascii?Q?B8+1kA36QqytvZMcKLcDAFHtKtb9L16jRKTs95DswaC9O5GGNGWwVfazO9N1?= =?us-ascii?Q?JjNvX7QOAatRC8kec4pmq4+CMlAJEwSmrOUQwOJVeOllvDyJqWqrI1GSUHnL?= =?us-ascii?Q?GNeRj8dLwOUHZAe4dKrmjY67kb+HfpgNVrPs9JbJmZtAC5i4Knq0UoF9Td+u?= =?us-ascii?Q?12NFrChTfzDDZ1Nu3KdsECykpJGOravOoUGzAGLaK0f+P8AJwqPPOq004KpX?= =?us-ascii?Q?Sm6JLXAb4yN2t2q7Q0/XbVcnoJiGON2zajA5P3wEX9F7JVVT3mQS0fH67/yr?= =?us-ascii?Q?erJh3xkfKuRiOQg/luHO/Gko4JErzHxhxWAE7CPY71sVxQapOmrFR/zvxsMX?= =?us-ascii?Q?e97WUos3Ree7c3vs09namFNmbacbPMJEu3WIcwoHJRoXcPFogO/GYjc7qcFe?= =?us-ascii?Q?UBSOfAzW6+OkmwQBIfj3TD4hRnH4CPoj0taDZcMw71ddiEoqeq+iPXcbfyXJ?= =?us-ascii?Q?zi4vOYb5+MvE8BjMpOzTumcCITxXEJdsk/ffD6PmLKE1oNPPaN7AMWvoSJa8?= =?us-ascii?Q?pmyu92T+FGPALH1tCLAFQgKvJ4BJNpK4OR8/lNtEY8dSVWwaArMeVkVG9Nsk?= =?us-ascii?Q?1YnyfWIex959qvsJ8b4KiRrJPOYF5EEJdsrsnmqNyaFcFgyCuqrTJgH5OBGB?= =?us-ascii?Q?j37h0N67vCsZhUHSDMv3o4CV10douQEREV1od525m/JZtsjxp9k0NbMofJWm?= =?us-ascii?Q?CGwWxYB+4fvvla/JGvqk2Rohw1A9KVHAqQ7Bq2c6Nc0BCo+JYCHvm72Bu+0R?= =?us-ascii?Q?T+TOXCWI8Ot0ce9w1TtU1+J6jYLbfAvye53+Zvi0SVD+lYn2IR+sdyNf6SQC?= =?us-ascii?Q?JR/tkGjsN8E5sfoO1ZbHyR+IQlnt/gwkc3NZ379TzayzRGFcjnRKqDYQkMM7?= =?us-ascii?Q?X6wohCD6W44v00NO9bF+IFtIK9JKDN/aZc2h9BQiuQPvs+MI5BlGeZwj0WrU?= =?us-ascii?Q?JqYacMhN5KkN2PqLaPh+OJHkJ37AMCfH9VUSzRfpku6wsGhfLJcwhmo0nMZK?= =?us-ascii?Q?20mJ4pC+WkqBIoRkiIk/Mmw1k+vdSwNfjU0ZSpFcN0wMa+QaXQ4mnVmt3ZW7?= =?us-ascii?Q?nIx1MkYz4yCSUId0FZxaybxCU7mei9xZtlZ76UZXD4jp+sVoQD2oTKNOTQKn?= =?us-ascii?Q?gXhfIma9pu9kVFEk8EfM2UdOEUfRYffE565lJXx10fMhD0gl+9m46Sj3GgUr?= =?us-ascii?Q?Z8PjfD4J/jCBdLqY3ROopTKKLdEbEEOW?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(36860700013)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:58.0420 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 994ec620-bdb4-4d69-7e46-08dca25ff42d 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.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DS1PEPF0001709B.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7861 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/24. 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=bc0e61340450ca4ad98809fd846c05032e03d4b1 Thanks. Xueming Li --- >From bc0e61340450ca4ad98809fd846c05032e03d4b1 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 3 Apr 2024 18:16:19 +0800 Subject: [PATCH] net/hns3: fix offload flag of IEEE 1588 Cc: Xueming Li [ upstream commit bd8f90f0175914bc7df9ef2e9170a850faaa253b ] Currently, the RTE_MBUF_F_RX_IEEE1588_TMST offload flag will not be set when the scatter algorithm is used. This patch fixes it. Fixes: 4801f0403b58 ("net/hns3: fix IEEE 1588 PTP for scalar scattered Rx") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rxtx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 9087bcffed..923905cb5c 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2668,6 +2668,7 @@ hns3_recv_scattered_pkts(void *rx_queue, continue; } + first_seg->ol_flags = 0; if (unlikely(bd_base_info & BIT(HNS3_RXD_TS_VLD_B))) hns3_rx_ptp_timestamp_handle(rxq, first_seg, timestamp); @@ -2697,7 +2698,7 @@ hns3_recv_scattered_pkts(void *rx_queue, 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; + first_seg->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; if (unlikely(bd_base_info & BIT(HNS3_RXD_LUM_B))) { first_seg->hash.fdir.hi = rte_le_to_cpu_16(rxd.rx.fd_id); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.838292339 +0800 +++ 0011-net-hns3-fix-offload-flag-of-IEEE-1588.patch 2024-07-12 18:40:13.926594249 +0800 @@ -1 +1 @@ -From bd8f90f0175914bc7df9ef2e9170a850faaa253b Mon Sep 17 00:00:00 2001 +From bc0e61340450ca4ad98809fd846c05032e03d4b1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bd8f90f0175914bc7df9ef2e9170a850faaa253b ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 73a388b2fe..e6d277ffad 100644 +index 9087bcffed..923905cb5c 100644 @@ -23 +25 @@ -@@ -2669,6 +2669,7 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2668,6 +2668,7 @@ hns3_recv_scattered_pkts(void *rx_queue, @@ -31 +33 @@ -@@ -2698,7 +2699,7 @@ hns3_recv_scattered_pkts(void *rx_queue, +@@ -2697,7 +2698,7 @@ hns3_recv_scattered_pkts(void *rx_queue,