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 135554326F for ; Thu, 2 Nov 2023 14:15:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08AC442E3F; Thu, 2 Nov 2023 14:15:03 +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 21D8342E3C for ; Thu, 2 Nov 2023 14:15:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930900; 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=/iCrdqBSlpeP1yA0pbNV6i2Wm+HCK4JgCIZ9rs8esxo=; b=VCn7juNNWNYi7W+SfBmNZKCjZY1vgjOX24KK4O1iOOPau+/lYDAYGAMBSB1XgthyBIBfDY fI5i8PkV1lT7f5ZhxBG/fr0OwA06+eROnOSmJsPS7lcRw4eGp1R5a/Qhj5BxFS6Ear/TiJ SaikPTMYUgl2OdFOh8dCEEoDrJaf3YU= 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-588-tnwOn9bBPhmuMaLA8t56EA-1; Thu, 02 Nov 2023 09:14:56 -0400 X-MC-Unique: tnwOn9bBPhmuMaLA8t56EA-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 58031101A53B; Thu, 2 Nov 2023 13:14:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8048D492BFA; Thu, 2 Nov 2023 13:14:54 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/hinic: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:30 +0000 Message-ID: <20231102131254.315947-84-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/9323a4e3c74cf7fd93231db0135b6acfcd34c143 Thanks. Kevin --- >From 9323a4e3c74cf7fd93231db0135b6acfcd34c143 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:40 +0800 Subject: [PATCH] net/hinic: fix Rx and Tx queue state [ upstream commit b0f9c8e26a6a37cf73f311af96e23a7d9bda2fc0 ] 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/hinic/hinic_pmd_ethdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/hinic/hinic_pmd_ethdev.c b/drivers/net/hinic/hinic_pmd_ethdev.c index e8d9aaba84..992ba37b3f 100644 --- a/drivers/net/hinic/hinic_pmd_ethdev.c +++ b/drivers/net/hinic/hinic_pmd_ethdev.c @@ -981,4 +981,5 @@ static int hinic_dev_start(struct rte_eth_dev *dev) char *name; struct hinic_nic_dev *nic_dev; + uint16_t i; nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev); @@ -1048,4 +1049,9 @@ static int hinic_dev_start(struct rte_eth_dev *dev) rte_bit_relaxed_set32(HINIC_DEV_START, &nic_dev->dev_status); + 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; @@ -1170,4 +1176,5 @@ static int hinic_dev_stop(struct rte_eth_dev *dev) struct hinic_nic_dev *nic_dev; struct rte_eth_link link; + uint16_t i; nic_dev = HINIC_ETH_DEV_TO_PRIVATE_NIC_DEV(dev); @@ -1216,4 +1223,9 @@ static int hinic_dev_stop(struct rte_eth_dev *dev) hinic_free_all_tx_mbuf(dev); + 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.832552952 +0000 +++ 0084-net-hinic-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.904163628 +0000 @@ -1 +1 @@ -From b0f9c8e26a6a37cf73f311af96e23a7d9bda2fc0 Mon Sep 17 00:00:00 2001 +From 9323a4e3c74cf7fd93231db0135b6acfcd34c143 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b0f9c8e26a6a37cf73f311af96e23a7d9bda2fc0 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 7aa5e7d8e9..adc9f75c81 100644 +index e8d9aaba84..992ba37b3f 100644