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 25ACA45BB6 for ; Wed, 23 Oct 2024 23:21:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F92240261; Wed, 23 Oct 2024 23:21:20 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id D526E40261 for ; Wed, 23 Oct 2024 23:21:18 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-37d4fd00574so189081f8f.0 for ; Wed, 23 Oct 2024 14:21:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718478; x=1730323278; 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=pfDArblkmXQpbdoKqGv3fuIrMefimvKplYgQu8vo7xk=; b=OWrW59gJjY3mmScuYUtlbD8cgta8pEorIYm/en58t+ID6B8YHdJgDvzPiEhpYvo8vU IQvzs6Jog353jsyQWDaXzqwqAEz6UL/EYmwMxPxCczWmaCbbTSDCKG9uQWgDBc2lVPTU rnz1ODLgJEL1s8910BmVEOu/FlvGJt7czWVE10IZ3zUU6LqYXTaKnZlTr7rOQ2BkG0gU p9ReMj5t3dqgTgDQsjhTV+UQZ2612Gi0XD+FUVzYJ8ct/TbWvU0rVkio+N6TPnezh8oI iYZmzoySA0smyKnszgFqYdqi2ebRfXQWUHQlhistw0fTvlwIUl0C3LQZxJHvfw6lNChl M40A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718478; x=1730323278; 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=pfDArblkmXQpbdoKqGv3fuIrMefimvKplYgQu8vo7xk=; b=HhnKQJtnUFxADXtqaAav5751hLK1hA+Kd5hbizG5uAkQ/HRhjUHXxiHTV1dc4+cInd rRiv9EYiiKSC5lL1qowwXUSjqm2R+tPAszN8+OJxYi1LkI5bKFqdGKaqAdboBfWE1Ybf arE91FvP4KA2bDgOTa1GKiSaFqjN+PjV1mKpevEW4G74vUum7js/d9aDE854NGmFYoT+ FfBOLS7MNnUjtb6d9j3KLsQoQfRYRXK4rfZlJT0xI0jA3fUXxRAsMLaFYUhp2xE4Ujnd MW5PAdke9ByX50lIvVQcH0rIBweD+iCC1hzpr5P0G2GG7VH2NoLyKWqPqyF2T9vZsTe2 awyA== X-Forwarded-Encrypted: i=1; AJvYcCWZfAp0njo1w5Ix11VjlzLTFOReOFpvzahV2U1myvvSnL7adCcElDb4mqgesL04HJPejE95HrA=@dpdk.org X-Gm-Message-State: AOJu0Yy/1D0uB9TBx9GZE+sKGc22QscID6HBQM5hrCGTa0yHPqToTXlm 2IxHuOhJ8eSdc0Dw9KghRCLTwBtWr54IkYB2i0TbyCtzQIyuBLcSwC2knwlC X-Google-Smtp-Source: AGHT+IHtPX4S+LjabD2aNV+9wlOuxvSirfxXlZLOiRBwHKt+ceOidwEknQT0ypz6LvDqiihWiC3wgw== X-Received: by 2002:a5d:6348:0:b0:367:8e57:8 with SMTP id ffacd0b85a97d-37ef14daa49mr5346010f8f.19.1729718478345; Wed, 23 Oct 2024 14:21:18 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186bdbb01sm26719315e9.20.2024.10.23.14.21.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:21:17 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 23 Oct 2024 22:16:48 +0100 Message-ID: <20241023211704.1216956-68-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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 10/25/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/47a2900e1c0b2726c25d50c0bb0e48f2b955a0c8 Thanks. Luca Boccassi --- >From 47a2900e1c0b2726c25d50c0bb0e48f2b955a0c8 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 073c139c43..89270a477d 100644 --- a/drivers/net/ice/base/ice_switch.c +++ b/drivers/net/ice/base/ice_switch.c @@ -9473,8 +9473,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.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:43.092378658 +0100 +++ 0068-net-ice-base-fix-VLAN-replay-after-reset.patch 2024-10-23 22:16:40.535944141 +0100 @@ -1 +1 @@ -From 8e191a67df2d217c2cbd96325b38bf2f5f028f03 Mon Sep 17 00:00:00 2001 +From 47a2900e1c0b2726c25d50c0bb0e48f2b955a0c8 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 073c139c43..89270a477d 100644 @@ -41 +42 @@ -@@ -10110,8 +10110,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi, +@@ -9473,8 +9473,6 @@ ice_replay_vsi_fltr(struct ice_hw *hw, struct ice_port_info *pi,