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 0E37445610 for ; Fri, 12 Jul 2024 13:04:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F258D402E5; Fri, 12 Jul 2024 13:04:02 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2085.outbound.protection.outlook.com [40.107.100.85]) by mails.dpdk.org (Postfix) with ESMTP id B951940261 for ; Fri, 12 Jul 2024 13:04:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NwwjKTz5FPYZGK3LLStL2AEX+OrDB7JHo1HrG0R1j2PtMYCI8mXWRWt5j4wR5QZ/9w0WYghpurNq/QNiHOeaKvUH0iuIchBdM+Ehisn9CkC64U7CslaaACdHvW+wrCBffKkU3eeCBzdMstojbwcCt/rPBKwC0VrPlvzE+EPGVwImYF8FzANOLODhtQbnwaoTZmH+sqYcWa5PaoHzF7tlV1/AnG6sRQbpoqqwPOS9nqtsLHOTXJr+e4zNKx3+x6xOFydhUa8WkyhSpTEoPvXg7GeRpGHCQEF5CiPP73OuyflzG4tGVhQK/sYUWCcLcEMxhgL8SFZ0U6k0bq9TVO/y/w== 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=8qQEg6A3HSv24ufPuudnvyNMpWINa70ReoGedCX9jPk=; b=ULQCv7XcnUo2YUJQ4skYage6p6O1b8hxU1d15uf0lTeixb2CU4FDYI7VvD1MbdaW90PBwp9vLuS1maz0JFnsbmi5XBrG1Augd7o0E+4DIR3QuoOwEgL8UF7qc0lN/xfQqoSgonTXNs2iH+c8VHfjH2ydYJ9+EPeDLTvx8MGziIw51DJxDgPnAT+2bkO2+7nAwR8kgsYaK3mrvrDo86QgXo34C0Wz8/ZjeMVdW9sBFDntWWa4edT+PLvqZXZ6YgyhVxUeQHIeCr305s7EBry8LeGTwSAwnsgbmhVViSrklSFJWdyHWiZqCEyRe0dgyKIaw+G8c7TGHgPn4T/Godd7QQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=dpdk.org 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=8qQEg6A3HSv24ufPuudnvyNMpWINa70ReoGedCX9jPk=; b=HGgnXvivunZKmuMXUINzxypUcFUpOcpJkUN/lTTbFqgRO4UhxvZWW1YAnkcL6PoQ37WG3njqqG8fHjtDLCE3PAEzU3lhnqmSOzcBvTiJja7p942+/D5WPMHZ6tMeT6ilHlnDJ87a7C79jzNJx63MRbUjnnbBWvHayxOezG6GtCbwNNUA2xPKs+rWhwPnSLeBa4jrW/xHTvORHUonmxmLLJLZqqrCP9jK8Ue3/8WmZhcSKrEyJEmzZk3jO6zq5qlJqGEZ2aMpboO1R9FX0fIAKbtvJLQel8G016o3f4fCz9cx2t9yPvFoNwCH0THEtOxNBur2r6ijEWCTxBNxB3vHNw== Received: from BL1PR13CA0255.namprd13.prod.outlook.com (2603:10b6:208:2ba::20) by DM4PR12MB7671.namprd12.prod.outlook.com (2603:10b6:8:104::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23; Fri, 12 Jul 2024 11:03:58 +0000 Received: from BL02EPF0001A0FC.namprd03.prod.outlook.com (2603:10b6:208:2ba:cafe::31) by BL1PR13CA0255.outlook.office365.com (2603:10b6:208:2ba::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.23 via Frontend Transport; Fri, 12 Jul 2024 11:03:57 +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 BL02EPF0001A0FC.mail.protection.outlook.com (10.167.242.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.17 via Frontend Transport; Fri, 12 Jul 2024 11:03:57 +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; Fri, 12 Jul 2024 04:03:39 -0700 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; Fri, 12 Jul 2024 04:03:37 -0700 From: Xueming Li To: Yevgeny Kliteynik CC: Dariusz Sosnowski , dpdk stable Subject: patch 'net/mlx5/hws: fix matcher reconnect' has been queued to stable release 23.11.2 Date: Fri, 12 Jul 2024 19:01:47 +0800 Message-ID: <20240712110153.309690-17-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240712110153.309690-1-xuemingl@nvidia.com> References: <20240712104528.308638-1-xuemingl@nvidia.com> <20240712110153.309690-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: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FC:EE_|DM4PR12MB7671:EE_ X-MS-Office365-Filtering-Correlation-Id: f09213e9-e3e6-4937-7caf-08dca26253c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bQOQMtlt7cWjF+p5H++ZxCr04KOZOUG13DUlSvzPvW5uHyibYZrnf0b5hQXs?= =?us-ascii?Q?lZVDCzUyKL7zXMSOVR0O1fSGXMJp18q/a/Tc+hlD3eo40l1wf9q9PVWSTESX?= =?us-ascii?Q?8BN1/8Kg6rrqChpNB1CLt6QfbhFvxxhJgqfKwbiYQtGQqtXogZBxImW7rRXo?= =?us-ascii?Q?LN3R1T6kSFzF55Zb1oy9Gn4/X0jkhRgIpFXsVDjeOHOG2JavEAf1JDawF7Gf?= =?us-ascii?Q?p4/WpCjs4EPhg5VvQ9SElxuI4dtFQkMADs5vkTja8sDENxBunTEtXWYOimkB?= =?us-ascii?Q?b29bVHKbn3KI2CGvP31RZfNvXaBoxVCzde9uLyoqJWbz5rpLn64BxQ80AUrs?= =?us-ascii?Q?fepjQx3NV+hctYGmZVT87js4ap1b0MPlBHJ0SGr94tY7Bc8EsD4vK2kh6JfG?= =?us-ascii?Q?MCEfLh/edkYi/tuTbyRF8rZQHLJfad+ZcSBc2zRNni6Mn6G3ez3hBm7mIYEg?= =?us-ascii?Q?bKq87ZNtEfZfmC50SYBS+bYI5Nwg2BdSG8ADNCn51c9FftGTi1XKYP35gotK?= =?us-ascii?Q?wKH5BThxcoIprnYLmm1fkFYw8zYKSLkvHt2OUCPVGj2oOG5EaYJNaj/NbIA8?= =?us-ascii?Q?qv1ZDgxE6sTuC7Q9T2RMxNF2aqn7eAqTjxlnXboa1JYgnoW4b+YIFAaWwwY1?= =?us-ascii?Q?v3/Sjz+LusL2h2Z3m+z3iW9jiccC2acP5dpaj2CZ+/i3FrqcUCSc/2yLOFqK?= =?us-ascii?Q?Ggw7LESuHdFvmfPNjTZpfompq9xdSPWcz3R77pGbmY5BywtKAnDIdk0zSPA3?= =?us-ascii?Q?ywZlkC8SptAGsng8u/uB/Yndb5pnHo+PZi0MU2+122WtE/8T1f37tyIf8o2U?= =?us-ascii?Q?yywfZBcC3e6eD8bGfotpmXm52mEujvZdYRyMMnNNyMPjMx8eEe1eLzmIGlMv?= =?us-ascii?Q?2RpPNuI/gRhj4oHcMMPAx9KHLLMLHzl8WV+IRjO4YLdoM7Xn1FftrLQ12+9A?= =?us-ascii?Q?hDIhtkooVCS9+tGBw6g5dTlZAr2U4YAQ+d+rOMZkXH587iXfdnp/JeooiSVU?= =?us-ascii?Q?fXoWTxRiLjDVhfY5Ek5NkyP59v1IumIWyhfRPh7wg6DcSt9WVzOIMuFCllnX?= =?us-ascii?Q?a+bXNqMY0LIg1gDImjoepp+qpai6dIm5gmHENRKgMRmrTydIqBt+FG+PtSwF?= =?us-ascii?Q?n+C4jMfK7GY9lym8NCmSNEDQchLMWsc7UVrbHFptYtSSFvK7AENdIh3vsC6b?= =?us-ascii?Q?egfJ+gjVU1v/uJQJ9A6t+Tz31Jd1Vu0b9XJTusqrWeyBYk0fV/Uqoyb8ZSvk?= =?us-ascii?Q?hQETXNUWdAPqdXveczIkx8/k0IIocKPC4Dc2xefal9uheGMqHVgerVq7MhhT?= =?us-ascii?Q?7bJYCwx5fHQFLviMoxrJ3UcxnXpQIBdSUMtrLUVJ8U9S/IAJFDVQHlD/FvUB?= =?us-ascii?Q?6JY8vp2B5j5So/M8OAhGCiSqqJ0z+ERpIr30sjDhwxi8qZb1wEcKLxUGT0//?= =?us-ascii?Q?AIJCLkFEYtoiWA7DEWyyM7JBWnEKnL2a?= 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)(82310400026)(1800799024)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jul 2024 11:03:57.3355 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f09213e9-e3e6-4937-7caf-08dca26253c0 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: BL02EPF0001A0FC.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7671 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/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://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=82315fbf7fdf3b733c1a7d0df5368664e237ae4f Thanks. Xueming Li --- >From 82315fbf7fdf3b733c1a7d0df5368664e237ae4f Mon Sep 17 00:00:00 2001 From: Yevgeny Kliteynik Date: Thu, 6 Jun 2024 12:55:09 +0300 Subject: [PATCH] net/mlx5/hws: fix matcher reconnect Cc: Xueming Li [ upstream commit f21215b733abb2c80f1b58750d74de27f9233d62 ] If error happens during disconnect of the first matcher in the list, the matcher should be reconnected back as the first matcher. Fixes: b81f95ca770d ("net/mlx5/hws: support default miss table") Signed-off-by: Yevgeny Kliteynik Acked-by: Dariusz Sosnowski --- drivers/net/mlx5/hws/mlx5dr_matcher.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/hws/mlx5dr_matcher.c b/drivers/net/mlx5/hws/mlx5dr_matcher.c index bb171a0340..89e52d6c28 100644 --- a/drivers/net/mlx5/hws/mlx5dr_matcher.c +++ b/drivers/net/mlx5/hws/mlx5dr_matcher.c @@ -340,7 +340,7 @@ static int mlx5dr_matcher_disconnect(struct mlx5dr_matcher *matcher) return 0; matcher_reconnect: - if (LIST_EMPTY(&tbl->head)) + if (LIST_EMPTY(&tbl->head) || prev_matcher == matcher) LIST_INSERT_HEAD(&matcher->tbl->head, matcher, next); else LIST_INSERT_AFTER(prev_matcher, matcher, next); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-07-12 18:40:18.397726512 +0800 +++ 0096-net-mlx5-hws-fix-matcher-reconnect.patch 2024-07-12 18:40:14.336594199 +0800 @@ -1 +1 @@ -From f21215b733abb2c80f1b58750d74de27f9233d62 Mon Sep 17 00:00:00 2001 +From 82315fbf7fdf3b733c1a7d0df5368664e237ae4f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f21215b733abb2c80f1b58750d74de27f9233d62 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 79e7401dfd..2a84145566 100644 +index bb171a0340..89e52d6c28 100644