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 D574445DB9 for ; Wed, 27 Nov 2024 18:22:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D25A0402DE; Wed, 27 Nov 2024 18:22:10 +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 6F12E40B97 for ; Wed, 27 Nov 2024 18:22:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728128; 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=BYLdLk+40NI/MUvY2F8xHSyFxvB+Xy8eNPv9konNRKQ=; b=bEVUO1exUvvFYBys5wu4Ls7hiT1wTLLha5BCti1PhBh2zZ2cHSH80TTYGbHODTN/hr5XkT rk/6FatIEMuxbmGNIMeIb6ShLc4HjELSftfjeCnEoLvaqtbT8KmVYkKxFTX0Gd+6XpUY/z +WJmEqK01IGjz9o6DXtd5y4RfoRVrTI= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-217-Ptgd-dDtOT6xvvVIqXWXtw-1; Wed, 27 Nov 2024 12:22:04 -0500 X-MC-Unique: Ptgd-dDtOT6xvvVIqXWXtw-1 X-Mimecast-MFC-AGG-ID: Ptgd-dDtOT6xvvVIqXWXtw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 668711955F43; Wed, 27 Nov 2024 17:22:03 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E42E6300019E; Wed, 27 Nov 2024 17:22:01 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Stephen Hemminger , dpdk stable Subject: patch 'net/ice: detect stopping a flow director queue twice' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:18:19 +0000 Message-ID: <20241127171916.690404-72-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: QIMqT0OLbLl-QBdc1eHpHh80ru-0PWN8xzMgW5Bcmuo_1732728123 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/24. 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/02273028682b7badad7fd837926f284a04cc7d7a Thanks. Kevin --- >From 02273028682b7badad7fd837926f284a04cc7d7a Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 22 Oct 2024 17:39:41 +0100 Subject: [PATCH] net/ice: detect stopping a flow director queue twice [ upstream commit 7b230d43e8061bdaba02a41f601bb8e0b5dbff03 ] If the flow-director queue is stopped at some point during the running of an application, the shutdown procedure for the port issues an error as it tries to stop the queue a second time, and fails to do so. We can eliminate this error by setting the tail-register pointer to NULL on stop, and checking for that condition in subsequent stop calls. Since the register pointer is set on start, any restarting of the queue will allow a stop call to progress as normal. Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine") Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger --- drivers/net/ice/ice_rxtx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 9995561fe3..5e08ff0ca0 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1045,4 +1045,8 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) return -EINVAL; } + if (txq->qtx_tail == NULL) { + PMD_DRV_LOG(INFO, "TX queue %u not started", tx_queue_id); + return 0; + } vsi = txq->vsi; @@ -1059,4 +1063,5 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) txq->tx_rel_mbufs(txq); + txq->qtx_tail = NULL; return 0; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.525781307 +0000 +++ 0072-net-ice-detect-stopping-a-flow-director-queue-twice.patch 2024-11-27 17:17:38.268269596 +0000 @@ -1 +1 @@ -From 7b230d43e8061bdaba02a41f601bb8e0b5dbff03 Mon Sep 17 00:00:00 2001 +From 02273028682b7badad7fd837926f284a04cc7d7a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7b230d43e8061bdaba02a41f601bb8e0b5dbff03 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index d2f9edc221..024d97cb46 100644 +index 9995561fe3..5e08ff0ca0 100644 @@ -27 +28 @@ -@@ -1140,4 +1140,8 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -1045,4 +1045,8 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) @@ -36 +37 @@ -@@ -1154,4 +1158,5 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -1059,4 +1063,5 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)