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 BC1DE4326F for ; Thu, 2 Nov 2023 14:15:01 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5F8B42E3C; Thu, 2 Nov 2023 14:15:01 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id E0CBF40F16 for ; Thu, 2 Nov 2023 14:14:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930899; 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=7trAod/SVDOBxAgTCqCkJ8ongOMaKT2jjeUuVAlMyVM=; b=GjMZdF/sLgs/gb6MbzXjvBAVa++8kTx2E+dhGIZL8vBop2XKRl1rk+MSMCwzAQjP9dFBat XWi65P6LUJSzEPxuSEjNbqngBG/59RYQiGbXm6TqXP1RipboNmTGX7kob9yryLAJL5liaM OMXIVyGSIIIziB1gHzFDKDdvxdM+mdU= 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-623-qfSEYeKOPViaXY3ZmeLRxA-1; Thu, 02 Nov 2023 09:14:58 -0400 X-MC-Unique: qfSEYeKOPViaXY3ZmeLRxA-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 0C0491C0432D; Thu, 2 Nov 2023 13:14:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id E682A492BFA; Thu, 2 Nov 2023 13:14:56 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/memif: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:32 +0000 Message-ID: <20231102131254.315947-86-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/72786175fbcc74a801ee3bf21a6a04a3e50bfd5b Thanks. Kevin --- >From 72786175fbcc74a801ee3bf21a6a04a3e50bfd5b Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:42 +0800 Subject: [PATCH] net/memif: fix Rx and Tx queue state [ upstream commit 1b5e3493b8058f3980a14d00ecd31e2bbe88d535 ] 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/memif/rte_eth_memif.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index 2c716355be..abaf98c65e 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -1244,4 +1244,5 @@ memif_dev_start(struct rte_eth_dev *dev) struct pmd_internals *pmd = dev->data->dev_private; int ret = 0; + uint16_t i; switch (pmd->role) { @@ -1258,4 +1259,11 @@ memif_dev_start(struct rte_eth_dev *dev) } + if (ret == 0) { + 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 ret; } @@ -1264,5 +1272,13 @@ static int memif_dev_stop(struct rte_eth_dev *dev) { + uint16_t i; + memif_disconnect(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.878249795 +0000 +++ 0086-net-memif-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.907163637 +0000 @@ -1 +1 @@ -From 1b5e3493b8058f3980a14d00ecd31e2bbe88d535 Mon Sep 17 00:00:00 2001 +From 72786175fbcc74a801ee3bf21a6a04a3e50bfd5b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1b5e3493b8058f3980a14d00ecd31e2bbe88d535 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index f595656af5..7cc8c0da91 100644 +index 2c716355be..abaf98c65e 100644 @@ -26 +27 @@ -@@ -1359,4 +1359,5 @@ memif_dev_start(struct rte_eth_dev *dev) +@@ -1244,4 +1244,5 @@ memif_dev_start(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -1373,4 +1374,11 @@ memif_dev_start(struct rte_eth_dev *dev) +@@ -1258,4 +1259,11 @@ memif_dev_start(struct rte_eth_dev *dev) @@ -44 +45 @@ -@@ -1379,5 +1387,13 @@ static int +@@ -1264,5 +1272,13 @@ static int