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 EDDBD4326F for ; Thu, 2 Nov 2023 14:14:55 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8FA54161A; Thu, 2 Nov 2023 14:14:55 +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 F0B8942DF8 for ; Thu, 2 Nov 2023 14:14:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930892; 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=qyF85CCNvE2geXdkUVvUJdm/p3QB97Ixr3jOMXPjDAo=; b=Y0it9SG2qbKQx0EVuI1XnlwvzhWfgBistpie8cFsFSx4Tj6OgEypIZB3aX+3PekanLFVRP k/vHKxTAXfqkNIYifpaYbU2e+0d8HRCdbMPb+2fmimStwWt54VnYKac8Ai10briik0oeQL tFeJa0BqjjK8Lgh4gWGZnvzfJtnBNm0= 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-224-q_o_6lZlMba2MEgRfgU_Xw-1; Thu, 02 Nov 2023 09:14:49 -0400 X-MC-Unique: q_o_6lZlMba2MEgRfgU_Xw-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 1D4281C04326; Thu, 2 Nov 2023 13:14:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 76587492BFA; Thu, 2 Nov 2023 13:14:48 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Hemant Agrawal , dpdk stable Subject: patch 'net/dpaa: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:24 +0000 Message-ID: <20231102131254.315947-78-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/87695a10d692b5a42243eb686477d577a7adcb4c Thanks. Kevin --- >From 87695a10d692b5a42243eb686477d577a7adcb4c Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:34 +0800 Subject: [PATCH] net/dpaa: fix Rx and Tx queue state [ upstream commit f1d381b48d4673b14eb3c3378f3b890334015489 ] 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: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index d7660fb894..bae6c5abf2 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -388,4 +388,5 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) { struct dpaa_if *dpaa_intf = dev->data->dev_private; + uint16_t i; PMD_INIT_FUNC_TRACE(); @@ -402,4 +403,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) fman_if_enable_rx(dev->process_private); + 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; } @@ -408,4 +414,5 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) { struct fman_if *fif = dev->process_private; + uint16_t i; PMD_INIT_FUNC_TRACE(); @@ -416,4 +423,9 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) dev->tx_pkt_burst = dpaa_eth_tx_drop_all; + 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.696744885 +0000 +++ 0078-net-dpaa-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.894163595 +0000 @@ -1 +1 @@ -From f1d381b48d4673b14eb3c3378f3b890334015489 Mon Sep 17 00:00:00 2001 +From 87695a10d692b5a42243eb686477d577a7adcb4c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f1d381b48d4673b14eb3c3378f3b890334015489 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a6c86113d1..ef4c06db6a 100644 +index d7660fb894..bae6c5abf2 100644 @@ -26 +27 @@ -@@ -400,4 +400,5 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) +@@ -388,4 +388,5 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -414,4 +415,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) +@@ -402,4 +403,9 @@ static int dpaa_eth_dev_start(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -420,4 +426,5 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) +@@ -408,4 +414,5 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) @@ -48 +49 @@ -@@ -428,4 +435,9 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) +@@ -416,4 +423,9 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev)