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 A9CDC4326F for ; Thu, 2 Nov 2023 14:15:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF3B342D9A; Thu, 2 Nov 2023 14:15:15 +0100 (CET) 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 AE96942D28 for ; Thu, 2 Nov 2023 14:15:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930913; 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=GtaZfhvGW/58LohN6O3tbwOzqmn19pwHrBAec40lvTA=; b=ZvH3WOxcJnNc1ewlrzaTAD2Jyf5u8VSlhL91EnMEGO72eCEmITOq27B3FH1kh4Ou5uYTj0 R3U0gJ3JkiUgkR2aU9a1/+odm7RDe2kpP+aWmHLsDt7UjLh5k/4f97Oub1asA+T+NvKbv1 ke7E8D2+ej1FBqtA6VVPCr5jflcVIyY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-179-fy2i9btZPiOXYlKBlQhOEg-1; Thu, 02 Nov 2023 09:15:11 -0400 X-MC-Unique: fy2i9btZPiOXYlKBlQhOEg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B048E101A529; Thu, 2 Nov 2023 13:15:10 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEB28492BFA; Thu, 2 Nov 2023 13:15:09 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/txgbe: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:43 +0000 Message-ID: <20231102131254.315947-97-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/08/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/358e6d50e7cf7ff71413f976641d8f7185d86167 Thanks. Kevin --- >From 358e6d50e7cf7ff71413f976641d8f7185d86167 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:57 +0800 Subject: [PATCH] net/txgbe: fix Rx and Tx queue state [ upstream commit b6e8560d9c4067f321f5c838b7faad68258a203a ] The DPDK framework reports the queue state, which is stored in dev->data->tx_queue_state and dev->data->rx_queue_state. The state is maintained by the driver. Users may determine whether a queue participates in packet forwarding based on the state. Therefore, the driver needs to modify the queue state in time according to the actual situation. Fixes: 9ad9ff476cac ("ethdev: add queue state in queried queue information") Signed-off-by: Jie Hai Acked-by: Ferruh Yigit --- drivers/net/txgbe/txgbe_rxtx.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c index d0f7fe6945..f85ec77dd5 100644 --- a/drivers/net/txgbe/txgbe_rxtx.c +++ b/drivers/net/txgbe/txgbe_rxtx.c @@ -2807,4 +2807,6 @@ txgbe_dev_clear_queues(struct rte_eth_dev *dev) txq->ops->reset(txq); } + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } @@ -2816,4 +2818,6 @@ txgbe_dev_clear_queues(struct rte_eth_dev *dev) txgbe_reset_rx_queue(adapter, rxq); } + + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -5006,4 +5010,6 @@ txgbevf_dev_rxtx_start(struct rte_eth_dev *dev) 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++) { @@ -5020,4 +5026,6 @@ txgbevf_dev_rxtx_start(struct rte_eth_dev *dev) 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(); wr32(hw, TXGBE_RXWP(i), rxq->nb_rx_desc - 1); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:43.118258317 +0000 +++ 0097-net-txgbe-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.917163669 +0000 @@ -1 +1 @@ -From b6e8560d9c4067f321f5c838b7faad68258a203a Mon Sep 17 00:00:00 2001 +From 358e6d50e7cf7ff71413f976641d8f7185d86167 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b6e8560d9c4067f321f5c838b7faad68258a203a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f7cd2333ab..834ada886a 100644 +index d0f7fe6945..f85ec77dd5 100644