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 0F29D4326F for ; Thu, 2 Nov 2023 14:15:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 090EA42D28; Thu, 2 Nov 2023 14:15:12 +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 BC3044113D for ; Thu, 2 Nov 2023 14:15:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930910; 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=SIzwFwTJVPm7EwkLBN4Se0pK5uYB4kWPg9GwPJq6E5o=; b=M4bzxkCXChogw8WJVhmFP6Q+7Eh670+VQpF3Ur25oOqDQ1rgauXuYGzM0EoROecsZYhUiV 6mVVpb0Ap/9ahE2Pt1iXF0QqSeGk+gSPx5maMZEtKJGOowN8sZbCwcM67i/S5nL5EGarGE wXZJd/chWVsPKhMcfbcJnj0jtTO533I= 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-683-DUoi6k6TPkys9ThNSKwrhQ-1; Thu, 02 Nov 2023 09:15:02 -0400 X-MC-Unique: DUoi6k6TPkys9ThNSKwrhQ-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 2E45B88CDCB; Thu, 2 Nov 2023 13:15:02 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58E42492BFA; Thu, 2 Nov 2023 13:15:00 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/mvpp2: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:35 +0000 Message-ID: <20231102131254.315947-89-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/eb249c2d5ffdd9363fb2e325a5aa51f8b37508f2 Thanks. Kevin --- >From eb249c2d5ffdd9363fb2e325a5aa51f8b37508f2 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:46 +0800 Subject: [PATCH] net/mvpp2: fix Rx and Tx queue state [ upstream commit 228056938a340205fd295814829782e3ea6e1a46 ] 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/mvpp2/mrvl_ethdev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index 735efb6cfc..a1c800aaf8 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -957,4 +957,7 @@ mrvl_dev_start(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; + mrvl_flow_init(dev); mrvl_mtr_init(dev); @@ -1082,4 +1085,11 @@ static int mrvl_dev_stop(struct rte_eth_dev *dev) { + uint16_t i; + + 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 mrvl_dev_set_link_down(dev); } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.943311495 +0000 +++ 0089-net-mvpp2-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.910163647 +0000 @@ -1 +1 @@ -From 228056938a340205fd295814829782e3ea6e1a46 Mon Sep 17 00:00:00 2001 +From eb249c2d5ffdd9363fb2e325a5aa51f8b37508f2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 228056938a340205fd295814829782e3ea6e1a46 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 359a5d1df7..c12364941d 100644 +index 735efb6cfc..a1c800aaf8 100644 @@ -26 +27 @@ -@@ -952,4 +952,7 @@ mrvl_dev_start(struct rte_eth_dev *dev) +@@ -957,4 +957,7 @@ mrvl_dev_start(struct rte_eth_dev *dev) @@ -34 +35 @@ -@@ -1077,4 +1080,11 @@ static int +@@ -1082,4 +1085,11 @@ static int