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 D2E2B4301F for ; Thu, 10 Aug 2023 02:11:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CC8EB40DD8; Thu, 10 Aug 2023 02:11:37 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2086.outbound.protection.outlook.com [40.107.237.86]) by mails.dpdk.org (Postfix) with ESMTP id 7C4CC406B6 for ; Thu, 10 Aug 2023 02:11:36 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SL7bq3TxmqKznulRndN8hBPqUIOBReWbEbsVS8msBewp2rejkSNq/yKeOY5UWR44B003bT4D//S5Xf0w3fAnEYcFWEsR4y46CaJOod2N9pZQDEstzXiU1N8ytTwzTgp5XcWeGJtTfEVLaeb/Gow5ztzJp8cnGXsncEBvtDc95aFY1/KVmKDhD19FBeYLWf+WzyhdSU67CiyoDhay/3tAZOi7MuPskZv8xODqaN+V7I+jbcMYcGNRoiwAIIPId8yNCI7scdWDykMptaGuQqxB//tZ+2141rXE0N/WqYoTGDNESNgn7hxVSW+p5aYfTII27cyaHZZXQe3lyQrCEPzkIA== 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=tO7qtqiwNPlxcjq22xKJPuDA1SnDSCR5BxIRRIg607k=; b=d7ny0sksUgSiy0VFaHARSinSohe5p4ixgyQZrfd9fe/bFi4ZKlO1UxCd7AlCe8qmoFGShAQr94bUKYmw2M8DrFs8ZCVLfb3SzCctn2cJf8bYya3kBUSsrFEJC0r2d8Ow47kYrdinIKQytakEmVefy7TBpzaCK2yZ3Dxgz671eZO/NgctCQxEuEbtIBF6Jvpf2sr5xc6r+3ZS79JBCHXGbvvceQfT4Cdck0zSJq/bWKMIZ7fxWfT7eGY5BuxGW1ZIMjB874CPOCJFx8bRgjNBff7Qf7qp0ZWqCZeYcMgIyv0zXKqvC09AzFXRFKG5wNnDkJGZ2FcpEdZhYGQROcf0Rw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=tO7qtqiwNPlxcjq22xKJPuDA1SnDSCR5BxIRRIg607k=; b=ih1QFxSOxkujkT/DYeauH791CCL/xsGXbqjREM/zwVDzITwEWXY1WtxA0q3zDORwKQPOcdy4R+AchelZYjrGzF8ER+cjdScwC/8xNXm07Y7rCCT3YphKSCOGYloSHBJEzmUmk4qdK0cDyM946N0bTr9sGG0K31sT/sTL733lBagxebIKmqBd54CMXW6SlXSYpsUD9lbWhcbJsr+1j7ipGFshlW1AYIz/hCxkN+83mS99t5epXpjYHv1coP5h6UV3mp+BAf/CIWDsHnEVOOPkSegjH93QdCyqVJqzimR2yp65SxoxmzTWyPnx8wXLDisDtZ7qll1A3hlSx12lO8PAzw== Received: from BYAPR06CA0052.namprd06.prod.outlook.com (2603:10b6:a03:14b::29) by SJ2PR12MB8134.namprd12.prod.outlook.com (2603:10b6:a03:4fa::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Thu, 10 Aug 2023 00:11:34 +0000 Received: from CO1PEPF000044EF.namprd05.prod.outlook.com (2603:10b6:a03:14b:cafe::8b) by BYAPR06CA0052.outlook.office365.com (2603:10b6:a03:14b::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27 via Frontend Transport; Thu, 10 Aug 2023 00:11:34 +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 CO1PEPF000044EF.mail.protection.outlook.com (10.167.241.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:11:34 +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.986.5; Wed, 9 Aug 2023 17:11:20 -0700 Received: from nvidia.com (10.126.231.37) 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; Wed, 9 Aug 2023 17:11:19 -0700 From: Xueming Li To: Qiming Yang CC: Jie Hai , Qi Zhang , dpdk stable Subject: patch 'net/ixgbe: fix Rx and Tx queue status' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:26 +0800 Message-ID: <20230810001045.2662-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] 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: CO1PEPF000044EF:EE_|SJ2PR12MB8134:EE_ X-MS-Office365-Filtering-Correlation-Id: a92165cd-4c0f-4274-e0e7-08db99365b5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9ZBsFLzUhMUdBe9KDwnCPehCbVbtWkNx4prKEU8jGSW0FZewBt0q18u57s6Q3xd8zbkhwhFEeWMsAjqMhKOeYaBxS/rfYHM70IWxFE31ToEBfNQIdtEimYJX9jnspRuvdE/Fi+WTu+ykgs/+UQT1sdyvnWpJjsH2YgzaqRmdtQNbkwM9J/Utg8q6ljK08R/g392eloYjbWYFpXBBQBO9zIzfc0dn1WAxk446hEXLuP53rwSkBUriLIyP6selHoEYiFmnYvp1fKixILb8oNkFbJgJMZKUMoHu1MSYF1JlznNA60o63DpPniDF7DfzeJCC938ffGTO4R9RW3UwMncrZ2ynQlTUs0Wf6z0oN/ObZSGjaoJERXfziJ9MP5T3MxiBI8jjgfjJ1rIWS34FIF1ZXOSfQCoj+Le+1xdkRMpcP/lJNLsLoQlH1h3poSM3JofBuRexgVOlJcXzMzKoW855ZA/Xn+kF9JcR5Jmby/VJUtBV5tswW7FHO917MiXhdxpR838zDhCeX8BKzjElOyaZDnFvWk9nHOJcKKZMzBBvfZkvX1k3cFymxSMd2W/B2pSXEQljRxXN5So/xnYMc/13ulw4RGsddB+Q0b+y9mtpcGl2xvR8AQz1Gez96NYHEfj9sypu6DFaEv3mJ/8Cy03tPLEWWjneEAKCuxOB+XJrR5YQWFalL4nssHS2DN8Na8WQp7LZRBzwKrTu32qmTQpv6YKIAq9rxdUsr/fqf5VYrd4itAcN9Vrf6E5+s/nQPVwiReeLKXME4OTL/eUDdc53EQ== 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:(13230028)(4636009)(346002)(376002)(396003)(39860400002)(136003)(451199021)(1800799006)(186006)(82310400008)(46966006)(40470700004)(36840700001)(40460700003)(55016003)(40480700001)(53546011)(54906003)(336012)(1076003)(16526019)(6286002)(6666004)(7696005)(966005)(19627235002)(478600001)(83380400001)(47076005)(2616005)(36860700001)(426003)(4326008)(316002)(6916009)(41300700001)(70586007)(70206006)(8676002)(8936002)(26005)(2906002)(5660300002)(36756003)(356005)(86362001)(82740400003)(7636003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:11:34.2085 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a92165cd-4c0f-4274-e0e7-08db99365b5a 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: CO1PEPF000044EF.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8134 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 08/11/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=995e54d4d673d9b395da894758b33efed1ad00a2 Thanks. Xueming Li --- >From 995e54d4d673d9b395da894758b33efed1ad00a2 Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Wed, 12 Jul 2023 08:31:51 +0000 Subject: [PATCH] net/ixgbe: fix Rx and Tx queue status Cc: Xueming Li [ upstream commit 4a8490075692c32797be4280aea33772a5865038 ] Ixgbevf driver don't enable queue start/stop functions, queue status is not updated when the HW queue enabled or disabled. It caused application can't get correct queue status. This patch fixes the issue by updating the queue states when the queue is disabled or enabled. Fixes: 429c6d86b371 ("ixgbe: prepare for vector pmd") Fixes: f0c50e5f56fa ("ixgbe: move PMD specific fields out of base driver") Signed-off-by: Qiming Yang Signed-off-by: Jie Hai Acked-by: Qi Zhang --- drivers/net/ixgbe/ixgbe_rxtx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c index dd07f0961e..a3a7c68806 100644 --- a/drivers/net/ixgbe/ixgbe_rxtx.c +++ b/drivers/net/ixgbe/ixgbe_rxtx.c @@ -3379,6 +3379,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) if (txq != NULL) { txq->ops->release_mbufs(txq); txq->ops->reset(txq); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -3388,6 +3389,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) if (rxq != NULL) { ixgbe_rx_queue_release_mbufs(rxq); ixgbe_reset_rx_queue(adapter, rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } /* If loopback mode was enabled, reconfigure the link accordingly */ @@ -5825,6 +5827,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) } while (--poll_ms && !(txdctl & IXGBE_TXDCTL_ENABLE)); if (!poll_ms) PMD_INIT_LOG(ERR, "Could not enable Tx Queue %d", i); + else + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } for (i = 0; i < dev->data->nb_rx_queues; i++) { @@ -5842,6 +5846,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) } while (--poll_ms && !(rxdctl & IXGBE_RXDCTL_ENABLE)); if (!poll_ms) PMD_INIT_LOG(ERR, "Could not enable Rx Queue %d", i); + else + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; rte_wmb(); IXGBE_WRITE_REG(hw, IXGBE_VFRDT(i), rxq->nb_rx_desc - 1); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.952400200 +0800 +++ 0109-net-ixgbe-fix-Rx-and-Tx-queue-status.patch 2023-08-09 21:51:18.274352000 +0800 @@ -1 +1 @@ -From 4a8490075692c32797be4280aea33772a5865038 Mon Sep 17 00:00:00 2001 +From 995e54d4d673d9b395da894758b33efed1ad00a2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 4a8490075692c32797be4280aea33772a5865038 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 61f17cd90b..954ef241a0 100644 +index dd07f0961e..a3a7c68806 100644 @@ -27 +29 @@ -@@ -3378,6 +3378,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) +@@ -3379,6 +3379,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) @@ -35 +37 @@ -@@ -3387,6 +3388,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) +@@ -3388,6 +3389,7 @@ ixgbe_dev_clear_queues(struct rte_eth_dev *dev) @@ -43 +45 @@ -@@ -5896,6 +5898,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) +@@ -5825,6 +5827,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) @@ -52 +54 @@ -@@ -5913,6 +5917,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev) +@@ -5842,6 +5846,8 @@ ixgbevf_dev_rxtx_start(struct rte_eth_dev *dev)