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 718A94326F for ; Thu, 2 Nov 2023 14:15:13 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 271D642E4B; Thu, 2 Nov 2023 14:15:12 +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 CA10942E4A for ; Thu, 2 Nov 2023 14:15:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930910; 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=xKJzT0jbA9kTAPywt+0KRpJe9zjcfGeOL+j7D6xZVNg=; b=Q0JU5G+y5cZM+7vKVguLjaa/wZF1Lsb2643gvYWBhPuQmeC8ysuRtSVe4063wksB4shAMi V4XLUTsqWxmpl3Y8hvYQweCOMzJkK0Eabv3he1NgLUrm4gMKvzv7lo4eGQ5HitMwVDwDmG PWfL24Y+BOnslfaigRCER+rAUMRCz78= 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-252-uT8que1RNnmQgRDAhwjXJw-1; Thu, 02 Nov 2023 09:15:09 -0400 X-MC-Unique: uT8que1RNnmQgRDAhwjXJw-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 8B114811E7E; Thu, 2 Nov 2023 13:15:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9BFB492BFA; Thu, 2 Nov 2023 13:15:07 +0000 (UTC) From: Kevin Traynor To: Jie Hai Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/sfc: fix Rx and Tx queue state' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:12:41 +0000 Message-ID: <20231102131254.315947-95-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/7a88ec18c1e99f4f88765d453fbe09f3cd850517 Thanks. Kevin --- >From 7a88ec18c1e99f4f88765d453fbe09f3cd850517 Mon Sep 17 00:00:00 2001 From: Jie Hai Date: Fri, 8 Sep 2023 19:28:55 +0800 Subject: [PATCH] net/sfc: fix Rx and Tx queue state [ upstream commit 35ac4f275f37d6002ed62e78342af96b9cf7e1e7 ] 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/sfc/sfc_repr.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/sfc/sfc_repr.c b/drivers/net/sfc/sfc_repr.c index 8593ee80f5..2a60f1cc31 100644 --- a/drivers/net/sfc/sfc_repr.c +++ b/drivers/net/sfc/sfc_repr.c @@ -292,4 +292,5 @@ sfc_repr_dev_start(struct rte_eth_dev *dev) { struct sfc_repr *sr = sfc_repr_by_eth_dev(dev); + uint16_t i; int ret; @@ -303,4 +304,9 @@ sfc_repr_dev_start(struct rte_eth_dev *dev) goto fail_start; + 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; + sfcr_info(sr, "done"); @@ -367,4 +373,5 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev) { struct sfc_repr *sr = sfc_repr_by_eth_dev(dev); + uint16_t i; int ret; @@ -381,4 +388,9 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev) sfc_repr_unlock(sr); + 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; + sfcr_info(sr, "done"); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:43.075012096 +0000 +++ 0095-net-sfc-fix-Rx-and-Tx-queue-state.patch 2023-11-02 13:09:40.914163660 +0000 @@ -1 +1 @@ -From 35ac4f275f37d6002ed62e78342af96b9cf7e1e7 Mon Sep 17 00:00:00 2001 +From 7a88ec18c1e99f4f88765d453fbe09f3cd850517 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 35ac4f275f37d6002ed62e78342af96b9cf7e1e7 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 5f93192522..c2e5d4eb9e 100644 +index 8593ee80f5..2a60f1cc31 100644 @@ -26 +27 @@ -@@ -264,4 +264,5 @@ sfc_repr_dev_start(struct rte_eth_dev *dev) +@@ -292,4 +292,5 @@ sfc_repr_dev_start(struct rte_eth_dev *dev) @@ -32 +33 @@ -@@ -275,4 +276,9 @@ sfc_repr_dev_start(struct rte_eth_dev *dev) +@@ -303,4 +304,9 @@ sfc_repr_dev_start(struct rte_eth_dev *dev) @@ -42 +43 @@ -@@ -339,4 +345,5 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev) +@@ -367,4 +373,5 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev) @@ -48 +49 @@ -@@ -353,4 +360,9 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev) +@@ -381,4 +388,9 @@ sfc_repr_dev_stop(struct rte_eth_dev *dev)