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 31FD74301F 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 2BC0B4325B; Thu, 10 Aug 2023 02:11:43 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2065.outbound.protection.outlook.com [40.107.93.65]) by mails.dpdk.org (Postfix) with ESMTP id 959F0406B6 for ; Thu, 10 Aug 2023 02:11:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nve60htOWlkgiLziuvWRzBSd57Ft9OAnjwX5nAv9SgKgNzw9Xsqs+PYC7sFSPjoJXzi1Je0CiVTivvkdwwKshQkPOXz6A9q+DwwOrdgh46aj4UgIjz8QbGr+3Y+kvumXOy95/jRVhVhf/8iq3pOMPBTZudu7L8IZwCOU1Wl6xHLAxU/8AVZijk5C20yRUCBFlpujgSlDVrGoktnn/ElwcXn2GVQN/ZGgIaFNGE3+36ywLyALurJ8G4YqzNDQ45V2S8GTzikwbLBcBXfWuNps4qbBaZTFjxXIEKYn88cORAJtUy1QR9/NEWJVHAVtbE6lAO8bU+OCz+YEZjLq33SzHw== 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=deeiqtSHFTjSdcDdVe1788M/zGy+MVH7FlGhqsElBK4=; b=L4TIRLoFAremHjwDzSj8F/Ou0UyIjm1vy91bhYBSm7qMirA8uSZSQL8/z7AoJCC1td/50pdg8nP2ep4SjO6yy4ymogU3l/ERvAbjfPXkpZdCIlsu3clK2XBFYB0elQ4+lxzryJK3ayMsNoLzmIDY/v5Lgfv4UxKLig7lItmXwviFH7kyIcLh7u2LDFIeQMsTusyq+jyovB1G7hZi5DzhvGgeFLnHy4NtTq6fnqov+Ix2obscTVlCBcjT+AoSBJyLZRGC7py5vT9HqpXCD9ZVhiUopyMc4xdSoqkWEDseMWmdkUzWbo3EUpxn2Lm8v6gACXmg5e5C5r1njynLlXUEvA== 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=deeiqtSHFTjSdcDdVe1788M/zGy+MVH7FlGhqsElBK4=; b=o+MlxfTody17l4uRkdqIrdkCrZItlsedwsrhdpcTMY1+C5cKdtcEGzJAnbCyYQxsn1f03H+AXuhPDIvgmpxWJHz+irK1EeEoB8vdx+rvs4cJYrt7B9lvY+0mpAUB7hvQj7LENdYyDIQAKMZXYiyE0CiSGvA31mR/uU3sNcGLeET0GqMWp25Mg33S2Oh/Wh8k86o1eWZwc3SfVb/H8Ew8mRN4HIYJBfW7pyL9f1ENI1UrxnpinX3nvFP1PL+i1p6XVZQkorIifwMTwXM0c3ZxozalVorm7ZKFRhJ1qc+ImFm/gaK3iIHJ5Ff0Emc39oua56HXGTqSk5Lq2SMZf+eHrg== Received: from PH8PR21CA0007.namprd21.prod.outlook.com (2603:10b6:510:2ce::13) by CH2PR12MB4937.namprd12.prod.outlook.com (2603:10b6:610:64::16) 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:40 +0000 Received: from SA2PEPF000015C7.namprd03.prod.outlook.com (2603:10b6:510:2ce:cafe::1e) by PH8PR21CA0007.outlook.office365.com (2603:10b6:510:2ce::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.6 via Frontend Transport; Thu, 10 Aug 2023 00:11:40 +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 SA2PEPF000015C7.mail.protection.outlook.com (10.167.241.197) 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:39 +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:24 -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:22 -0700 From: Xueming Li To: Qiming Yang CC: Mingjin Ye , Qi Zhang , "dpdk stable" Subject: patch 'net/e1000: fix Rx and Tx queue status' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:28 +0800 Message-ID: <20230810001045.2662-8-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: SA2PEPF000015C7:EE_|CH2PR12MB4937:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bf349aa-4cdd-4f81-17a5-08db99365ebf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lyivXpIX+vdYHjkWPK27CLqxJtlZ7wQRtsp5QeHZMYx43Ur4M6pswFHCvlRbZEXS2c7rGmRTBS9YDb5cI2UfHEtRtFjH3osj7rSECqIIu8DG1bBK0RHPulUYnVZsELELTAmuc4lxGbPI2LVlbIF3AkG3Oj6OeC1BpNSS7sP27VESQ71FHv3e5+SHR2NE++XbOxNPNKgXYTcM6vcxL0fN0pJ4FrDgUKYtiSj53J1siVWRye14nffm467ia+LfIojbK0QM1jePWX1MZSo1hJHih2+f3sBENnUmJKN6we5YalZ1DWL8uj5ltK3abociajBZdF9OgsKI9dXvOGz4jK61bhetZnPxKCOISYBz0m6e1NnwN6DQ6cNsWq7uizQuS5fJG7lJVV6/3SQx/V7K4dFf+cn96svTQ4fMb2n58xyv84oLw+KQtohEB72dDiptZN68xpXgc/1JtpHhNza+9UdAM0Zlobe3ApbhYUzUOCFBst4V4VKkEqhvu74kGAbgQYtBg8WI+UeSBO+mj6MVKl840WMnG+PuQs+RjsZUoOp6IYtQPbtbVAnbw1eOenzy6/thyUbakuTg64YoBvq7PKwQlxLqnZ8JwOXdCdi6StDIbQVuovCL5fV4XodVk6KHu3RfSbyAekdEqnAcTm/7xz0SQ5kIHLYF7wx5qW8uaIsGiiLibRS05+teA75+XOjx7PL2uwTWruoeS/spnf6VzqwDDCzThPAk6v0gTBLEGym0USb9mCmkI5nxwtSVvolz6O7/ehv1/vR97iGre3J8Tjz2dw== 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)(136003)(396003)(346002)(451199021)(1800799006)(186006)(82310400008)(40470700004)(36840700001)(46966006)(40460700003)(55016003)(40480700001)(54906003)(19627235002)(70586007)(70206006)(6916009)(26005)(53546011)(336012)(16526019)(6286002)(1076003)(478600001)(36756003)(36860700001)(83380400001)(426003)(2616005)(47076005)(966005)(41300700001)(316002)(4326008)(7696005)(2906002)(5660300002)(8676002)(86362001)(82740400003)(7636003)(356005)(8936002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:11:39.8516 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6bf349aa-4cdd-4f81-17a5-08db99365ebf 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: SA2PEPF000015C7.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4937 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=1622bab08e5c565d3fda6b0a57176b649c96ff54 Thanks. Xueming Li --- >From 1622bab08e5c565d3fda6b0a57176b649c96ff54 Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Wed, 12 Jul 2023 08:31:53 +0000 Subject: [PATCH] net/e1000: fix Rx and Tx queue status Cc: Xueming Li [ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ] Igb 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: be2d648a2dd3 ("igb: add PF support") Signed-off-by: Qiming Yang Signed-off-by: Mingjin Ye Acked-by: Qi Zhang --- drivers/net/e1000/igb_rxtx.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index f32dee46df..1d23e081b6 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -1853,6 +1853,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) if (txq != NULL) { igb_tx_queue_release_mbufs(txq); igb_reset_tx_queue(txq, dev); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1861,6 +1862,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) if (rxq != NULL) { igb_rx_queue_release_mbufs(rxq); igb_reset_rx_queue(rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } } @@ -2441,6 +2443,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) rxdctl |= ((rxq->hthresh & 0x1F) << 8); rxdctl |= ((rxq->wthresh & 0x1F) << 16); E1000_WRITE_REG(hw, E1000_RXDCTL(rxq->reg_idx), rxdctl); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_SCATTER) { @@ -2605,6 +2608,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev) txdctl |= ((txq->wthresh & 0x1F) << 16); txdctl |= E1000_TXDCTL_QUEUE_ENABLE; E1000_WRITE_REG(hw, E1000_TXDCTL(txq->reg_idx), txdctl); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } /* Program the Transmit Control Register. */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.999248200 +0800 +++ 0111-net-e1000-fix-Rx-and-Tx-queue-status.patch 2023-08-09 21:51:18.274352000 +0800 @@ -1 +1 @@ -From b2a0271188f3428ad5dc1ea600e1e2254b9d6781 Mon Sep 17 00:00:00 2001 +From 1622bab08e5c565d3fda6b0a57176b649c96ff54 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 25ad9eb4e5..61c6394310 100644 +index f32dee46df..1d23e081b6 100644 @@ -26 +28 @@ -@@ -1854,6 +1854,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1853,6 +1853,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) @@ -34 +36 @@ -@@ -1862,6 +1863,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1861,6 +1862,7 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) @@ -42 +44 @@ -@@ -2442,6 +2444,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) +@@ -2441,6 +2443,7 @@ eth_igb_rx_init(struct rte_eth_dev *dev) @@ -50 +52 @@ -@@ -2606,6 +2609,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev) +@@ -2605,6 +2608,7 @@ eth_igb_tx_init(struct rte_eth_dev *dev)