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 457634326F for ; Thu, 2 Nov 2023 14:14:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3CB464113D; Thu, 2 Nov 2023 14:14:57 +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 E5C2440F16 for ; Thu, 2 Nov 2023 14:14:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930895; 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=RjKzL1R+V5/GfGvMKkZzVwTrJcSzCnM+u4kYwjOHsd0=; b=YVEexOKVkxfTAeYdmAMUb0ZSvrKbEy9MO5SBsmmShdFB+7daL+NlPTM7tMnThUOLoDa4oa U5pGynJZJ3/JtkZY+wIrtfhHboCZuk36UO/Yx3N97odlnkdBlrqhTBasx4P8+cj4FHwhr0 ToOzY/xuHupg/jZjme5CYp10Tvg6EU8= 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-426-11vEBK1qO-uXqbVob7H-nw-1; Thu, 02 Nov 2023 09:14:52 -0400 X-MC-Unique: 11vEBK1qO-uXqbVob7H-nw-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 4B1DA101A529; Thu, 2 Nov 2023 13:14:52 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7CBD7474FA0; Thu, 2 Nov 2023 13:14:51 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/ena: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:27 +0000 Message-ID: <20231102131254.315947-81-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/b69c78275b3ab73bf35c117225e417344234e87c Thanks. Kevin --- >From b69c78275b3ab73bf35c117225e417344234e87c Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:37 +0800 Subject: [PATCH] net/ena: fix Rx and Tx queue state [ upstream commit 9210f0ca3dd2f0bbb66d6281f883e9d81a948a25 ] 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/ena/ena_ethdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 770b101688..1c61f793e6 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -911,4 +911,5 @@ static int ena_start(struct rte_eth_dev *dev) uint64_t ticks; int rc = 0; + uint16_t i; /* Cannot allocate memory in secondary process */ @@ -952,4 +953,9 @@ static int ena_start(struct rte_eth_dev *dev) adapter->state = ENA_ADAPTER_STATE_RUNNING; + 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; @@ -967,4 +973,5 @@ static int ena_stop(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = pci_dev->intr_handle; + uint16_t i; int rc; @@ -998,4 +1005,9 @@ static int ena_stop(struct rte_eth_dev *dev) dev->data->dev_started = 0; + 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.765940389 +0000 +++ 0081-net-ena-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.900163615 +0000 @@ -1 +1 @@ -From 9210f0ca3dd2f0bbb66d6281f883e9d81a948a25 Mon Sep 17 00:00:00 2001 +From b69c78275b3ab73bf35c117225e417344234e87c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 9210f0ca3dd2f0bbb66d6281f883e9d81a948a25 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index efcb163027..7345e480f8 100644 +index 770b101688..1c61f793e6 100644 @@ -26 +27 @@ -@@ -1172,4 +1172,5 @@ static int ena_start(struct rte_eth_dev *dev) +@@ -911,4 +911,5 @@ static int ena_start(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -1209,4 +1210,9 @@ static int ena_start(struct rte_eth_dev *dev) +@@ -952,4 +953,9 @@ static int ena_start(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -1224,4 +1230,5 @@ static int ena_stop(struct rte_eth_dev *dev) +@@ -967,4 +973,5 @@ static int ena_stop(struct rte_eth_dev *dev) @@ -48 +49 @@ -@@ -1255,4 +1262,9 @@ static int ena_stop(struct rte_eth_dev *dev) +@@ -998,4 +1005,9 @@ static int ena_stop(struct rte_eth_dev *dev)