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 E374F4326F for ; Thu, 2 Nov 2023 14:15:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DD9AA427DE; Thu, 2 Nov 2023 14:15:11 +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 02CCA4113D for ; Thu, 2 Nov 2023 14:15:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930908; 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=4x0ZhN886jfQRizxroooOBfNwwaHJJDYNaYz/Nz4+3s=; b=AbUpcE/sCbWkKwtXOITr1MiqiE/4hoq/fw5h05pfCWmZ6/aeeqQpQWrnGO3AE6VhDZ28zn Q025AL0M4ZaZCsOxnbuOCffdUrL4ktS8WwDtrdn7rSEVDwEEs0fR9igWCpm13nQI+BPHua fP5xiAIcwhwUoxeIDJ937gukV2lUh1k= 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-443-e_GhcExPM-C168_-9hgxag-1; Thu, 02 Nov 2023 09:15:05 -0400 X-MC-Unique: e_GhcExPM-C168_-9hgxag-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 33F22811E7B; Thu, 2 Nov 2023 13:15:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FB7D492BFA; Thu, 2 Nov 2023 13:15:04 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/octeon_ep: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:38 +0000 Message-ID: <20231102131254.315947-92-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/2e34b54c6e61d82b9c92a21aa43070b5dd129804 Thanks. Kevin --- >From 2e34b54c6e61d82b9c92a21aa43070b5dd129804 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:51 +0800 Subject: [PATCH] net/octeon_ep: fix Rx and Tx queue state [ upstream commit af2c10811034e1b1c0b4b4588a04b909cf69dcd1 ] 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/octeontx_ep/otx_ep_ethdev.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c index c3cec6d833..132429998b 100644 --- a/drivers/net/octeontx_ep/otx_ep_ethdev.c +++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c @@ -76,4 +76,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev) otx_ep_info("dev started\n"); + for (q = 0; q < eth_dev->data->nb_rx_queues; q++) + eth_dev->data->rx_queue_state[q] = RTE_ETH_QUEUE_STATE_STARTED; + for (q = 0; q < eth_dev->data->nb_tx_queues; q++) + eth_dev->data->tx_queue_state[q] = RTE_ETH_QUEUE_STATE_STARTED; + return 0; } @@ -84,7 +89,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev) { struct otx_ep_device *otx_epvf = OTX_EP_DEV(eth_dev); + uint16_t i; otx_epvf->fn_list.disable_io_queues(otx_epvf); + for (i = 0; i < eth_dev->data->nb_rx_queues; i++) + eth_dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; + for (i = 0; i < eth_dev->data->nb_tx_queues; i++) + eth_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.010726665 +0000 +++ 0092-net-octeon_ep-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.912163653 +0000 @@ -1 +1 @@ -From af2c10811034e1b1c0b4b4588a04b909cf69dcd1 Mon Sep 17 00:00:00 2001 +From 2e34b54c6e61d82b9c92a21aa43070b5dd129804 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit af2c10811034e1b1c0b4b4588a04b909cf69dcd1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ - drivers/net/octeon_ep/otx_ep_ethdev.c | 11 +++++++++++ + drivers/net/octeontx_ep/otx_ep_ethdev.c | 11 +++++++++++ @@ -22,5 +23,5 @@ -diff --git a/drivers/net/octeon_ep/otx_ep_ethdev.c b/drivers/net/octeon_ep/otx_ep_ethdev.c -index 57b965ad06..970372bbd7 100644 ---- a/drivers/net/octeon_ep/otx_ep_ethdev.c -+++ b/drivers/net/octeon_ep/otx_ep_ethdev.c -@@ -157,4 +157,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev) +diff --git a/drivers/net/octeontx_ep/otx_ep_ethdev.c b/drivers/net/octeontx_ep/otx_ep_ethdev.c +index c3cec6d833..132429998b 100644 +--- a/drivers/net/octeontx_ep/otx_ep_ethdev.c ++++ b/drivers/net/octeontx_ep/otx_ep_ethdev.c +@@ -76,4 +76,9 @@ otx_ep_dev_start(struct rte_eth_dev *eth_dev) @@ -36 +37 @@ -@@ -165,7 +170,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev) +@@ -84,7 +89,13 @@ otx_ep_dev_stop(struct rte_eth_dev *eth_dev)