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 309A642D46 for ; Sun, 25 Jun 2023 08:46:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C0A6410ED; Sun, 25 Jun 2023 08:46:12 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2088.outbound.protection.outlook.com [40.107.237.88]) by mails.dpdk.org (Postfix) with ESMTP id 08B5542C24 for ; Sun, 25 Jun 2023 08:46:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CsqMYw54YBAzMvqK9svinjwM3gJQAtO6cYahk2JLhlQ3RIXO0hQZvLnp6uUo6MQ9vtkAtNlO5qbjRdDLJKXmXCJEJIml+vecQ8r3mdYCpYdhY0YKGy+xk8yEUi3zEAGH+pOeRzkOqLLp+1kDPJptvvKAErtL2og6DaoUb1Y1E/sogAznSzgGwEV/tDpzoQbkynLN2MDuz4IUZsbi22T6c45bX+MRPPZEynk7mfkp8M4+46s/qHAMWAvgCBMHty98NSOfGl63M29S1OB5BbzT2GJrttSoYWSUcWGmoj7CMd2LQ3W+RyHRwamIuaXAjP2dBFTi0f7eI/yEyGPBAP1wew== 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=63VzfjLfn/e5j/OsE6UPHRWFXWC0/AMCdlUsMxzBCsk=; b=RvCYMp9EqNlzMitb1RqKJlXoprWWpBodYPDlvm8ReIrygKhCYVcm7s0JL/YTdYDkaNEjs5CstYybkUy2fqFkOpIWDzZtyrJsQesszXTpO2vcH6Ke1LIEdx5TUdibSxXycFSX4bK0XPIj8TbC1wy4ema8ubNPLr8lH9lJLso5/0B9PJ4rz/JJVjcHAijnEXYaQ4tE20TrcNPbR30uMot2Y6T6tdSZwEFvHeIALSd8FHuSD1xyd+f60zjp2LWDqzoSLF5RBqHB7truLPCKgBiKTlI1vhfz5f3i4Sh9oIbTlHlh9SFVIFm2P8ctCM0K5h92RfnCTzVx+H1WjiZHdmEx3Q== 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=63VzfjLfn/e5j/OsE6UPHRWFXWC0/AMCdlUsMxzBCsk=; b=gDZVCUAZGBf73sxpxTO2d2HLCuROV4Il2AyRLM+HD+v7uwzjVNz9q40PuWRlp4I6MOLIzOe4t/4TRjj7zn6lA0NXjA6SP+7Lg3U520pWH8AibdPegoPkyOiqzda/3oxtN0vBxxRhhqviXe9fGdKPvKv/QGQx+0gSHSbHgWB6p9qqOqznDBnLt0lHmkibX+lFVl1ulUDHjJ+fD5PomqXnjy4YXnpCBKxB3t/Ohzyr+3/02CpQcVFs+KuS43mexbMzGP0apd6nsZN2zy6j8weUARGcStiGYHjaPk276gKe08zhjTs52pELC43cPSDZRxe2UX0rPwofWSwflnGyRjtzeA== Received: from BN8PR03CA0017.namprd03.prod.outlook.com (2603:10b6:408:94::30) by SA3PR12MB8024.namprd12.prod.outlook.com (2603:10b6:806:312::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.23; Sun, 25 Jun 2023 06:46:09 +0000 Received: from BN8NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:408:94:cafe::92) by BN8PR03CA0017.outlook.office365.com (2603:10b6:408:94::30) 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:09 +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:08 +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:46:00 -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:59 -0700 From: Xueming Li To: Wenjing Qiao CC: Qi Zhang , dpdk stable Subject: patch 'net/ice: fix timestamp enabling' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:37 +0800 Message-ID: <20230625063544.11183-120-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_|SA3PR12MB8024:EE_ X-MS-Office365-Filtering-Correlation-Id: c8abbae5-4c34-4689-edde-08db7547db9a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /9nToH7a//Rmhm7HEUUDPleeE8IMfUZ3B9573PrYbODEfnk9k7dqRvFa9zxUEQhN8nz2GMvD0jpuwzRD8srz52qPsFisZ9Ownzd3IuVxZl2DTOo8lc+pI1rX5c6Mvx005kYllT0Jumg4kUyc6b9LMI6Ard0h7tRy8cKLz0Rcfz0UCt1oydZbwxIVFpwe7GSPDr7JFpFo7gEOwyawUJrpQNz0S6dPxYPRLHc7RU/hUfTwW8BNH+IXkboEkNrRR4aTyPaUt8oFzCN4PLWL7ne0bTv6JWhxm8xvLygd3Q0c6VQuKCN17CAU4k1otG+Bnoje1U779gXjJIZKqw39mRPwRsQQrL5UzstBf+m66e5haKX/6Fq6ZP9V+LSW/46ZJ/wKA5rdTD/oqEC7vUQvnbkn/yOprlXsu9hbZ4SF9NUIB83FxHo3NHZ7MHBmhqeTW+0Ym8LilFI6wQoRJFxCk7UpsSJzKIJ+rC0sToNz5STcUeK8fkM3YFMdjcSvfiFcPAklCQapRfLLeDoy8DZGqcDWpyui/H+BRnrM5V+D1GxRcKUnak/xuB8lM//YyJ+U1lqINgZon9iWKKXS6p7E39vBrLVlt6OrwtNbRrnYEVRGvJMo45+py5lJdDUl8t6iNEpA68NSgOx+CtgJes/t2W2m5XE2Nb9N46N0otC6mvNjfwLAVMhuVlduoXBxtB0X6fHFCYUWiSJk6qwuaOCjFD1NPAo7QQBUe50UThCkYnhEy4gWLYrd53UdvJ3NoKkh0KVrqxy2/cpmv3yUpHIh7uBafQ== 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)(39860400002)(376002)(346002)(396003)(136003)(451199021)(46966006)(36840700001)(40470700004)(40460700003)(2906002)(7696005)(82310400005)(82740400003)(6666004)(356005)(7636003)(2616005)(83380400001)(47076005)(336012)(426003)(1076003)(26005)(186003)(6286002)(16526019)(53546011)(966005)(36860700001)(55016003)(40480700001)(41300700001)(54906003)(86362001)(478600001)(316002)(36756003)(70586007)(70206006)(4326008)(6916009)(5660300002)(8676002)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:46:08.8517 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8abbae5-4c34-4689-edde-08db7547db9a 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: SA3PR12MB8024 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=1f35681b6eb48bb00fa9d72aa69ecd47813b3a5b Thanks. Xueming Li --- >From 1f35681b6eb48bb00fa9d72aa69ecd47813b3a5b Mon Sep 17 00:00:00 2001 From: Wenjing Qiao Date: Fri, 19 May 2023 02:47:38 -0400 Subject: [PATCH] net/ice: fix timestamp enabling Cc: Xueming Li [ upstream commit 71021636964dcd074ff2ee1663dc67ec830e6a14 ] Use the following command: 1. dpdk-testpmd -c 0x3 -n 4 --force-max-simd-bitwidth=64 -- -i --enable-rx-timestamp 2. port stop 0 3. port config 0 rx_offload timestamp off 4. port start 0 Then start it, log will show timestamp info, which should not appear. Because ice_timestamp_dynflag is still more than 0, code will still calculate timestamp. So fix it. Fixes: f9c561ffbccc ("net/ice: fix performance for Rx timestamp") Signed-off-by: Wenjing Qiao Acked-by: Qi Zhang --- drivers/net/ice/ice_rxtx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index c998b0080a..7b6784b177 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1765,7 +1765,8 @@ ice_rx_scan_hw_ring(struct ice_rx_queue *rxq) ice_rxd_to_vlan_tci(mb, &rxdp[j]); rxd_to_pkt_fields_ops[rxq->rxdid](rxq, mb, &rxdp[j]); #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - if (ice_timestamp_dynflag > 0) { + if (ice_timestamp_dynflag > 0 && + (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { rxq->time_high = rte_le_to_cpu_32(rxdp[j].wb.flex_ts.ts_high); if (unlikely(is_tsinit)) { @@ -2131,7 +2132,8 @@ ice_recv_scattered_pkts(void *rx_queue, rxd_to_pkt_fields_ops[rxq->rxdid](rxq, first_seg, &rxd); pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0); #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - if (ice_timestamp_dynflag > 0) { + if (ice_timestamp_dynflag > 0 && + (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { rxq->time_high = rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high); if (unlikely(is_tsinit)) { @@ -2621,7 +2623,8 @@ ice_recv_pkts(void *rx_queue, rxd_to_pkt_fields_ops[rxq->rxdid](rxq, rxm, &rxd); pkt_flags = ice_rxd_error_to_pkt_flags(rx_stat_err0); #ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC - if (ice_timestamp_dynflag > 0) { + if (ice_timestamp_dynflag > 0 && + (rxq->offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP)) { rxq->time_high = rte_le_to_cpu_32(rxd.wb.flex_ts.ts_high); if (unlikely(is_tsinit)) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:01.665449800 +0800 +++ 0119-net-ice-fix-timestamp-enabling.patch 2023-06-25 14:31:58.575773900 +0800 @@ -1 +1 @@ -From 71021636964dcd074ff2ee1663dc67ec830e6a14 Mon Sep 17 00:00:00 2001 +From 1f35681b6eb48bb00fa9d72aa69ecd47813b3a5b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 71021636964dcd074ff2ee1663dc67ec830e6a14 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org