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 0A98B42D46 for ; Sun, 25 Jun 2023 08:46:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 052C540ED8; Sun, 25 Jun 2023 08:46:11 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2055.outbound.protection.outlook.com [40.107.96.55]) by mails.dpdk.org (Postfix) with ESMTP id 50CAC40A7F for ; Sun, 25 Jun 2023 08:46:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YjHxrqXia0GJS+Jv8u1rXU9eOLZFnwq/KCbpLWPqt6fztJ9fTZYZbAk5zucgs6QRSqvw4SM3BlaCeXlkPFzqQ69me7vKdXz5TrhXrDR8dd4bOxH+e4gNF6gGek84HZblv8Ikjn1CB/0K2cjvrwS1TzfTRoZuU4xIeGmgxave7fJxmK83j2g8143wqRbQJceRVfUOgBDXaqn07ChHdSf3GvrkjMbMJ5NEvYycePgr0vg4QJ+xPsdy7i0lfZoeAHDtN/decroOqE10wJ2AlL15S/cozkrUMA4I5YxnhhwN7IdWopRn+qenopwH9jT1UhgkceDdY2jdPaViuLberCMtPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=zFep5vatKQhEeFmWCfdbU5jrZSmZoYW9EEHbvumx8Z4=; b=H7uJBG1GvNGL5vkw0mbYT0McOkR8IJR2sYj/vf7KeH59nNDwe1Jw+m/+wZNzbczUZ9eqHze/p69wXYxWkaDykpa4Wxs7rPuKlXjosASEHQbUunn2cfoXvFlBFIrrGQgrF1hECFOEMsmRBnfVUj83v+xb2E+Ga2KanaRg7++VxX3BE3ukZQ6pxLnkqaJBkNJqP3m9YjTXXSKX+75vTJ9As4dc8oDG8jtaXbWvv2jLrFr1OSbp4E3C+73xBEcKDK0MQF0ez+fkz2dZPk5EqS3BBc9HjIgBrnIR/aDv3/EryI7Gg3r+04sNeNOEHjc3Z7AMIiV96yt35GnKFNMNkHewxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.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 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=zFep5vatKQhEeFmWCfdbU5jrZSmZoYW9EEHbvumx8Z4=; b=j8ZzCL8e+NNdNoo4oGSIpHrqr/TmxRp90O1FcreAnGQWebuBZYorunnaZGd0EGLmJdMdWO6j90yZImEKKQpJfdbSA4nRDX/zmpEhaCXEY0ZlRf0DqhPcq+XQ4wDLZ5pQM4hcV/oz7ldoJWn6fFd3JeI1QdlX2ocxfWCK/21eeerOJRnQ0y8m9+/Q3GYfhBPq1KOcaR2ZoLpe02LJhPjRi/kWVFlE/cQultwWZH5685/XD6+aBPkZQaV5zdxWIhlje4uKQJrv/FDjdQqBxA99WGxBwtvp6Q36tQrCtxOuqXRwSwanBmrMBAOaC9D8LYOySG5o8cDa9ZIwP/oIWWHRyw== Received: from BN8PR03CA0024.namprd03.prod.outlook.com (2603:10b6:408:94::37) by SJ1PR12MB6169.namprd12.prod.outlook.com (2603:10b6:a03:45c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.45; Sun, 25 Jun 2023 06:46:07 +0000 Received: from BN8NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::d2) by BN8PR03CA0024.outlook.office365.com (2603:10b6:408:94::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:46:07 +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 BN8NAM11FT061.mail.protection.outlook.com (10.13.177.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:46:07 +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.986.5; Sat, 24 Jun 2023 23:45:59 -0700 Received: from nvidia.com (10.126.230.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.986.37; Sat, 24 Jun 2023 23:45:57 -0700 From: Xueming Li To: Wenjing Qiao CC: Qi Zhang , dpdk stable Subject: patch 'net/ice: adjust timestamp mbuf register' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:36 +0800 Message-ID: <20230625063544.11183-119-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: BN8NAM11FT061:EE_|SJ1PR12MB6169:EE_ X-MS-Office365-Filtering-Correlation-Id: fd2af1b9-8432-40a0-d4b5-08db7547daba X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xLmOfXHil7xLb/uPI8F4Tyg3+DXcInVJPLWba42kLYf7lKQp4UaCBWXimojpo4SzENZNJEf9XxOrjYHx7+xq3f9ke0dudS3MYVlBn9wxw2D+O5PipD1ydtMnsNuB7b2EESYmn2c9fGlUtFZib5OZV2g48HF4NENFTg4zG2XRRRsZIQ8h9rQPGc74QZx4Tjlixf6nXW/p9raCVupBs9ufUEVTWzFQRoeQnCZLImCbI4dRZtdP58gAdB8tz+DIpaO9lAaqS2K8fcdjxAWHhZrupwjKaIFNF1xfuUTC9QZgnIJ6bBXTM1MW0ZzyQwC1oBvbk0s5ya9FJheAPIsKcC+ff/nOPuMMknPr+szCCyZnM9yPlJN6+f7hEFBNITEOIYGKllJfLSRN4x2mhM/TKmL1U6SjUwdf0OdOnqz4hId5HEGL3m/c+DLapRB55vLeL0IS9d2ekbqslptZUac63c6ETepmcbyyc45MMN3hPqUlFb03/AVwQSMDtFCgQUCSfD25NNvlESAYkyPNCoNHD7um35nfdY9qdSDz8D6Wz6VGzBZpPZHTvCniHhQRNXfucmIAG4CjVGT/wqTR3YHM0s3kz4fnjIG+H1gr2ukI0Tf1SECYgLUZSCv1wXAmM7nWiuXyivCqpT1vWieEat33nf4co7co/drYdS1JFWUW2qy/XvU9vSmxtgxk8ZxVXRG8htloazfn3QIBMHzRegWwu5ZAutDaxTOHk8bMXbo47PHsfSEwATAAOvdm+pXV9IvUtGOCt5UldIekznYQ9SBnnIMaiA== 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:(13230028)(4636009)(376002)(136003)(346002)(396003)(39860400002)(451199021)(46966006)(36840700001)(40470700004)(7696005)(6666004)(478600001)(70206006)(54906003)(70586007)(36860700001)(83380400001)(2616005)(47076005)(40480700001)(426003)(336012)(36756003)(40460700003)(86362001)(55016003)(2906002)(82310400005)(1076003)(16526019)(6286002)(186003)(53546011)(26005)(966005)(7636003)(356005)(82740400003)(6916009)(4326008)(316002)(41300700001)(8936002)(8676002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:46:07.3831 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd2af1b9-8432-40a0-d4b5-08db7547daba 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: BN8NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6169 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=3b032bbf788f7836463bb6a4a261dc8586613660 Thanks. Xueming Li --- >From 3b032bbf788f7836463bb6a4a261dc8586613660 Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Fri, 19 May 2023 03:12:16 -0400 Subject: [PATCH] net/ice: adjust timestamp mbuf register Cc: Xueming Li [ upstream commit b16e1326048ea0c138cf794186985bb95eb7ff20 ] Due to only support timestamp at port level, adjust timestamp mbuf register to dev config. Fixes: 953e74e6b73a ("net/ice: enable Rx timestamp on flex descriptor") Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/net/ice/ice_ethdev.c | 10 ++++++++++ drivers/net/ice/ice_rxtx.c | 5 ++++- drivers/net/ice/ice_rxtx.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 4eb7de4ad5..c004aa42ee 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3674,6 +3674,16 @@ ice_dev_start(struct rte_eth_dev *dev) } } + if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) { + /* Register mbuf field and flag for Rx timestamp */ + ret = rte_mbuf_dyn_rx_timestamp_register(&ice_timestamp_dynfield_offset, + &ice_timestamp_dynflag); + if (ret) { + PMD_DRV_LOG(ERR, "Cannot register mbuf field/flag for timestamp"); + goto tx_err; + } + } + /* program Rx queues' context in hardware*/ for (nb_rxq = 0; nb_rxq < data->nb_rx_queues; nb_rxq++) { ret = ice_rx_queue_start(dev, nb_rxq); diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 560c1a4af7..c998b0080a 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -274,7 +274,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) return -EINVAL; } - if (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) { + if (!rxq->ts_enable && (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { /* Register mbuf field and flag for Rx timestamp */ err = rte_mbuf_dyn_rx_timestamp_register( &ice_timestamp_dynfield_offset, @@ -284,6 +284,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq) "Cannot register mbuf field/flag for timestamp"); return -EINVAL; } + rxq->ts_enable = true; } memset(&rx_ctx, 0, sizeof(rx_ctx)); @@ -671,6 +672,8 @@ ice_rx_queue_start(struct rte_eth_dev *dev, uint16_t rx_queue_id) return -EINVAL; } + if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) + rxq->ts_enable = true; err = ice_program_hw_rx_queue(rxq); if (err) { PMD_DRV_LOG(ERR, "fail to program RX queue %u", diff --git a/drivers/net/ice/ice_rxtx.h b/drivers/net/ice/ice_rxtx.h index 89569029e1..268289716e 100644 --- a/drivers/net/ice/ice_rxtx.h +++ b/drivers/net/ice/ice_rxtx.h @@ -120,6 +120,7 @@ struct ice_rx_queue { uint64_t hw_time_update; /* SW time of HW record updating */ struct rte_eth_rxseg_split rxseg[ICE_RX_MAX_NSEG]; uint32_t rxseg_nb; + bool ts_enable; /* if rxq timestamp is enabled */ }; struct ice_tx_entry { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.635554100 +0800 +++ 0118-net-ice-adjust-timestamp-mbuf-register.patch 2023-06-25 14:31:58.575773900 +0800 @@ -1 +1 @@ -From b16e1326048ea0c138cf794186985bb95eb7ff20 Mon Sep 17 00:00:00 2001 +From 3b032bbf788f7836463bb6a4a261dc8586613660 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b16e1326048ea0c138cf794186985bb95eb7ff20 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 5a581bd2ba..2b0a977ba9 100644 +index 4eb7de4ad5..c004aa42ee 100644 @@ -24 +26 @@ -@@ -3691,6 +3691,16 @@ ice_dev_start(struct rte_eth_dev *dev) +@@ -3674,6 +3674,16 @@ ice_dev_start(struct rte_eth_dev *dev)