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 3B37C45DB9 for ; Wed, 27 Nov 2024 18:21:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 366F64066C; Wed, 27 Nov 2024 18:21:46 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 7C7994066C for ; Wed, 27 Nov 2024 18:21:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728104; 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=sfuYvZ0o3lHXmWHChS8xqySiglTF9RLg6F8jW9ETW9w=; b=U1Ki3RFgj74VdEyekzlHsq16/R10sYHp8mpWZJgTZ2siuG8mWcVx6qlxlLZOHHejZ37tII WXbI3WdYUMp/yjhb83V3b3GyQ3t2pCwRjNmcBo2TXL705VH7VLu1Wg6NRzMN0DLjDSODAH CYxDobBaFyIf8kjaNRtdjIbijAFGUTA= Received: from mx-prod-mc-05.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-172-pwKDjQvANauYvs6VzMxLgw-1; Wed, 27 Nov 2024 12:21:40 -0500 X-MC-Unique: pwKDjQvANauYvs6VzMxLgw-1 X-Mimecast-MFC-AGG-ID: pwKDjQvANauYvs6VzMxLgw 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4915319560AB; Wed, 27 Nov 2024 17:21:39 +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 6894C300019E; Wed, 27 Nov 2024 17:21:37 +0000 (UTC) From: Kevin Traynor 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 21.11.9 Date: Wed, 27 Nov 2024 17:18:07 +0000 Message-ID: <20241127171916.690404-60-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: mCro9H-643qs6IoFmFd8zJCfm1MBPUagW8zlAePF6FI_1732728099 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/54dc2ed67c546cf7b0a8378dcbcd40e451095026 Thanks. Kevin --- >From 54dc2ed67c546cf7b0a8378dcbcd40e451095026 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 [ 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 dd21ef4bd1..ab12a0b103 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -9489,6 +9489,4 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi, !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; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.146128732 +0000 +++ 0060-net-ice-base-fix-VLAN-replay-after-reset.patch 2024-11-27 17:17:38.238269440 +0000 @@ -1 +1 @@ -From 8e191a67df2d217c2cbd96325b38bf2f5f028f03 Mon Sep 17 00:00:00 2001 +From 54dc2ed67c546cf7b0a8378dcbcd40e451095026 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8e191a67df2d217c2cbd96325b38bf2f5f028f03 ] + @@ -27 +28,0 @@ -Cc: stable@dpdk.org @@ -38 +39 @@ -index 96ef26d535..a3786961e6 100644 +index dd21ef4bd1..ab12a0b103 100644 @@ -41 +42 @@ -@@ -10111,6 +10111,4 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi, +@@ -9489,6 +9489,4 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi,