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 75DCA4326F for ; Thu, 2 Nov 2023 14:15:07 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7070242E3C; Thu, 2 Nov 2023 14:15:07 +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 42E404113D for ; Thu, 2 Nov 2023 14:15:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930905; 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=w9DbqZ3tDY2nhYX0BO+Hdx2Y+ydOTsQ/beYyVjV77ko=; b=FvSlD5nxE5cCTECaFuuqzB35fZkcuh8Uqlg2GPnb2wPdpOlumZqHk9LwvyK7pYNVn6oVQy IQtYfDXBVKX1ZFwdlhaNwybQW85LT0cLciIJkZLEYh/xWe/ai2d7azllw3qa1/9+hWPn/2 SvKGz0OjTxrTDnCC+OOwjubekf/o64A= 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-628-lP0le_BgPmCbOjy1YSAwZg-1; Thu, 02 Nov 2023 09:15:04 -0400 X-MC-Unique: lP0le_BgPmCbOjy1YSAwZg-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 1095F101A529; Thu, 2 Nov 2023 13:15:04 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52781492BFA; Thu, 2 Nov 2023 13:15:03 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/null: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:37 +0000 Message-ID: <20231102131254.315947-91-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/b86f8689f96358163463047bb20c90682a3058b8 Thanks. Kevin --- >From b86f8689f96358163463047bb20c90682a3058b8 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:50 +0800 Subject: [PATCH] net/null: fix Rx and Tx queue state [ upstream commit 9b4b368ef7b9a00978e80fb2ee0beadde10a02de ] 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/null/rte_eth_null.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/net/null/rte_eth_null.c b/drivers/net/null/rte_eth_null.c index ca03469d0e..bdaca02d86 100644 --- a/drivers/net/null/rte_eth_null.c +++ b/drivers/net/null/rte_eth_null.c @@ -187,8 +187,16 @@ static int eth_dev_start(struct rte_eth_dev *dev) { + uint16_t i; + if (dev == NULL) return -EINVAL; dev->data->dev_link.link_status = RTE_ETH_LINK_UP; + + 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 0; } @@ -197,4 +205,6 @@ static int eth_dev_stop(struct rte_eth_dev *dev) { + uint16_t i; + if (dev == NULL) return 0; @@ -202,4 +212,9 @@ eth_dev_stop(struct rte_eth_dev *dev) dev->data->dev_link.link_status = RTE_ETH_LINK_DOWN; + 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:42.989119927 +0000 +++ 0091-net-null-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.912163653 +0000 @@ -1 +1 @@ -From 9b4b368ef7b9a00978e80fb2ee0beadde10a02de Mon Sep 17 00:00:00 2001 +From b86f8689f96358163463047bb20c90682a3058b8 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9b4b368ef7b9a00978e80fb2ee0beadde10a02de ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 31081af797..d742bc415c 100644 +index ca03469d0e..bdaca02d86 100644 @@ -26 +27 @@ -@@ -193,8 +193,16 @@ static int +@@ -187,8 +187,16 @@ static int @@ -43 +44 @@ -@@ -203,4 +211,6 @@ static int +@@ -197,4 +205,6 @@ static int @@ -50 +51 @@ -@@ -208,4 +218,9 @@ eth_dev_stop(struct rte_eth_dev *dev) +@@ -202,4 +212,9 @@ eth_dev_stop(struct rte_eth_dev *dev)