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 2B78A4326F for ; Thu, 2 Nov 2023 14:15:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 24DDD42E3C; Thu, 2 Nov 2023 14:15:04 +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 AC4B840F16 for ; Thu, 2 Nov 2023 14:15:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930902; 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=br/wweRzaPpAzI0nXmZYgh6wN4ST1LSa74E1h4E6LqY=; b=C3xz31BJZOfprcScDpjTPZ1BjlMt9kqqCq8LexQXR9IuvxfOcjQYxVN+ysSJRMPi9tXvpn wohknelGhU1E3n7WoHWg2Wu/2IX7+7jwzxx7ygMjhyoJRRFHz1YrriuC3kslmm3YfkoilN VGdpoqDxj/SUKCtHrvc4vDgmRVQdWcM= 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-668-emPst31DPD27Am7D0fJ8Qw-1; Thu, 02 Nov 2023 09:14:59 -0400 X-MC-Unique: emPst31DPD27Am7D0fJ8Qw-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 7592F811E86; Thu, 2 Nov 2023 13:14:59 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6B74F492BFA; Thu, 2 Nov 2023 13:14:58 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/mlx4: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:33 +0000 Message-ID: <20231102131254.315947-87-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/789097d1b99e2553659cf719fa667717b4c88c4a Thanks. Kevin --- >From 789097d1b99e2553659cf719fa667717b4c88c4a Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:44 +0800 Subject: [PATCH] net/mlx4: fix Rx and Tx queue state [ upstream commit 7cc3ea8934785226c6fe6d403ea5b31761d5f52f ] 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/mlx4/mlx4.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 2e0b4a17e2..b89dfab215 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -293,4 +293,5 @@ mlx4_dev_start(struct rte_eth_dev *dev) struct mlx4_priv *priv = dev->data->dev_private; struct rte_flow_error error; + uint16_t i; int ret; @@ -328,4 +329,10 @@ mlx4_dev_start(struct rte_eth_dev *dev) /* Enable datapath on secondary process. */ mlx4_mp_req_start_rxtx(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; err: @@ -346,4 +353,5 @@ mlx4_dev_stop(struct rte_eth_dev *dev) { struct mlx4_priv *priv = dev->data->dev_private; + uint16_t i; if (!priv->started) @@ -360,4 +368,9 @@ mlx4_dev_stop(struct rte_eth_dev *dev) mlx4_rss_deinit(priv); + 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.900192537 +0000 +++ 0087-net-mlx4-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.908163640 +0000 @@ -1 +1 @@ -From 7cc3ea8934785226c6fe6d403ea5b31761d5f52f Mon Sep 17 00:00:00 2001 +From 789097d1b99e2553659cf719fa667717b4c88c4a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7cc3ea8934785226c6fe6d403ea5b31761d5f52f ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a54016f4a2..1389b606cc 100644 +index 2e0b4a17e2..b89dfab215 100644