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 9A0C34326F for ; Thu, 2 Nov 2023 14:15:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94C264113D; Thu, 2 Nov 2023 14:15:00 +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 131B34113D for ; Thu, 2 Nov 2023 14:14:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930898; 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=rcTAz/PM1a++sHquWq/Nd2bAnwv5NL+ElfEtDRax+pI=; b=CMlb7NPqoE7C02TuqN0TUQ9G9sACM35w7GnxrGcgp/won7AoNBrFhSMyEt9YwRctGyv2XI RpJaOcghSY44v9YzveFYZFnEGZTOSdo0escsK94ZzLDuCs2aiDECVgD1IIw7mGUBQoeywr Z7zmZPdVfncjRB6PEYAcOk7vYj9iVs0= 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-464--iNc2BqIPByS99MYnBH5AA-1; Thu, 02 Nov 2023 09:14:53 -0400 X-MC-Unique: -iNc2BqIPByS99MYnBH5AA-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 3414F2806047; Thu, 2 Nov 2023 13:14:53 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 934C0492BFA; Thu, 2 Nov 2023 13:14:52 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/enetc: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:28 +0000 Message-ID: <20231102131254.315947-82-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/ee101d104549172707fa3876d033c9b0724768fa Thanks. Kevin --- >From ee101d104549172707fa3876d033c9b0724768fa Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:38 +0800 Subject: [PATCH] net/enetc: fix Rx and Tx queue state [ upstream commit 308eceec7519eba5b3369c501977e61c6a4af52e ] 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/enetc/enetc_ethdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/enetc/enetc_ethdev.c b/drivers/net/enetc/enetc_ethdev.c index 7cdb8ce463..c3eebc6fa4 100644 --- a/drivers/net/enetc/enetc_ethdev.c +++ b/drivers/net/enetc/enetc_ethdev.c @@ -18,4 +18,5 @@ enetc_dev_start(struct rte_eth_dev *dev) struct enetc_hw *enetc_hw = &hw->hw; uint32_t val; + uint16_t i; PMD_INIT_FUNC_TRACE(); @@ -43,4 +44,9 @@ enetc_dev_start(struct rte_eth_dev *dev) } + 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; } @@ -53,4 +59,5 @@ enetc_dev_stop(struct rte_eth_dev *dev) struct enetc_hw *enetc_hw = &hw->hw; uint32_t val; + uint16_t i; PMD_INIT_FUNC_TRACE(); @@ -64,4 +71,9 @@ enetc_dev_stop(struct rte_eth_dev *dev) val & (~(ENETC_PM0_TX_EN | ENETC_PM0_RX_EN))); + 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.789134608 +0000 +++ 0082-net-enetc-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.901163618 +0000 @@ -1 +1 @@ -From 308eceec7519eba5b3369c501977e61c6a4af52e Mon Sep 17 00:00:00 2001 +From ee101d104549172707fa3876d033c9b0724768fa Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 308eceec7519eba5b3369c501977e61c6a4af52e ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 1b4337bc48..c9352f0746 100644 +index 7cdb8ce463..c3eebc6fa4 100644 @@ -32 +33 @@ -@@ -46,4 +47,9 @@ enetc_dev_start(struct rte_eth_dev *dev) +@@ -43,4 +44,9 @@ enetc_dev_start(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -56,4 +62,5 @@ enetc_dev_stop(struct rte_eth_dev *dev) +@@ -53,4 +59,5 @@ enetc_dev_stop(struct rte_eth_dev *dev) @@ -48 +49 @@ -@@ -70,4 +77,9 @@ enetc_dev_stop(struct rte_eth_dev *dev) +@@ -64,4 +71,9 @@ enetc_dev_stop(struct rte_eth_dev *dev)