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 A0D0E4326F for ; Thu, 2 Nov 2023 14:15:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 96B2142E3C; Thu, 2 Nov 2023 14:15:09 +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 545B74113D for ; Thu, 2 Nov 2023 14:15:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930907; 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=H8HpzAt+DbISN1I6faB72YR8DZO8X70bQvkXU7TZ3rg=; b=i6IzEZRNlIdxzia1wVi6XuO/pNAbB71F10mASWMiVlHj/pzbi0VCp1471/SRn5WP9GMtKM t+NndMG3pgSgJ1a3XBfphHkIBkj920fUIvvSgV/8Om/0u7PvIyfjQ7SdnKS98mtBP1EmxM 5Q+hcuRvLNy2ZwN0Hz3Y4YTy0R17FPo= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-447-wIStlGQDNt-jFJ48JxeDXQ-1; Thu, 02 Nov 2023 09:15:06 -0400 X-MC-Unique: wIStlGQDNt-jFJ48JxeDXQ-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 66BEF3816D81; Thu, 2 Nov 2023 13:15:06 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 759B8492BFA; Thu, 2 Nov 2023 13:15:05 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/pfe: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:39 +0000 Message-ID: <20231102131254.315947-93-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/ec33dc897df6095297301f251c0484019791a8d8 Thanks. Kevin --- >From ec33dc897df6095297301f251c0484019791a8d8 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:53 +0800 Subject: [PATCH] net/pfe: fix Rx and Tx queue state [ upstream commit 6e7d7f57c167b086a4d67e7fb9aa04482d92e766 ] 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/pfe/pfe_ethdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/pfe/pfe_ethdev.c b/drivers/net/pfe/pfe_ethdev.c index ebb5d1ae0e..c5158bbf31 100644 --- a/drivers/net/pfe/pfe_ethdev.c +++ b/drivers/net/pfe/pfe_ethdev.c @@ -258,4 +258,5 @@ pfe_eth_open(struct rte_eth_dev *dev) struct hif_client_s *client; struct hif_shm *hif_shm; + uint16_t i; int rc; @@ -335,4 +336,8 @@ pfe_eth_open(struct rte_eth_dev *dev) } + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; err0: @@ -378,4 +383,5 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/) { struct pfe_eth_priv_s *priv = dev->data->dev_private; + uint16_t i; dev->data->dev_started = 0; @@ -387,4 +393,9 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/) dev->tx_pkt_burst = &pfe_dummy_xmit_pkts; + for (i = 0; i < dev->data->nb_rx_queues; i++) + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + for (i = 0; i < dev->data->nb_tx_queues; i++) + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + return 0; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:43.031829258 +0000 +++ 0093-net-pfe-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.913163656 +0000 @@ -1 +1 @@ -From 6e7d7f57c167b086a4d67e7fb9aa04482d92e766 Mon Sep 17 00:00:00 2001 +From ec33dc897df6095297301f251c0484019791a8d8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6e7d7f57c167b086a4d67e7fb9aa04482d92e766 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 0352a57950..551f3cf193 100644 +index ebb5d1ae0e..c5158bbf31 100644 @@ -26 +27 @@ -@@ -242,4 +242,5 @@ pfe_eth_open(struct rte_eth_dev *dev) +@@ -258,4 +258,5 @@ pfe_eth_open(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -319,4 +320,8 @@ pfe_eth_open(struct rte_eth_dev *dev) +@@ -335,4 +336,8 @@ pfe_eth_open(struct rte_eth_dev *dev) @@ -41 +42 @@ -@@ -362,4 +367,5 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/) +@@ -378,4 +383,5 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/) @@ -47,2 +48,2 @@ -@@ -371,4 +377,9 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/) - dev->tx_pkt_burst = rte_eth_pkt_burst_dummy; +@@ -387,4 +393,9 @@ pfe_eth_stop(struct rte_eth_dev *dev/*, int wake*/) + dev->tx_pkt_burst = &pfe_dummy_xmit_pkts;