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 73C5B42EDA for ; Fri, 21 Jul 2023 15:35:35 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6F64240E2D; Fri, 21 Jul 2023 15:35:35 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 329D740DDC for ; Fri, 21 Jul 2023 15:35:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689946532; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jXDZi63g87RhIlpUIZHCq8weXj6wH8WglqqLWzGW6Og=; b=c4CZZFZHUTSCYAQp3XB80yer2aTXad+yoKzacZhwiVQpXdMCZpMnwr1u5vyOaHtrfgSNSm 30yp0BU2hZG1KHu9jdQd1A1F3OQylUa1mc5t3/Dq4Ir7WeQmNvB6EIJujFPQJRvpBP8JON ay9gGn+Mm26VI9SAVg9pdBm03fH9Soo= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-173-3_rli6UtMBaOxnd_5o92dA-1; Fri, 21 Jul 2023 09:35:29 -0400 X-MC-Unique: 3_rli6UtMBaOxnd_5o92dA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 229F83813F37; Fri, 21 Jul 2023 13:35:29 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id EC5091454142; Fri, 21 Jul 2023 13:35:27 +0000 (UTC) From: Kevin Traynor 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 21.11.5 Date: Fri, 21 Jul 2023 14:35:02 +0100 Message-ID: <20230721133509.348959-7-ktraynor@redhat.com> In-Reply-To: <20230721133509.348959-1-ktraynor@redhat.com> References: <20230721133509.348959-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c7a2de80c152960684b5c7cc72b1967c0b036f6c Thanks. Kevin --- >From c7a2de80c152960684b5c7cc72b1967c0b036f6c 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 [ 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 @@ -1854,4 +1854,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) igb_tx_queue_release_mbufs(txq); igb_reset_tx_queue(txq, dev); + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1862,4 +1863,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) igb_rx_queue_release_mbufs(rxq); igb_reset_rx_queue(rxq); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -2442,4 +2444,5 @@ eth_igb_rx_init(struct rte_eth_dev *dev) 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; } @@ -2606,4 +2609,5 @@ eth_igb_tx_init(struct rte_eth_dev *dev) 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; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-21 14:33:59.184309758 +0100 +++ 0007-net-e1000-fix-Rx-and-Tx-queue-status.patch 2023-07-21 14:33:59.015253255 +0100 @@ -1 +1 @@ -From b2a0271188f3428ad5dc1ea600e1e2254b9d6781 Mon Sep 17 00:00:00 2001 +From c7a2de80c152960684b5c7cc72b1967c0b036f6c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b2a0271188f3428ad5dc1ea600e1e2254b9d6781 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 25ad9eb4e5..61c6394310 100644 +index f32dee46df..1d23e081b6 100644 @@ -26 +27 @@ -@@ -1855,4 +1855,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1854,4 +1854,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -1863,4 +1864,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) +@@ -1862,4 +1863,5 @@ igb_dev_clear_queues(struct rte_eth_dev *dev) @@ -38 +39 @@ -@@ -2443,4 +2445,5 @@ eth_igb_rx_init(struct rte_eth_dev *dev) +@@ -2442,4 +2444,5 @@ eth_igb_rx_init(struct rte_eth_dev *dev) @@ -44 +45 @@ -@@ -2607,4 +2610,5 @@ eth_igb_tx_init(struct rte_eth_dev *dev) +@@ -2606,4 +2609,5 @@ eth_igb_tx_init(struct rte_eth_dev *dev)