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 2465145E41 for ; Sat, 7 Dec 2024 09:01:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 11B7C40E34; Sat, 7 Dec 2024 09:01:46 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2054.outbound.protection.outlook.com [40.107.93.54]) by mails.dpdk.org (Postfix) with ESMTP id 4A5F340DD7 for ; Sat, 7 Dec 2024 09:01:44 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=K5kq1ujElG1+AOYDvk2VYlr0CdWxGTsjz37fnC2pOP6XFYpz56HAnrm9UMXmDs4Tp48Xqf8TMwMWGx5zt2wbd4mlU+SN9i+FzUR7YfIKBaLrX3KPHBYa/NdnmGaC8wFifjqg5wEi5YjhIK6Qpd/UnqIf5S3ExestjlB6B48YU5ql20BTsDxEP4HzdkuctcKlpYIh+Axkfn6nR2xUwpPNkYs3zFFRIahSF0yVd7viWTxiisciO3coi8edh3PBfLTHyIofbydvBNp90HEUUI/8yQAK3BMIu/iRhMXPECpptCMBx2Whyu2cYmSj3+Cj+7E9DUxzJFeIR46xUhCRJbINoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=CR8vZ2XMC2ybzyop63oCpWI9Ezt5lJSUU4p+mpHfOuA=; b=Y+aP8nCwcP/70oRpJSPgpKFRoHN9EnolyKZtoeOb64wJqs8+fSPcdRc2yHQELNcM7nRa1Qobjc+QKk0LV4m4jLLkcRuLvrUTvdT6ggF94GiNGukcdDjGTYz0aA49Kc5HhAIow1TTyyGUGVmoyViov/RX4pZnswtI7rLQd0DQ9ewTX7UhuffCVLEiQ8PRAU1TKRsr1NI7IQDgCsKki9AR16GXNZvQT/03+MSW8XKZCM+52thG2GVtAuFzi0Jz9kWh+tOoo/Xu8j4xXQ664NIj2xi2FQIMdibk1NJ4KgniR5WQBcZKMBkXahtVdUNHE1mg5JMw57I9J2gh+3FZuZpYnA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=CR8vZ2XMC2ybzyop63oCpWI9Ezt5lJSUU4p+mpHfOuA=; b=lAq/zG5XqK0xMt9oWGv9dw4Am9fkGeHjuLXValFQCAudJZhfdEAHUplNYWhHeQYIeHUcgq0gR82ua4AFI2GjVCSykk0UkBgw4f6leCppQpX7MHu7Wj/R2qm6xyKuHqqjUxapvMOPWG/xw+Rb/fqs18w2XtBRarF1JsiPNGqgJ6NC5VNWTZpilvK2J57ZgzXChIo7PH7ZjkvlGc0qcCo0sRkQtykkGi1ujS00xVPVu5pITNlRrUsk15PZwD38ywBubyZQm00HuNg2vUmRVok6R5zoXUeRP9LtihxPyDBgHazfSEB0icxUcj6yVM8t4cAAaSEwSosOn2S1ESip3ER6zA== Received: from PH7P220CA0163.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:33b::24) by CH2PR12MB4215.namprd12.prod.outlook.com (2603:10b6:610:ab::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.14; Sat, 7 Dec 2024 08:01:38 +0000 Received: from CY4PEPF0000E9DB.namprd05.prod.outlook.com (2603:10b6:510:33b:cafe::de) by PH7P220CA0163.outlook.office365.com (2603:10b6:510:33b::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.13 via Frontend Transport; Sat, 7 Dec 2024 08:01:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9DB.mail.protection.outlook.com (10.167.241.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:01:38 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:01:23 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sat, 7 Dec 2024 00:01:21 -0800 From: Xueming Li To: Bruce Richardson CC: Xueming Li , Stephen Hemminger , dpdk stable Subject: patch 'net/ice: detect stopping a flow director queue twice' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 15:59:22 +0800 Message-ID: <20241207080055.488538-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DB:EE_|CH2PR12MB4215:EE_ X-MS-Office365-Filtering-Correlation-Id: 042eb3e4-3c12-4b4d-a824-08dd169560a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?sbGOfXmSSsHeCNScTfyGswhoEOSv+4bIcuZQtbwLM6vSnN7bDyhEdYi1DuOQ?= =?us-ascii?Q?DNYjMq/4LlgMAEn43F1vKhCXnaM/pcgL1dscZOf9QkoThjEq9Ca5Nt+Q6wo0?= =?us-ascii?Q?KrEclnLU6rp+WKU+XAZzG63/vn9duk4sMI97OY4qkdUlbmVi9hIQ+z8airh3?= =?us-ascii?Q?sKX8APm9tiWIDTvB1t5cegPblXth1WdyG3DqGqSraosNSO/x2+gPgz84RQuZ?= =?us-ascii?Q?X7a/jA3SHHYq2fSz41R+qMxeQrACaZ2Cr99bf0aB1gRdwHyHZJDhYeOlC0dq?= =?us-ascii?Q?MgiJbCNrqXWYl/tqXzARhvBopsibP8e+w5WppGsJqyuc9zpVK62yJKZCS1aq?= =?us-ascii?Q?BnpGNwUOFUg2/vltB1BU0tEsi8Oxa3mHhe5Unnh9JA74oIFvKEuBgw/DJ2ki?= =?us-ascii?Q?s1YuM79UWQEhAy6oC+/NxBr6wRvOUqvQwWMldbXmztZZwqYxok38CT3m1QEw?= =?us-ascii?Q?xE8I66AQM1oTuPjNx7Qd/Z0ptaZWPtRW/LroL/j6BJQXzVULP4cbtI/76oWa?= =?us-ascii?Q?AztAD4kVrdk0ycNEWJ0PJDTo43qtWc4DjI0aPJ8BILvdD6VDnNOzw6yyhixD?= =?us-ascii?Q?9DTXO1wF0o6cwFYKfrwJMz2OLx/lrbky2UkvqOki+AW+spplKQgQSSf40mTr?= =?us-ascii?Q?5IAcz6hs9yST0AgKfeVhmsn+tP9ferNljduy41+LcpurvuSCFnjM4zy/qbwB?= =?us-ascii?Q?rx2HN3UGQqipI6GmouK0nrp8H/WNt1APx/v/xXe1SwGg9RNRoMkNxbml/YTF?= =?us-ascii?Q?kcZSPlScM2G8U9NGRVwDzPSkyzWra+AePsLKkBOgegahmESNrEevWjC0PrIp?= =?us-ascii?Q?uzKQEBPMuQ77tF327WMRjxFkZKRHLu8HbuMuesJFr195ORsmBHI2lIuhfnGu?= =?us-ascii?Q?N5bceOLTh14j+En5L/FEWyWqcqx4NeDmFetdt3Avz1Nq9JJ+uO1ayvUjrMYX?= =?us-ascii?Q?iWNOjGudDX5K1Kd1DQXBytyVuwd1g7pn8CfKX5gLtIm6YhxgNFxb2a2MkDup?= =?us-ascii?Q?+G4tudMNFJuN4NhE3xmmsY77P7yvcAp3Km6m0FTBgsPEV+vGNuJTYA157XCd?= =?us-ascii?Q?1kOl3Gsz5A+bGrJ5hAqNMVI6stJU8cBQbKuOBcVDRD8yZTFByjvzn5yH2RxC?= =?us-ascii?Q?mRVtyEr7JYyTSOt0Qa+ZPhGqJcEIACjjKXLWuvXH5umS1MRIR9aVVaWo9dhl?= =?us-ascii?Q?Sw9hl+YMesBNRaDarjfT0vjKaHsJL9znL/kn41cvBKcR8emoOKGnyw3LaUX/?= =?us-ascii?Q?EkT8BwmNSoF+WNyFltof1DEeaB8AkP6qvcgAD3YqGOjAzcQm3Q0MJ0hwjfrY?= =?us-ascii?Q?mJu/E53yre4rDdPtwXKO98zuxkeWDUm4hd3pW5q0lthS0A0Hf+3kZcWw2ne6?= =?us-ascii?Q?PaHTqrYJvQR/0BaoXPmyljxn0zr8nOsCdVt9AIpPJpLTQm3Xz8tNArj+qdRe?= =?us-ascii?Q?aBAtWloHp78qYDG8HNR7NCKfYKLiJUZ6?= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:01:38.2988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 042eb3e4-3c12-4b4d-a824-08dd169560a8 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4215 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 23.11.3 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/10/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=d366bfb9c814b20c4e7ae7e454117e820be7970d Thanks. Xueming Li --- >From d366bfb9c814b20c4e7ae7e454117e820be7970d 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 Cc: Xueming Li [ 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 7da314217a..644d106814 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -1123,6 +1123,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; @@ -1137,6 +1141,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.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:44.278953624 +0800 +++ 0004-net-ice-detect-stopping-a-flow-director-queue-twice.patch 2024-12-06 23:26:43.843044829 +0800 @@ -1 +1 @@ -From 7b230d43e8061bdaba02a41f601bb8e0b5dbff03 Mon Sep 17 00:00:00 2001 +From d366bfb9c814b20c4e7ae7e454117e820be7970d Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 7b230d43e8061bdaba02a41f601bb8e0b5dbff03 ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index d2f9edc221..024d97cb46 100644 +index 7da314217a..644d106814 100644 @@ -27 +29 @@ -@@ -1139,6 +1139,10 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -1123,6 +1123,10 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) @@ -38 +40 @@ -@@ -1153,6 +1157,7 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id) +@@ -1137,6 +1141,7 @@ ice_fdir_tx_queue_stop(struct rte_eth_dev *dev, uint16_t tx_queue_id)