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 0A0794301F for ; Thu, 10 Aug 2023 02:11:43 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 038FC40DD8; Thu, 10 Aug 2023 02:11:43 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2062.outbound.protection.outlook.com [40.107.244.62]) by mails.dpdk.org (Postfix) with ESMTP id 754A0406B6 for ; Thu, 10 Aug 2023 02:11:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UzdnXZDgL5RoVfgTsxEi8vLhdXW1jGhUG65qDMPVcCKQSeEzs2fd3su25EadRGWvauC0uB23qERyovtlBDRJ/YjBrPDpwglLq1FXkEUAbshC/pAQRrFq7yRnAD+tY0CLz+TpVGazsxEOELfY3BJOrm7zGM2HBxHc942XaExB7ZynunSFIDUL/vWGz8O9s7ZlJX5KOTNpMdjtV5XJ5GXqLOPPZ8yYyG6rm6W7E+Ca9x4tD4W8Bla3k7TPZlq00GYCs1UUHhyFYWGBy7pN3IxPyY4AvF/v6RQpUwEy/F1wheKkqhvsy1v2MaEkUTWtnKYJcZLmiQZTwvXBcb03Gzt32w== 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=HQYz2t9e2zAdlbB/aobMW3Cd9NXlxVhJRaN1JsorTOQ=; b=M2YEcWSAzWCzBHXSY52mvMPHbd+y3odDt0gXcoMhoMrvTiOvoZJgRN7JPe9h5DlWgDY5TVqft7KWyM5LBlzWkEm61J+9bZiRZ2muhDp2NbfIa4Bqk0BxvH91c7Okccfi9AKFzNXvpzCUKKIKHCYK+e8Nrtwl/PMVkTmD0Grmk5EUcVxxumaYu0WRYSNp0HJN7xSlu5se+4e0QUUGNkKsaJHidAgJOmfVXTg29xIA/WjYut9/haftwYfV4OJGmPcFNX8hsHDljKITSV524PYBWSiYuJKCfkEbASXQdSWRiBnWNkTCVv7XP5DJ/8PzsRvAt5ly7pCtPdjmOhIxmJjDHQ== 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=HQYz2t9e2zAdlbB/aobMW3Cd9NXlxVhJRaN1JsorTOQ=; b=MJ9ooUgxY91Yt6tglpUoVeNrY37247Kmjzpew+UuLbNX21/lm6tIJjAc/U7MGo1dkn0Kw+EwUY8jMpmg2v005z7ZUmBzJTDF75GrpGbO2DNBr0aeb+4/xvUY9ZNzMzz8ZAgEzwfu7x4+b9j5POSRMe4KnSICn0YviswSxnPWeVPfPm+940W/W9kquck/kpmigtIcuoWzqaM8PEOz1DyKalydEV28V7yPeTk9Ou2ui90Yq43xhP7NKo98jn4Wb+K81t8bHVABOJ7GWqo+tFlAKVu6+2tTDip8oCIROA4sXXk0mJp5Mms4HlPKlZCfSfUbYOTNZ7CJzNmZp+SeI6nbXQ== Received: from SA1P222CA0074.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2c1::20) by SJ2PR12MB8650.namprd12.prod.outlook.com (2603:10b6:a03:544::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Thu, 10 Aug 2023 00:11:39 +0000 Received: from SA2PEPF000015CA.namprd03.prod.outlook.com (2603:10b6:806:2c1:cafe::d) by SA1P222CA0074.outlook.office365.com (2603:10b6:806:2c1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:11:39 +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 SA2PEPF000015CA.mail.protection.outlook.com (10.167.241.200) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Thu, 10 Aug 2023 00:11:38 +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; Wed, 9 Aug 2023 17:11:22 -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:21 -0700 From: Xueming Li To: Qiming Yang CC: Mingjin Ye , Qi Zhang , "dpdk stable" Subject: patch 'net/igc: fix Rx and Tx queue status' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:27 +0800 Message-ID: <20230810001045.2662-7-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: SA2PEPF000015CA:EE_|SJ2PR12MB8650:EE_ X-MS-Office365-Filtering-Correlation-Id: 19eb5a03-58de-4fc1-a6ca-08db99365e1d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AM9wb41W/eLspB4oTBiR1KT8TAkeF0UyTC5AU9RbR5NCEI6082Pw9SIeOneGWlwRZ5DYNqMvo9BV0f95IS9r2QglzmI+G6EMofQTlvo21mmwQRJkXxp2MxKkSb8uNN54wobEVJBum6xnXNe3K8yGvJDm820x/YFHtPRmEEXHyBvsrmTHK2lF+fw4uAHIcBbUfIKvVO+fIbnA0XOqWNfIhKMHY2SeqckVM/WMe4NE8axQdm26iYnhq/v2sEv9HYerpbKpRc+wgh3kiAsBgKx/AZbBt+GOmo679Gj2Sz0Rs6hvMW8mC33aquNcMeli8WEr8AUJyLGKl2Vzj8aMc+EPiLDfkCKtOm51FUi+el6o1YKiBswKV9clM8cVKu1c/Y96nVIVmUmOa7c/7MLhcUa/d4jkxnWZp+L8UMrCbS6EnEnHA48sWXypva4u1QkrDxo1mfiKqHKuhUj7rQ3Hz0d1G8v2zzm4eslXGzd2SuLWbtXwFqmWhGPfQjeiv5Sru1LZ8ddJ38F7qUV/IJCHwJEv9S9PLSWwIG94Xpb0VWTvER9U6G/eVIiNBNTB7VnYc4kW/KcDNF/0yPfDTH3d9+/16HbxEsspyRGB6xZRwW2f5fWt8GJD78AX9YyOFN3GWcF21e4bIxSJn30MViRcCJfM9HadgfzsGdmqZu/4jKGca71KpVG2aaSkGOBP0HiQ30vozwTxu5nHOIA4j3yfYPU75UmZFswdvlnt4MLuxTCi2vJd3v/RXvdRY/rabajGjCe3VK5CwOrqyGix+XWI7F0I+A== 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)(39860400002)(346002)(396003)(186006)(1800799006)(82310400008)(451199021)(36840700001)(46966006)(40470700004)(2906002)(54906003)(36756003)(4326008)(478600001)(6916009)(7696005)(53546011)(70586007)(19627235002)(26005)(1076003)(16526019)(70206006)(336012)(966005)(86362001)(55016003)(40480700001)(8936002)(316002)(41300700001)(8676002)(82740400003)(356005)(5660300002)(7636003)(47076005)(6286002)(426003)(2616005)(83380400001)(36860700001)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:11:38.7779 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 19eb5a03-58de-4fc1-a6ca-08db99365e1d 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: SA2PEPF000015CA.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8650 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=c4b93c61288a69bcd84625d348e446359549641c Thanks. Xueming Li --- >From c4b93c61288a69bcd84625d348e446359549641c Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Wed, 12 Jul 2023 08:31:52 +0000 Subject: [PATCH] net/igc: fix Rx and Tx queue status Cc: Xueming Li [ upstream commit 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e ] Igc 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: a5aeb2b9e225 ("net/igc: support Rx and Tx") Signed-off-by: Qiming Yang Signed-off-by: Mingjin Ye Acked-by: Qi Zhang --- drivers/net/igc/igc_txrx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/igc/igc_txrx.c b/drivers/net/igc/igc_txrx.c index ffd219b0df..160865e911 100644 --- a/drivers/net/igc/igc_txrx.c +++ b/drivers/net/igc/igc_txrx.c @@ -1291,6 +1291,7 @@ igc_rx_init(struct rte_eth_dev *dev) dvmolr |= IGC_DVMOLR_STRCRC; IGC_WRITE_REG(hw, IGC_DVMOLR(rxq->reg_idx), dvmolr); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } return 0; @@ -1934,6 +1935,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) if (txq != NULL) { igc_tx_queue_release_mbufs(txq); igc_reset_tx_queue(txq); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1942,6 +1944,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) if (rxq != NULL) { igc_rx_queue_release_mbufs(rxq); igc_reset_rx_queue(rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } } @@ -2187,6 +2190,7 @@ igc_tx_init(struct rte_eth_dev *dev) IGC_TXDCTL_WTHRESH_MSK; txdctl |= IGC_TXDCTL_QUEUE_ENABLE; IGC_WRITE_REG(hw, IGC_TXDCTL(txq->reg_idx), txdctl); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } igc_config_collision_dist(hw); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.978064900 +0800 +++ 0110-net-igc-fix-Rx-and-Tx-queue-status.patch 2023-08-09 21:51:18.274352000 +0800 @@ -1 +1 @@ -From 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e Mon Sep 17 00:00:00 2001 +From c4b93c61288a69bcd84625d348e446359549641c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 921ff14280ed8ba7b9d0a898046cf5eadf3d4c8e ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index c11b6f7f25..5c60e3e997 100644 +index ffd219b0df..160865e911 100644 @@ -26 +28 @@ -@@ -1215,6 +1215,7 @@ igc_rx_init(struct rte_eth_dev *dev) +@@ -1291,6 +1291,7 @@ igc_rx_init(struct rte_eth_dev *dev) @@ -34 +36 @@ -@@ -1888,6 +1889,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1934,6 +1935,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) @@ -42 +44 @@ -@@ -1896,6 +1898,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1942,6 +1944,7 @@ igc_dev_clear_queues(struct rte_eth_dev *dev) @@ -50 +52 @@ -@@ -2143,6 +2146,7 @@ igc_tx_init(struct rte_eth_dev *dev) +@@ -2187,6 +2190,7 @@ igc_tx_init(struct rte_eth_dev *dev) @@ -57 +59 @@ - if (offloads & RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP) { + igc_config_collision_dist(hw);