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 1C36445C9B for ; Tue, 12 Nov 2024 23:08:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0FEAD4021E; Tue, 12 Nov 2024 23:08:11 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 1C49040674 for ; Tue, 12 Nov 2024 23:08:08 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4314fa33a35so50534065e9.1 for ; Tue, 12 Nov 2024 14:08:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731449288; x=1732054088; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kCenv0MVz6Negb/rO3AncpgiqgSJBS7GgVym17EFdYk=; b=AlEeE8ILxWZNQD03KsBUiQAzAh4Ek89LUbmgVf/h3Nr2HLULQh7KpjFdf0wUnK0E+v 1EDEDo+g7dgOU9MSO33C/6vuesSbJa4yTwM+8v0wSoj1+IjcBa50iv1zlY6JWYE1ObtC BO9t3c00ROmVrZvmFMsPtw4hbfrj2D5NBOAOdu4qddeSpvVKBPtvCcTwLNVKatpycZ4H /Jv0opYPBWVKK5Ikrj+qyshGW/8FKyTyndLXFqh2zJ3FVrCoOg3wfSLicR+HCBAM5qG6 4zuxdsS7ohbzXcUIDKdHVdZMmaSFPlt6eRlKy/70pKk7qjNICff1vIeCLOH27Gmpgyj6 ag9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731449288; x=1732054088; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kCenv0MVz6Negb/rO3AncpgiqgSJBS7GgVym17EFdYk=; b=cuZbNXP3fLi2wRI7lMQLhbelVnTUhDx7Y9N7q6eRgHTDsEwF8jYIZdBF/cipU3Q7su QqnKjdoi3yzjFGE9M1/thtTT1w9ofeRTlaMMoEi5JD9Dd9TXSjcS10/mhZvwqZyjLY5T 2G5C2n7YgSNxrVLRIAghwG2Pc6PyRuT83l9p+thex8nyGkaRbyOjtQTYAPg1B33x9+I+ MIb8qVcMzkZjRBZ+LVYUhl16tePLFeASlEnztELgRvmwWMv0G3TowRhfYhAfF5B1Bil5 sb1TPs6JiDwug4m2fckE7BFUMxi7E06Asd11xpWzFnK+YVA4CwelwH5UG3H/qH5OovYI sSVg== X-Forwarded-Encrypted: i=1; AJvYcCXx8O6Wej/4K7ct6v8cRnpDdAuZDQHdEcJ3v2PAQXSaGygm1dFJuf1kRWtEYQ/htIhM4HaRoMw=@dpdk.org X-Gm-Message-State: AOJu0YyUoJPIYNNd0DH5oKgSEeGQK2J6hBnSooqC3stLgSRfkgogVJ5p SnvP0oDxCEKv6XlZilbXfON42IUO6T3Zn/CExQLjQTsxaKanyMVZRb7bMg== X-Google-Smtp-Source: AGHT+IGBZuPo6P5IT8aXFukI8zDeEJlypsOe7M52HWbqX94cIGw/KWqEmnoifYh3vNUMBZmB1qGonw== X-Received: by 2002:a05:600c:3b93:b0:431:2460:5574 with SMTP id 5b1f17b1804b1-432cd47d785mr33902335e9.27.1731449287501; Tue, 12 Nov 2024 14:08:07 -0800 (PST) Received: from localhost ([2a01:4b00:d036:ae00:e89d:e9a1:da72:2f9d]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432d54e2e0esm1041415e9.2.2024.11.12.14.08.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 14:08:06 -0800 (PST) From: luca.boccassi@gmail.com 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 22.11.7 Date: Tue, 12 Nov 2024 22:07:14 +0000 Message-ID: <20241112220754.666489-4-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241112220754.666489-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-79-luca.boccassi@gmail.com> <20241112220754.666489-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 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/14/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3dac25dc58cd42fb27abe0210f2df226a7be7aa0 Thanks. Luca Boccassi --- >From 3dac25dc58cd42fb27abe0210f2df226a7be7aa0 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 f73065b81c..93b284ad87 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1122,6 +1122,10 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) 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; q_ids[0] = txq->reg_idx; @@ -1136,6 +1140,7 @@ 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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-12 22:06:58.824517048 +0000 +++ 0004-net-ice-detect-stopping-a-flow-director-queue-twice.patch 2024-11-12 22:06:58.631306637 +0000 @@ -1 +1 @@ -From 7b230d43e8061bdaba02a41f601bb8e0b5dbff03 Mon Sep 17 00:00:00 2001 +From 3dac25dc58cd42fb27abe0210f2df226a7be7aa0 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 f73065b81c..93b284ad87 100644 @@ -27 +28 @@ -@@ -1139,6 +1139,10 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -1122,6 +1122,10 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) @@ -38 +39 @@ -@@ -1153,6 +1157,7 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -1136,6 +1140,7 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)