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 9E6314326F for ; Thu, 2 Nov 2023 14:15:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69A2F40ED8; Thu, 2 Nov 2023 14:15:13 +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 3A72142E50 for ; Thu, 2 Nov 2023 14:15:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930911; 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=jDuV/foR3TAwOkuntLXYVQQGvWDmJbi78iDGiYDWUdU=; b=Ybap+AHEsfOj0hcUubTh9F8NHrBZVwfFZQGDfCOqzcXwSEolclQnZbpta27wErvdBlOSJP U7U9Iq6HqL0q22wJjqcUvQreJcTAvul2DIgFsqCQXm7ENIyckFMxj0r3kbppayIfsrFzVH QMrHZHyioHaI47eFWK2Qjom54yktPFw= 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-479-atnERu4dO42ivcHe-PVl4g-1; Thu, 02 Nov 2023 09:15:09 -0400 X-MC-Unique: atnERu4dO42ivcHe-PVl4g-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 95CE33816D97; Thu, 2 Nov 2023 13:15:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2B6D492BFA; Thu, 2 Nov 2023 13:15:08 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Cristian Dumitrescu , dpdk stable Subject: patch 'net/softnic: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:42 +0000 Message-ID: <20231102131254.315947-96-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/4e0e44f7ef09a21d4ee57cc36786f2e6f845db60 Thanks. Kevin --- >From 4e0e44f7ef09a21d4ee57cc36786f2e6f845db60 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:56 +0800 Subject: [PATCH] net/softnic: fix Rx and Tx queue state [ upstream commit 7143a21342ef611a4159f03f24f0c4fbd8686aa1 ] 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: Cristian Dumitrescu --- drivers/net/softnic/rte_eth_softnic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/softnic/rte_eth_softnic.c b/drivers/net/softnic/rte_eth_softnic.c index 8c098cad5b..009cc911f4 100644 --- a/drivers/net/softnic/rte_eth_softnic.c +++ b/drivers/net/softnic/rte_eth_softnic.c @@ -165,4 +165,5 @@ pmd_dev_start(struct rte_eth_dev *dev) struct pmd_internals *p = dev->data->dev_private; int status; + uint16_t i; /* Firmware */ @@ -177,4 +178,9 @@ pmd_dev_start(struct rte_eth_dev *dev) 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; } @@ -184,4 +190,5 @@ pmd_dev_stop(struct rte_eth_dev *dev) { struct pmd_internals *p = dev->data->dev_private; + uint16_t i; /* Link DOWN */ @@ -202,4 +209,9 @@ pmd_dev_stop(struct rte_eth_dev *dev) softnic_mtr_free(p); + 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.097025992 +0000 +++ 0096-net-softnic-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.915163663 +0000 @@ -1 +1 @@ -From 7143a21342ef611a4159f03f24f0c4fbd8686aa1 Mon Sep 17 00:00:00 2001 +From 4e0e44f7ef09a21d4ee57cc36786f2e6f845db60 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7143a21342ef611a4159f03f24f0c4fbd8686aa1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index bcf6664460..1b90cf7a21 100644 +index 8c098cad5b..009cc911f4 100644 @@ -26 +27 @@ -@@ -135,4 +135,5 @@ pmd_dev_start(struct rte_eth_dev *dev) +@@ -165,4 +165,5 @@ pmd_dev_start(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -147,4 +148,9 @@ pmd_dev_start(struct rte_eth_dev *dev) +@@ -177,4 +178,9 @@ pmd_dev_start(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -154,4 +160,5 @@ pmd_dev_stop(struct rte_eth_dev *dev) +@@ -184,4 +190,5 @@ pmd_dev_stop(struct rte_eth_dev *dev) @@ -48,2 +49,2 @@ -@@ -164,4 +171,9 @@ pmd_dev_stop(struct rte_eth_dev *dev) - softnic_mempool_free(p); +@@ -202,4 +209,9 @@ pmd_dev_stop(struct rte_eth_dev *dev) + softnic_mtr_free(p);