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 992D14326F for ; Thu, 2 Nov 2023 14:15:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CEE9042DC4; 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 AE71D40A76 for ; Thu, 2 Nov 2023 14:15:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930914; 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=vSbCC0bUo3Jugg526VgPs1S9EzJdj81y2pAgfPyK2yQ=; b=g7hSlVOxpeZFhiFJ+pB+8AFzPmmQjtEIuSjQuU3A74rNz6z0q+Ne8swPUM9Yzb8KxNPVpi ELkT1YxRI2AVxkBTozTPGVaF1HNOsEwvYtptbeGaR0dUhB0upohYM0QQFXzBFmZG6fhZvf 59hCpucmgFByaR8mglAfMCKsrHaZjog= 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-427-odizK4I5Mg-WPYu_wPeYAA-1; Thu, 02 Nov 2023 09:15:13 -0400 X-MC-Unique: odizK4I5Mg-WPYu_wPeYAA-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 C60FE3816D82; Thu, 2 Nov 2023 13:15:12 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1B9F5492BFA; Thu, 2 Nov 2023 13:15:11 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/virtio: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:45 +0000 Message-ID: <20231102131254.315947-99-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/a508510366ea6eed6e2b74a6177ccb142b34e8ce Thanks. Kevin --- >From a508510366ea6eed6e2b74a6177ccb142b34e8ce Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:59 +0800 Subject: [PATCH] net/virtio: fix Rx and Tx queue state [ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ] 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/virtio/virtio_ethdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index f4d13ec3a1..a23559850c 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2853,4 +2853,9 @@ virtio_dev_start(struct rte_eth_dev *dev) hw->started = 1; + 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; + /* Initialize Link state */ virtio_dev_link_update(dev, 0); @@ -2942,4 +2947,5 @@ virtio_dev_stop(struct rte_eth_dev *dev) struct rte_eth_link link; struct rte_eth_intr_conf *intr_conf = &dev->data->dev_conf.intr_conf; + uint16_t i; PMD_INIT_LOG(DEBUG, "stop"); @@ -2969,4 +2975,9 @@ out_unlock: rte_spinlock_unlock(&hw->state_lock); + 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.164316678 +0000 +++ 0099-net-virtio-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.919163676 +0000 @@ -1 +1 @@ -From 0170be6f4f90fdf3295c23520fc1547c1a2405db Mon Sep 17 00:00:00 2001 +From a508510366ea6eed6e2b74a6177ccb142b34e8ce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0170be6f4f90fdf3295c23520fc1547c1a2405db ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 2c23f1c00e..3ab56ef769 100644 +index f4d13ec3a1..a23559850c 100644 @@ -26 +27 @@ -@@ -2418,4 +2418,9 @@ virtio_dev_start(struct rte_eth_dev *dev) +@@ -2853,4 +2853,9 @@ virtio_dev_start(struct rte_eth_dev *dev) @@ -36 +37 @@ -@@ -2507,4 +2512,5 @@ virtio_dev_stop(struct rte_eth_dev *dev) +@@ -2942,4 +2947,5 @@ virtio_dev_stop(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -2534,4 +2540,9 @@ out_unlock: +@@ -2969,4 +2975,9 @@ out_unlock: