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 6A4704326F 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 8E18342D0B; 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 A58EC42D0B 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=7fDYT4JM62HUp5y9+/d/FgUjtO+wy2wGC8ROpjBSSSw=; b=FckAjrE5BBE1JjS4RH/w7HO21KoV6WeViNTyGnwdM58BGat5iZillQ1siuKZvPxsNR0jn6 UBOKkXFDFCmC8b788uNkVuqB09a0Ll83qUeXKPLpGjk5DaWMPNjAr48eXhQAiZDsPlDiLj NinATM53h9QDROZASn5VDoxwksyPNXs= 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-457-7CHPzC5yMXq6ri4YO862aA-1; Thu, 02 Nov 2023 09:15:12 -0400 X-MC-Unique: 7CHPzC5yMXq6ri4YO862aA-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 BFA4A1C04322; Thu, 2 Nov 2023 13:15:11 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 02CEB492BFA; Thu, 2 Nov 2023 13:15:10 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/vhost: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:44 +0000 Message-ID: <20231102131254.315947-98-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/1213bcc82656621cd6e03a4e2b2fcf94a2ac5ebe Thanks. Kevin --- >From 1213bcc82656621cd6e03a4e2b2fcf94a2ac5ebe Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:58 +0800 Subject: [PATCH] net/vhost: fix Rx and Tx queue state [ upstream commit def31f40b59f5f20eae89b68dd47bdca3f2a9d0a ] 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/vhost/rte_eth_vhost.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 4e44e123eb..1306cc2935 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -1098,4 +1098,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev) struct pmd_internal *internal = eth_dev->data->dev_private; struct rte_eth_conf *dev_conf = ð_dev->data->dev_conf; + uint16_t i; eth_vhost_uninstall_intr(eth_dev); @@ -1113,4 +1114,9 @@ eth_dev_start(struct rte_eth_dev *eth_dev) update_queuing_status(eth_dev, false); + for (i = 0; i < eth_dev->data->nb_rx_queues; i++) + eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + for (i = 0; i < eth_dev->data->nb_tx_queues; i++) + eth_dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; } @@ -1120,4 +1126,5 @@ eth_dev_stop(struct rte_eth_dev *dev) { struct pmd_internal *internal = dev->data->dev_private; + uint16_t i; dev->data->dev_started = 0; @@ -1125,4 +1132,9 @@ eth_dev_stop(struct rte_eth_dev *dev) update_queuing_status(dev, true); + 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.142641548 +0000 +++ 0098-net-vhost-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.918163672 +0000 @@ -1 +1 @@ -From def31f40b59f5f20eae89b68dd47bdca3f2a9d0a Mon Sep 17 00:00:00 2001 +From 1213bcc82656621cd6e03a4e2b2fcf94a2ac5ebe Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit def31f40b59f5f20eae89b68dd47bdca3f2a9d0a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 48a9a79efe..21bbb008e0 100644 +index 4e44e123eb..1306cc2935 100644 @@ -26 +27 @@ -@@ -1136,4 +1136,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev) +@@ -1098,4 +1098,5 @@ eth_dev_start(struct rte_eth_dev *eth_dev) @@ -32 +33 @@ -@@ -1151,4 +1152,9 @@ eth_dev_start(struct rte_eth_dev *eth_dev) +@@ -1113,4 +1114,9 @@ eth_dev_start(struct rte_eth_dev *eth_dev) @@ -42 +43 @@ -@@ -1158,4 +1164,5 @@ eth_dev_stop(struct rte_eth_dev *dev) +@@ -1120,4 +1126,5 @@ eth_dev_stop(struct rte_eth_dev *dev) @@ -48 +49 @@ -@@ -1163,4 +1170,9 @@ eth_dev_stop(struct rte_eth_dev *dev) +@@ -1125,4 +1132,9 @@ eth_dev_stop(struct rte_eth_dev *dev)