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 8F61C45610 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 84D53402E5; Fri, 12 Jul 2024 12:47:02 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by mails.dpdk.org (Postfix) with ESMTP id 5D60740261 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=V4KIFNs8K97i2a0LrNxUtAa3nfrZXpIwhkxWFeYFyxq1nfIZ4PdkWaZ8HKa9gnzViOrxANsD9tIdENNVPMDKN/3MGjS93rD6AzcI9HI9Ax34tdsU0tho2xHy7DUnNsgqJfLPTzyAONDEiHequsT8e57fFd6UMKxC+JW3QcBj//S2IEUvI9O19gfFkEyi9u54Vb32fXNNwuspJ6d7kMqkEl9q6bm3VXQxBXgeKUS+jQP4WW+5kHHLStlRWJ24erq20EfAEJqh9aXelKjvxs5fF785ju0Wc/G8iTwEZLclalG+tTY5gGv3jy8bnoIDm29KcLtDpD20/2x79ZtiLJlWEw== 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=0egdr4+h0E+x5nnlMCgMy1KiJ8hT1k8ZWD6Xt1bTCHY=; b=rlPJoXTOf/Nof5ez0u6gstVTrtpCvGL4rmvVt/OdxacMQtJw8wZ1ALjL+gAzE1EPxlKvtaNePLy1OJfBvhmqulJ8QwJocu+6Ro7g0C1qlFbHV8RylJz1XRAO8mkINS0V1wFOpVehoAyGXPwhlAh1iR9qDepdvzqfS3ztG4o9Na46/hdrjUeUwNWwjKK9qNzHHxZS5DPgY4hMW2d7qar1Hv3ZcAIPJqqsQ48f0eyTPFdclEQHAZZry7xefXtBSOUFnVNebSWmhVPOHI76AEpgb4/EuRnZEQWai4pJWat8FY/6+PuD/X80qPJzBkTDY6JgP+eJvGP0RCbD4elLOycxsw== 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=0egdr4+h0E+x5nnlMCgMy1KiJ8hT1k8ZWD6Xt1bTCHY=; b=QizRmNm0OXWHE+5/IKHD2L2cmYKUpSGH3L9b1pgw59Qj10E0KFDGiZgsHYAViHbI2OBSwgBpqUP7TpavPpxJkF/nw8jWBl8CjVXZ84UvNBVD4151voNjund88C0EQzZE4FN7CiCGx+FHLSgS1bZXkljaTqa2MJxOVHTdRSfmJ+3Smzi5Q+27FcQ7jEqwfIVxvhUEZ2FYRdrOcn3EGUzsNIgHFT7liqjYXf9PmEuixdhSMZnVQ27xaW/TpBcWRRjAyjfmxN6Vspya4Cnw+2BkfSsjjB33WTBDxTKYE4mTlJSonDC7h0F7yQ517e8umqrp00ANjFR2LLtl2DYmiH3N2Q== Received: from SJ0PR05CA0044.namprd05.prod.outlook.com (2603:10b6:a03:33f::19) by IA1PR12MB6115.namprd12.prod.outlook.com (2603:10b6:208:3e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.36; Fri, 12 Jul 2024 10:46:58 +0000 Received: from SJ1PEPF000023D6.namprd21.prod.outlook.com (2603:10b6:a03:33f:cafe::d5) by SJ0PR05CA0044.outlook.office365.com (2603:10b6:a03:33f::19) 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:57 +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 SJ1PEPF000023D6.mail.protection.outlook.com (10.167.244.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7784.5 via Frontend Transport; Fri, 12 Jul 2024 10:46:56 +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.4; Fri, 12 Jul 2024 03:46:46 -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:44 -0700 From: Xueming Li To: Dengdui Huang CC: Jie Hai , dpdk stable Subject: patch 'net/hns3: fix Rx timestamp flag' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 18:43:58 +0800 Message-ID: <20240712104528.308638-13-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: SJ1PEPF000023D6:EE_|IA1PR12MB6115:EE_ X-MS-Office365-Filtering-Correlation-Id: 986388ed-efb9-43e3-1061-08dca25ff354 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XMbAusFmBpsO8uDbLVP+aYZJsoWKRzKBBIo8wiqaftQ/IQtYV2hamfxyyRby?= =?us-ascii?Q?u7jzgy0AigbnQkmz0IzXr+SaXcjF2ObgPtbwwCP5/dskBQpDF2dVkYhUGUWm?= =?us-ascii?Q?OhzLaH6uKxbwbSTM8JRXHCsqBdIqGVZkJzdbvR3jcHavsaIDrBRCW9i8unCA?= =?us-ascii?Q?R8duoZfx5iTrCCuYEGiVa2soyHfH8raXeqi7OrNkWTLSNl3kZe5As5ibfJwo?= =?us-ascii?Q?rWa/qPRUfcOOjk+JjSq0LfY06m8jQXNNQuxt2aCgQNAInIhor3XrKya7wrc6?= =?us-ascii?Q?MwZCeOVTjlQo36xWFxYiIvCaBNegyIp3Tvqk2IGHnhNjEooHD0Cn+5BKsKjd?= =?us-ascii?Q?ZmZaUz+WCVA16TDdrBm1eOR3/e3AKAV9fo9pe10oKK0vckZTAKdtnKDuIhpc?= =?us-ascii?Q?v2OLeGpnzGZZ7Paxsqrgp0gBGo8g7YvbPquxKg7y6gkFn9PqeOGS6Qu81GM2?= =?us-ascii?Q?ddD3JMk1RVKUVp2NDtOoDlGpqVZbLnXGH+5nojQKTxKGM8qZ29Zug2KmnA7j?= =?us-ascii?Q?7hf10pC95lAxVRC4TeDskPMRiKQ9NyIf5e47kKld9TGx9calXcHAXrb9uZji?= =?us-ascii?Q?Uc4VrS+ZzhEF/B/H71w2yc2nMgZ5mEcLusPbuOfn1pGzLAVudS5vSKIiEbfq?= =?us-ascii?Q?gzsaFvpmO/HJisFqFbd8ARgnchY+SAyPve2yOBnPsI3vNq3tTnLAhOhixn0+?= =?us-ascii?Q?UjJI4KL3GoUMMpG9wX/bQH4JO7TXK1WWV3fSHzQJfw4m/EZbvoPaAse9259r?= =?us-ascii?Q?iZvB8jaEScyddSVKVI4bfIcBZe81VENDwWsEEgETsvirIBoUb4z7Ox2erAn1?= =?us-ascii?Q?uYZ73evjZEnTcrr8w/ZWldEgiPt1O52c0ej8sWYM3JJexRHKtInnaWSKOBfC?= =?us-ascii?Q?ZXXo4VyMjCRPnFdnRZlb9lAKlt8m/y7d8anrFDdHBjOahRKgvnpMRwJFQn/Q?= =?us-ascii?Q?2jpxrIetxQoJkA6HIsOOIByjOrt+71e13j5HYL4XM1esGTpkCzO7SD9ckxsk?= =?us-ascii?Q?Tsy5KYlAnDji6TI0aBWX514Qt8aVY3sK+qXS3Jhvh0Lxz4LqW1TkChyxKVSV?= =?us-ascii?Q?ZeBkJvHf8lM+gglyECjgknOWn+lQ30VkV6wg7PFyXfvRryPDg8sbj3FfL9KV?= =?us-ascii?Q?z53RviXvKZX9FLRIphv2NMszrZ2WiqHDQT3aB3N5te0NWdqQQx3LCMsEXN/0?= =?us-ascii?Q?lh95pnBDdO22AlamVPYzniF3qWfA7BKuksu+109N9009CXu+s/XxGlo4Oq4G?= =?us-ascii?Q?l7/QVWra3+OammF8pge0H7CZ5zjJD4p1qoqEvWVpJy9QcfTHaZmZBHro4qXR?= =?us-ascii?Q?i+ah0ORaX2JtsaoXEci8lLJRY3AsW1Qb0/y86BLt6QSPRaBBDNNrxHcxgpwx?= =?us-ascii?Q?NpDVWTDiI0rA9+W15wxkNajp9McCUSsc0a9vOyv7i7XBf+ECSpQRYs5aLR2o?= =?us-ascii?Q?eY4INLAT9jV0wcbWaeJzGGsPV6bbqmmo?= 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)(36860700013)(376014)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 10:46:56.6795 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 986388ed-efb9-43e3-1061-08dca25ff354 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: SJ1PEPF000023D6.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6115 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=5bfe01364e8d27bf7bb372ba23dd9da0c2f1af24 Thanks. Xueming Li --- >From 5bfe01364e8d27bf7bb372ba23dd9da0c2f1af24 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Wed, 3 Apr 2024 18:16:20 +0800 Subject: [PATCH] net/hns3: fix Rx timestamp flag Cc: Xueming Li [ upstream commit e7141041d3aa74ff49b703424f120a6e2c00dcb4 ] The flag RTE_MBUF_F_RX_IEEE1588_PTP depends on the packet type and does not need to be set when reading Rx timestamp. Fixes: 38b539d96eb6 ("net/hns3: support IEEE 1588 PTP") Signed-off-by: Dengdui Huang Signed-off-by: Jie Hai --- drivers/net/hns3/hns3_rxtx.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_rxtx.c b/drivers/net/hns3/hns3_rxtx.c index 923905cb5c..45012455b7 100644 --- a/drivers/net/hns3/hns3_rxtx.c +++ b/drivers/net/hns3/hns3_rxtx.c @@ -2388,8 +2388,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, { struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(rxq->hns); - mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP | - RTE_MBUF_F_RX_IEEE1588_TMST; + mbuf->ol_flags |= RTE_MBUF_F_RX_IEEE1588_TMST; if (hns3_timestamp_rx_dynflag > 0) { *RTE_MBUF_DYNFIELD(mbuf, hns3_timestamp_dynfield_offset, rte_mbuf_timestamp_t *) = timestamp; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:14.876287835 +0800 +++ 0012-net-hns3-fix-Rx-timestamp-flag.patch 2024-07-12 18:40:13.926594249 +0800 @@ -1 +1 @@ -From e7141041d3aa74ff49b703424f120a6e2c00dcb4 Mon Sep 17 00:00:00 2001 +From 5bfe01364e8d27bf7bb372ba23dd9da0c2f1af24 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e7141041d3aa74ff49b703424f120a6e2c00dcb4 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index e6d277ffad..55311402fe 100644 +index 923905cb5c..45012455b7 100644 @@ -22 +24 @@ -@@ -2389,8 +2389,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf, +@@ -2388,8 +2388,7 @@ hns3_rx_ptp_timestamp_handle(struct hns3_rx_queue *rxq, struct rte_mbuf *mbuf,