From nobody Sun Feb 8 21:47:03 2026 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4A0E33F075E; Tue, 20 Jan 2026 10:34:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768905287; cv=none; b=nYMRgKi0vN/wtofAHVvcIh9ZdzYQcQmWZqAYY1ypmrQgMrJRV5zIX8uv/OlkusMrYn++CTs8Um8eY+HfsbjHEa4cYwZ5zt1j+OhkSVsH62jYdcMPflpRWJoEPZT7WgiUjcXeewvv/MzGP/o+UMdiqcKfimVzOS5kvPQNuvw4l6c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768905287; c=relaxed/simple; bh=AwWlBBz026f2nkwvTcJ3OLUW52WxYFLm2Wz5hZ0v4yo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G51fN7Z8tpnbmu2xk1vjukGj16UdK54O1oIiwzpS0lJ8RXhM04bClxtR93dR4C2poipCdCYQudWfxy4X/l+1Dui7s0Q+iWcaOpywwlfVEDJYBvauTCYWNoLNeLdSgvYxUpqp4UPoZ0R6oU/CURs+KZZIpqP5V87sQAKwjrgHMDs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=VJPrHc7I; arc=none smtp.client-ip=198.175.65.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VJPrHc7I" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1768905285; x=1800441285; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AwWlBBz026f2nkwvTcJ3OLUW52WxYFLm2Wz5hZ0v4yo=; b=VJPrHc7IZ+ZCdKPevHmiBsBAWR6h0jwgVuuvcnKT83f9eFctmrDJFGK4 mcegvTU12+DW/J7dtGEC0ERogG5FbkPQZMlB2kuYxB6nBQg4bV8LTls9S PJ37Yata+ojfzLZ4JBl+XXbg+Zgtavo4+kXsMD9L+9zzioiSVn0gPzLYt CmzdfBhZLS76dwllMI7YNLnkGnp0bOxnSITzjiSMpE7Kgi8qdOScOSA9C WJfJrHNw4OykNFovIchDGF6p2Q7xFF836tNxGvB3ej9rBRZ3qv4AQujkP 7ETaR9jZcg4gL9GA8fC/yqgY71iFaJ2/iXpGlVLknCHZ+A3Vb0Wub9Ct/ Q==; X-CSE-ConnectionGUID: 05l9kJCDQJO/J9Rg7iXS+A== X-CSE-MsgGUID: u70CkskgSJGIlsnwA6rvjA== X-IronPort-AV: E=McAfee;i="6800,10657,11676"; a="70161731" X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="70161731" Received: from fmviesa004.fm.intel.com ([10.60.135.144]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Jan 2026 02:34:44 -0800 X-CSE-ConnectionGUID: 4BGJFGOEQIiU8fDqeyCbuQ== X-CSE-MsgGUID: ghSQDjC1Qvq1JstJpuIj2w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,240,1763452800"; d="scan'208";a="210935842" Received: from hpe-dl385gen10.igk.intel.com ([10.91.240.117]) by fmviesa004.fm.intel.com with ESMTP; 20 Jan 2026 02:34:43 -0800 From: Jakub Slepecki To: intel-wired-lan@lists.osuosl.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, przemyslaw.kitszel@intel.com, anthony.l.nguyen@intel.com, michal.swiatkowski@linux.intel.com, jakub.slepecki@intel.com, aleksandr.loktionov@intel.com Subject: [PATCH iwl-next v3 1/8] ice: in dvm, use outer VLAN in MAC,VLAN lookup Date: Tue, 20 Jan 2026 11:34:32 +0100 Message-ID: <20260120103440.892326-2-jakub.slepecki@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260120103440.892326-1-jakub.slepecki@intel.com> References: <20260120103440.892326-1-jakub.slepecki@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In double VLAN mode (DVM), outer VLAN is located a word earlier in the field vector compared to the single VLAN mode. We already modify ICE_SW_LKUP_VLAN to use it but ICE_SW_LKUP_MAC_VLAN was left untouched, causing the lookup to match any packet with one or no layer of Dot1q. This change enables to fix cross-vlan loopback traffic using MAC,VLAN lookups. Reviewed-by: Aleksandr Loktionov Reviewed-by: Michal Swiatkowski Signed-off-by: Jakub Slepecki --- No changes in v3. No changes in v2. --- drivers/net/ethernet/intel/ice/ice_vlan_mode.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/net/ethernet/intel/ice/ice_vlan_mode.c b/drivers/net/e= thernet/intel/ice/ice_vlan_mode.c index fb526cb84776..68a7b05de44e 100644 --- a/drivers/net/ethernet/intel/ice/ice_vlan_mode.c +++ b/drivers/net/ethernet/intel/ice/ice_vlan_mode.c @@ -198,6 +198,7 @@ static bool ice_is_dvm_supported(struct ice_hw *hw) #define ICE_SW_LKUP_VLAN_LOC_LKUP_IDX 1 #define ICE_SW_LKUP_VLAN_PKT_FLAGS_LKUP_IDX 2 #define ICE_SW_LKUP_PROMISC_VLAN_LOC_LKUP_IDX 2 +#define ICE_SW_LKUP_MAC_VLAN_LOC_LKUP_IDX 4 #define ICE_PKT_FLAGS_0_TO_15_FV_IDX 1 static struct ice_update_recipe_lkup_idx_params ice_dvm_dflt_recipes[] =3D= { { @@ -234,6 +235,17 @@ static struct ice_update_recipe_lkup_idx_params ice_dv= m_dflt_recipes[] =3D { .mask_valid =3D false, /* use pre-existing mask */ .lkup_idx =3D ICE_SW_LKUP_PROMISC_VLAN_LOC_LKUP_IDX, }, + { + /* Similarly to ICE_SW_LKUP_VLAN, change to outer/single VLAN in + * DVM + */ + .rid =3D ICE_SW_LKUP_MAC_VLAN, + .fv_idx =3D ICE_EXTERNAL_VLAN_ID_FV_IDX, + .ignore_valid =3D true, + .mask =3D 0, + .mask_valid =3D false, + .lkup_idx =3D ICE_SW_LKUP_MAC_VLAN_LOC_LKUP_IDX, + }, }; =20 /** --=20 2.43.0