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 EE9F44326F for ; Thu, 2 Nov 2023 14:15:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C71942D92; Thu, 2 Nov 2023 14:15:22 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7EB9A427E8 for ; Thu, 2 Nov 2023 14:15:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930920; 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=R1l7mmmp9AhkIve26Zq6N7kJ0oYRx8PuMcyPVqzhKVc=; b=F0Iq1cQbDl7Wa8KIOJCnPAj+5f/iHP71Vhw9ZhAzo6+l8jdcEL8Aibxehi4VZD9/b/cZ7e mHsTIXsNWsVGAZs+GjOuUG5OP22GceKoTvhrnz2yG9kuXKC+E4yrdqfR4deJgBCVGrhpFN Oiq47JfMLidBlTGicJOdSTNJwyEnAbw= 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-18-563nRrOaPn6zDBnJU-MCtg-1; Thu, 02 Nov 2023 09:15:14 -0400 X-MC-Unique: 563nRrOaPn6zDBnJU-MCtg-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 DFC78811E82; Thu, 2 Nov 2023 13:15:13 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 27DB4492BFA; Thu, 2 Nov 2023 13:15:12 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:46 +0000 Message-ID: <20231102131254.315947-100-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/91c5c25915e850945121a8b0c73448fdd11bbf5c Thanks. Kevin --- >From 91c5c25915e850945121a8b0c73448fdd11bbf5c Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:29:00 +0800 Subject: [PATCH] net/vmxnet3: fix Rx and Tx queue state [ upstream commit aa400e679625afe3756fed1435e7e44f1f902223 ] 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/vmxnet3/vmxnet3_ethdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index d4aea74026..a48a355d39 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -891,4 +891,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) int ret; struct vmxnet3_hw *hw = dev->data->dev_private; + uint16_t i; PMD_INIT_FUNC_TRACE(); @@ -986,4 +987,9 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) __vmxnet3_dev_link_update(dev, 0); + 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; + return VMXNET3_SUCCESS; } @@ -998,4 +1004,5 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) struct vmxnet3_hw *hw = dev->data->dev_private; struct rte_intr_handle *intr_handle = dev->intr_handle; + uint16_t i; int ret; @@ -1053,4 +1060,9 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) dev->data->dev_started = 0; + 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.187140734 +0000 +++ 0100-net-vmxnet3-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.920163679 +0000 @@ -1 +1 @@ -From aa400e679625afe3756fed1435e7e44f1f902223 Mon Sep 17 00:00:00 2001 +From 91c5c25915e850945121a8b0c73448fdd11bbf5c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit aa400e679625afe3756fed1435e7e44f1f902223 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 76e80e3025..e49191718a 100644 +index d4aea74026..a48a355d39 100644 @@ -26 +27 @@ -@@ -1049,4 +1049,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -891,4 +891,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -1152,4 +1153,9 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -986,4 +987,9 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -1164,4 +1170,5 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) +@@ -998,4 +1004,5 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) @@ -48 +49 @@ -@@ -1219,4 +1226,9 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev) +@@ -1053,4 +1060,9 @@ vmxnet3_dev_stop(struct rte_eth_dev *dev)