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 61D9945CE3 for ; Mon, 11 Nov 2024 07:39:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41B584067A; Mon, 11 Nov 2024 07:39:46 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2080.outbound.protection.outlook.com [40.107.243.80]) by mails.dpdk.org (Postfix) with ESMTP id 6D9DF4067A for ; Mon, 11 Nov 2024 07:39:44 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=YFHFzEhYbtK5+IotsxfHNWBDYW6O1TJs3K0rrP8XNMFbmDfjc9XAmUT4fn5Obmh5628lvDTm1+1wrbaQTb3P/fl7SaalMfwAh2z3p7hOhwm4XOthx2Wj0a9J2ZD6jtW+S5Z+H8lH4H1mtrseSyA/nLXfeoQ93Hq6LVwyEEZTdzjV8qOF5amDsFNXKdINvak6gcFKFD7wUJCj7XOSA9sXaYVM346Xhf4ckoHv4L5RqOeSXiBJcM/enf9ML/4gy21S6HSZcZAa2NJvvQ6WAPIdZEMaAo1MJeq8d+jJe3vZyjw/1VxSXhoCSYx+H4qNnpXL0kcNmbk4+aziAj8Cp6xpFA== 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=xvRS6aEowQJQ5fi5sPqzHCEcgyYXAvqjQ9Y6+A6/8DA=; b=jsBcnIb2moNq6iiLI0vAOQb/p4JbQ6eLYoC5Y+O4klya1AITslWYctD/APOBKlzsywPBpKoYA+MJo6tR6DA4qORO7dvXMn/VQeGM/oKisvz2v+GNGZlmIxN2SmybAM8hUfMQrcMT5XSAbkk4hUs3YTzlNdomgZeIeTh3fGQ89cxsB9VvX57RfZtURrZB+Y1JRgYunqwM9pQQf6F1fkd3ys53dbxfQ9c6s7BfMJvrpWsicrmgWIPigrOse10VZsWfO6fIUkoWhhRf0WlJ7va+CJp2o78quCmvXh7db+go71Z4k24vRy6rCMTvMk8izdZ8pWZzSGipMyQWysYHyQZrxg== 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=xvRS6aEowQJQ5fi5sPqzHCEcgyYXAvqjQ9Y6+A6/8DA=; b=nowyvPhyTagP283P1Die0rxuA9pS+rtpLijTR/oGP0hTrC9MRQe2+HtZRd3Wkb4KmFmCeYGxoGLq9dczvI8Lm7lqp1+KW6jZjY7AdO4k6vkOw+WMMcCVJNv72Phvu1Mn7Vt0E53lhA82HYgPLu6/xC4NW7wfcZVw1Z4/HjY9sQ0iwduM1VPBR/shiIsTc/njbnFCoweES9CKyVZtOWoPpruq38nRXjSBuc+NBvt9tMCjCXQt/w1jpIBSVGq2+vh3KGxUEyXeqxqn00t05OwRcC36+RcqfdeMmmM7X0MyHBj+xy7son+CKlK+y/FiwWMuPCKdQnEZqGtZLdD92kWFyA== Received: from BY1P220CA0009.NAMP220.PROD.OUTLOOK.COM (2603:10b6:a03:59d::7) by MW6PR12MB8868.namprd12.prod.outlook.com (2603:10b6:303:242::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:39:41 +0000 Received: from SJ1PEPF00001CE0.namprd05.prod.outlook.com (2603:10b6:a03:59d:cafe::cf) by BY1P220CA0009.outlook.office365.com (2603:10b6:a03:59d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:39:40 +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 SJ1PEPF00001CE0.mail.protection.outlook.com (10.167.242.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:39:40 +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; Sun, 10 Nov 2024 22:39:29 -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; Sun, 10 Nov 2024 22:39:26 -0800 From: Xueming Li To: Dave Ertman CC: , Jacob Keller , "Bruce Richardson" , Vladimir Medvedkin , dpdk stable Subject: patch 'net/ice/base: fix VLAN replay after reset' has been queued to stable release 23.11.3 Date: Mon, 11 Nov 2024 14:28:28 +0800 Message-ID: <20241111062847.216344-103-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ1PEPF00001CE0:EE_|MW6PR12MB8868:EE_ X-MS-Office365-Filtering-Correlation-Id: 1849ae86-367d-47ec-46c4-08dd021b9ee1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?/N6Rsfjrmxjw2mSnSD6byHk8kQecj0i2Fqs2u078MgyI/MaBWikKfEEMSEJj?= =?us-ascii?Q?sOvnLe8W7JkLzyaR1MeEElExAXts2TLO2ikxw5TVzu2eg1beTcEC0oCIKu7R?= =?us-ascii?Q?/5BjjeqxQI4GzRaHBq0H3XMzWE49TzLTJq/3jTB01TVAs1Fi39lfb/Z3VPnF?= =?us-ascii?Q?adSYIdNlx9pmbX4ZcZawUBJVoTS8gIW08VhpqfyP50k+HjMIhWoCxSOyVyXb?= =?us-ascii?Q?23RdxOMsFdrXpfcZgONP0F5cNz17KEuuZYSIAZ203MjTvyAxMRMhDMdzDmRk?= =?us-ascii?Q?f6jOun6SAbZ3VqZr7dMi+IFrOnJMkRnn7sYbMpH+8DXIBqvgUpwGH7WmquIc?= =?us-ascii?Q?l6Unyt7+ZZmnPEObRmhi0SDcNGq4cu929MqAbxEOq0ltyExpDB1KNM8r6Li8?= =?us-ascii?Q?cXmAVrEfacm7FfN957l3RcX00Q/U1Q1Am8JCF//4EVVmgZ3pTqxJNV8WkyZJ?= =?us-ascii?Q?T0UT2i5dsQ+RRrSe/oOSgOVDRrI66IooIlXnSAeAiWYjIDN17bFCMnjEwOPr?= =?us-ascii?Q?SBJZ6BuAuEQhU5PRsbo2xQqk+H1G63zRllpLk2JdTuNXW6Xo6/6zSlwiWMPi?= =?us-ascii?Q?nfZnfNmhR5b12yc7lQVuuvuHixkkU/Wo5b5LMC67anSRrldz/hfZsMbwsfRs?= =?us-ascii?Q?KpGA8ynM88pZXmNSKZq1rbaao7ZTkYD3kwm5hgbx/kNMptxMY1zMFPRmsnOe?= =?us-ascii?Q?kH9OlB6USVuH/XwANzSypm9jKi2MZR+wZ9rmD8i7j5WhsFWaq5Xwx5iLHwns?= =?us-ascii?Q?K/Yeq92crC72533onndMeJAjVvG39nKZk7PMV6GE8pkaitN0GWpP94HTDIfl?= =?us-ascii?Q?6T1H7LRzafn67tChLdE4uMMtQK1jIfx57kIW9mLQV4Dp8T2vG//C+WyV5xKD?= =?us-ascii?Q?AyN2or1Fd2Wn6KXGdqJ1rYKPWDOijkKPTlNLBPcv7I7BeuKTj9VGod3+RG3a?= =?us-ascii?Q?qw4Apn6Ptaq2itg2Wn6oKsxx6natg8dVEPkdV+DYk048aunZ2rgF/np3xCvm?= =?us-ascii?Q?ulsS6htfdqyG/3iLtakfok6ciqJ+Np2xmUC+y6twjlUF9FItF89/G52WYcIR?= =?us-ascii?Q?FgBRx4Qpz7rKvPHhiTwhzfYKrmVVa8RSn8xt7i93ah+CQI8ea1xp0u1PYiks?= =?us-ascii?Q?4B4YWVe74hCWQXke59CB4OMOxbuYHTGKEIfiU7kVkc6vYhZMhsGe04/h4CL2?= =?us-ascii?Q?wEOBY9ppSSM6Qdh6VU3tWIbbJwtwKS+Qv0UoltFqCOow2E91RFLOyjNls1vC?= =?us-ascii?Q?z5yvJXP+j14c0v7bwZRw4ttluBgm3S5oxGg8rmRkrLRpNaMKAq8hJLRmKN90?= =?us-ascii?Q?Vq3LVSWuAZ2xF9E6bt8VFc0JPSnDvXB+0ZVbFmBL1vPWXfuCAGiKBsr+L/NW?= =?us-ascii?Q?XOAjiDj5xxS4gD/1jAkaY0fWJHobbMItrlQJUOt1JKrgOyD4sQ=3D=3D?= 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)(82310400026)(36860700013); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:39:40.9102 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1849ae86-367d-47ec-46c4-08dd021b9ee1 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: SJ1PEPF00001CE0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8868 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 11/30/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=7a744b7e5badcfdc620df91c533d2b4d2abd068a Thanks. Xueming Li --- >From 7a744b7e5badcfdc620df91c533d2b4d2abd068a Mon Sep 17 00:00:00 2001 From: Dave Ertman Date: Mon, 14 Oct 2024 12:02:07 +0100 Subject: [PATCH] net/ice/base: fix VLAN replay after reset Cc: Xueming Li [ upstream commit 8e191a67df2d217c2cbd96325b38bf2f5f028f03 ] If there is more than one VLAN defined when any reset that affects the PF is initiated, after the reset rebuild, no traffic will pass on any VLAN but the last one created. This is caused by the iteration though the VLANs during replay each clearing the vsi_map bitmap of the VSI that is being replayed. The problem is that during the replay, the pointer to the vsi_map bitmap is used by each successive vlan to determine if it should be replayed on this VSI. The logic was that the replay of the VLAN would replace the bit in the map before the next VLAN would iterate through. But, since the replay copies the old bitmap pointer to filt_replay_rules and creates a new one for the recreated VLANS, it does not do this, and leaves the old bitmap broken to be used to replay the remaining VLANs. Since the old bitmap will be cleaned up in post replay cleanup, there is no need to alter it and break following VLAN replay, so don't clear the bit. Fixes: c7dd15931183 ("net/ice/base: add virtual switch code") Signed-off-by: Dave Ertman Signed-off-by: Jacob Keller Signed-off-by: Bruce Richardson Acked-by: Vladimir Medvedkin --- drivers/net/ice/base/ice_switch.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/ice/base/ice_switch.c b/drivers/net/ice/base/ice_switch.c index c4fd07199e..7b103e5e34 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -10023,8 +10023,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi, if (!itr->vsi_list_info || !ice_is_bit_set(itr->vsi_list_info->vsi_map, vsi_handle)) continue; - /* Clearing it so that the logic can add it back */ - ice_clear_bit(vsi_handle, itr->vsi_list_info->vsi_map); f_entry.fltr_info.vsi_handle = vsi_handle; f_entry.fltr_info.fltr_act = ICE_FWD_TO_VSI; /* update the src in case it is VSI num */ -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-11 14:23:09.763788646 +0800 +++ 0102-net-ice-base-fix-VLAN-replay-after-reset.patch 2024-11-11 14:23:05.292192836 +0800 @@ -1 +1 @@ -From 8e191a67df2d217c2cbd96325b38bf2f5f028f03 Mon Sep 17 00:00:00 2001 +From 7a744b7e5badcfdc620df91c533d2b4d2abd068a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8e191a67df2d217c2cbd96325b38bf2f5f028f03 ] @@ -27 +29,0 @@ -Cc: stable@dpdk.org @@ -38 +40 @@ -index 96ef26d535..a3786961e6 100644 +index c4fd07199e..7b103e5e34 100644 @@ -41 +43 @@ -@@ -10110,8 +10110,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi, +@@ -10023,8 +10023,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi,