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 1AEDC4326F for ; Thu, 2 Nov 2023 14:14:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 165FE42E36; Thu, 2 Nov 2023 14:14:56 +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 6F04442E29 for ; Thu, 2 Nov 2023 14:14:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930894; 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=aBWOmo1lS7pUx0gG3xyvxob601Nsv2QpGykNggolKpU=; b=jUYRUnID2ou6Xt+PvHVFOXiCC+Pw0wJWbIzidqlEHxpQu5BVfdS6qVsURQkWdPSI/ukdYm BwL7MZdt2CacLqTRzQeXZ2Kik9+rknEdesTEOzNKu2TAOtVJ7l+G66ljh2FOtx+GGdetTf i7kMNK7Xs5BbNQzINTyq8YR6XnhxoKc= 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-246-lfFGnKVcNlmCpB8a6Wwqvw-1; Thu, 02 Nov 2023 09:14:51 -0400 X-MC-Unique: lfFGnKVcNlmCpB8a6Wwqvw-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 4171882BA81; Thu, 2 Nov 2023 13:14:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5DF40492BFA; Thu, 2 Nov 2023 13:14:50 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/e1000: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:26 +0000 Message-ID: <20231102131254.315947-80-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/180c47a4a4cde0a7f881277907bc569a62ede4d9 Thanks. Kevin --- >From 180c47a4a4cde0a7f881277907bc569a62ede4d9 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:36 +0800 Subject: [PATCH] net/e1000: fix Rx and Tx queue state [ upstream commit f679a8d646b62138cf02f173ad80885ca9881f9f ] 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/e1000/em_rxtx.c | 8 ++++++++ drivers/net/e1000/igb_rxtx.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/drivers/net/e1000/em_rxtx.c b/drivers/net/e1000/em_rxtx.c index 73602313a7..2d40854d1d 100644 --- a/drivers/net/e1000/em_rxtx.c +++ b/drivers/net/e1000/em_rxtx.c @@ -1577,4 +1577,6 @@ em_dev_clear_queues(struct rte_eth_dev *dev) em_reset_tx_queue(txq); } + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } @@ -1585,4 +1587,6 @@ em_dev_clear_queues(struct rte_eth_dev *dev) em_reset_rx_queue(rxq); } + + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STOPPED; } } @@ -1813,4 +1817,6 @@ eth_em_rx_init(struct rte_eth_dev *dev) E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; + /* * Due to EM devices not having any sort of hardware @@ -1947,4 +1953,6 @@ eth_em_tx_init(struct rte_eth_dev *dev) txdctl |= E1000_TXDCTL_GRAN; E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index 1d23e081b6..6027cfbfb1 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -2745,4 +2745,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev) rxdctl |= ((rxq->wthresh & 0x1F) << 16); E1000_WRITE_REG(hw, E1000_RXDCTL(i), rxdctl); + + dev->data->rx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } @@ -2816,4 +2818,6 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev) txdctl |= E1000_TXDCTL_QUEUE_ENABLE; E1000_WRITE_REG(hw, E1000_TXDCTL(i), txdctl); + + dev->data->tx_queue_state[i] = RTE_ETH_QUEUE_STATE_STARTED; } -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:42.741565039 +0000 +++ 0080-net-e1000-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.898163608 +0000 @@ -1 +1 @@ -From f679a8d646b62138cf02f173ad80885ca9881f9f Mon Sep 17 00:00:00 2001 +From 180c47a4a4cde0a7f881277907bc569a62ede4d9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f679a8d646b62138cf02f173ad80885ca9881f9f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index cb5ce2307b..df5fbb7823 100644 +index 73602313a7..2d40854d1d 100644 @@ -56 +57 @@ -index 61c6394310..448c4b7d9d 100644 +index 1d23e081b6..6027cfbfb1 100644 @@ -59 +60 @@ -@@ -2746,4 +2746,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev) +@@ -2745,4 +2745,6 @@ eth_igbvf_rx_init(struct rte_eth_dev *dev) @@ -66 +67 @@ -@@ -2817,4 +2819,6 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev) +@@ -2816,4 +2818,6 @@ eth_igbvf_tx_init(struct rte_eth_dev *dev)