From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39AB8E9A048 for ; Thu, 19 Feb 2026 11:25:06 +0000 (UTC) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BCA04064E; Thu, 19 Feb 2026 12:24:56 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by mails.dpdk.org (Postfix) with ESMTP id 7B7AC402E4 for ; Thu, 19 Feb 2026 12:24:49 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1771500290; x=1803036290; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hE4BqUwyrUsxe44fwmT9WSS00Gc6qkjbcHPjJ58k1gE=; b=j45RMa/MND+4ifGsu2ar9oL4VwYWp9eg+uRwjrhiL5w8G+VdIFSKqEb4 suY6/0HRb9D+nkgoOiNQKhvb2oU0ROgizuEzTdkQOG0wvEgajmAQ1NZvx ITq144kufv3NN/jhuYzCXdZJzpxInJb/R4vag6CTVIsEqVVkRZ9Cdsi/j PjRfQeOL4E5rr+iVVVjv5Pn57bjH9mLRimHe1Zei5eca1BbQ36dqyTWzA +l+aw9+jgoewFUPoczHJKcCiG9I2d8buDfUmsUYdejIzqNVPtVl8/v1q5 X3ft2oviTaf4TJlkvCYLL8McTj1Y71TjoWjYXLJGoO8IM1aAxNYiGxS4T g==; X-CSE-ConnectionGUID: hGyz8d6DTM6z22O/AFl/Ag== X-CSE-MsgGUID: Zowddgz6TEmIuSW8rhd+sg== X-IronPort-AV: E=McAfee;i="6800,10657,11705"; a="76198677" X-IronPort-AV: E=Sophos;i="6.21,299,1763452800"; d="scan'208";a="76198677" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Feb 2026 03:24:49 -0800 X-CSE-ConnectionGUID: un52pgutSea3DYL3zV40tg== X-CSE-MsgGUID: EjI/oke5TOCeGfjlC/+x2Q== X-ExtLoop1: 1 Received: from unknown (HELO sprmax15..) ([10.138.182.128]) by fmviesa003.fm.intel.com with ESMTP; 19 Feb 2026 03:24:47 -0800 From: Shaiq Wani To: dev@dpdk.org, bruce.richardson@intel.com, aman.deep.singh@intel.com Cc: Song Jiale Subject: [PATCH v7 3/7] net/ice: rename protocol identifiers Date: Thu, 19 Feb 2026 16:50:59 +0530 Message-Id: <20260219112103.2370766-4-shaiq.wani@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260219112103.2370766-1-shaiq.wani@intel.com> References: <20260202094244.447966-2-shaiq.wani@intel.com> <20260219112103.2370766-1-shaiq.wani@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Rename existing protocol identifiers to use _OUTER suffix and add corresponding _INNER variants to support tunneled packet parsing. Signed-off-by: Shaiq Wani Tested-by: Song Jiale --- drivers/net/intel/ice/ice_generic_flow.h | 107 ++++++++++++++--------- 1 file changed, 66 insertions(+), 41 deletions(-) diff --git a/drivers/net/intel/ice/ice_generic_flow.h b/drivers/net/intel/ice/ice_generic_flow.h index 54bbb47398..0b282d4ee5 100644 --- a/drivers/net/intel/ice/ice_generic_flow.h +++ b/drivers/net/intel/ice/ice_generic_flow.h @@ -9,15 +9,15 @@ /* protocol */ -#define ICE_PROT_MAC BIT_ULL(1) -#define ICE_PROT_VLAN BIT_ULL(2) -#define ICE_PROT_IPV4 BIT_ULL(3) -#define ICE_PROT_IPV6 BIT_ULL(4) -#define ICE_PROT_TCP BIT_ULL(5) -#define ICE_PROT_UDP BIT_ULL(6) -#define ICE_PROT_SCTP BIT_ULL(7) -#define ICE_PROT_ICMP4 BIT_ULL(8) -#define ICE_PROT_ICMP6 BIT_ULL(9) +#define ICE_PROT_MAC_OUTER BIT_ULL(1) +#define ICE_PROT_VLAN_OUTER BIT_ULL(2) +#define ICE_PROT_IPV4_OUTER BIT_ULL(3) +#define ICE_PROT_IPV6_OUTER BIT_ULL(4) +#define ICE_PROT_TCP_OUTER BIT_ULL(5) +#define ICE_PROT_UDP_OUTER BIT_ULL(6) +#define ICE_PROT_SCTP_OUTER BIT_ULL(7) +#define ICE_PROT_ICMP4_OUTER BIT_ULL(8) +#define ICE_PROT_ICMP6_OUTER BIT_ULL(9) #define ICE_PROT_VXLAN BIT_ULL(10) #define ICE_PROT_NVGRE BIT_ULL(11) #define ICE_PROT_GTPU BIT_ULL(12) @@ -27,6 +27,15 @@ #define ICE_PROT_L2TPV3OIP BIT_ULL(16) #define ICE_PROT_PFCP BIT_ULL(17) #define ICE_PROT_NAT_T_ESP BIT_ULL(18) +#define ICE_PROT_MAC_INNER BIT_ULL(20) +#define ICE_PROT_VLAN_INNER BIT_ULL(21) +#define ICE_PROT_IPV4_INNER BIT_ULL(22) +#define ICE_PROT_IPV6_INNER BIT_ULL(23) +#define ICE_PROT_TCP_INNER BIT_ULL(24) +#define ICE_PROT_UDP_INNER BIT_ULL(25) +#define ICE_PROT_SCTP_INNER BIT_ULL(26) +#define ICE_PROT_ICMP4_INNER BIT_ULL(27) +#define ICE_PROT_ICMP6_INNER BIT_ULL(28) /* field */ @@ -53,7 +62,7 @@ #define ICE_L2TPV3OIP_SESSION_ID BIT_ULL(43) #define ICE_PFCP_SEID BIT_ULL(42) #define ICE_PFCP_S_FIELD BIT_ULL(41) -#define ICE_IP_PK_ID BIT_ULL(40) +#define ICE_IP_PK_ID BIT_ULL(40) #define ICE_IP_FRAG_OFS BIT_ULL(39) /* input set */ @@ -62,39 +71,39 @@ #define ICE_INSET_SMAC (ICE_SMAC) #define ICE_INSET_DMAC (ICE_DMAC) -#define ICE_INSET_VLAN (ICE_PROT_VLAN) -#define ICE_INSET_VLAN_INNER (ICE_PROT_VLAN) -#define ICE_INSET_VLAN_OUTER (ICE_PROT_VLAN) +#define ICE_INSET_VLAN (ICE_PROT_VLAN_OUTER) +#define ICE_INSET_VLAN_INNER (ICE_PROT_VLAN_INNER) +#define ICE_INSET_VLAN_OUTER (ICE_PROT_VLAN_OUTER) #define ICE_INSET_ETHERTYPE (ICE_ETHERTYPE) -#define ICE_INSET_IPV4_SRC (ICE_PROT_IPV4 | ICE_IP_SRC) -#define ICE_INSET_IPV4_DST (ICE_PROT_IPV4 | ICE_IP_DST) -#define ICE_INSET_IPV4_TOS (ICE_PROT_IPV4 | ICE_IP_TOS) -#define ICE_INSET_IPV4_PROTO (ICE_PROT_IPV4 | ICE_IP_PROTO) -#define ICE_INSET_IPV4_TTL (ICE_PROT_IPV4 | ICE_IP_TTL) -#define ICE_INSET_IPV4_PKID (ICE_PROT_IPV4 | ICE_IP_PK_ID) -#define ICE_INSET_IPV4_FRAG_OFS (ICE_PROT_IPV4 | ICE_IP_FRAG_OFS) -#define ICE_INSET_IPV6_SRC (ICE_PROT_IPV6 | ICE_IP_SRC) -#define ICE_INSET_IPV6_DST (ICE_PROT_IPV6 | ICE_IP_DST) -#define ICE_INSET_IPV6_NEXT_HDR (ICE_PROT_IPV6 | ICE_IP_PROTO) -#define ICE_INSET_IPV6_HOP_LIMIT (ICE_PROT_IPV6 | ICE_IP_TTL) -#define ICE_INSET_IPV6_TC (ICE_PROT_IPV6 | ICE_IP_TOS) -#define ICE_INSET_IPV6_PKID (ICE_PROT_IPV6 | ICE_IP_PK_ID) - -#define ICE_INSET_TCP_SRC_PORT (ICE_PROT_TCP | ICE_SPORT) -#define ICE_INSET_TCP_DST_PORT (ICE_PROT_TCP | ICE_DPORT) -#define ICE_INSET_UDP_SRC_PORT (ICE_PROT_UDP | ICE_SPORT) -#define ICE_INSET_UDP_DST_PORT (ICE_PROT_UDP | ICE_DPORT) -#define ICE_INSET_SCTP_SRC_PORT (ICE_PROT_SCTP | ICE_SPORT) -#define ICE_INSET_SCTP_DST_PORT (ICE_PROT_SCTP | ICE_DPORT) -#define ICE_INSET_ICMP4_SRC_PORT (ICE_PROT_ICMP4 | ICE_SPORT) -#define ICE_INSET_ICMP4_DST_PORT (ICE_PROT_ICMP4 | ICE_DPORT) -#define ICE_INSET_ICMP6_SRC_PORT (ICE_PROT_ICMP6 | ICE_SPORT) -#define ICE_INSET_ICMP6_DST_PORT (ICE_PROT_ICMP6 | ICE_DPORT) -#define ICE_INSET_ICMP4_TYPE (ICE_PROT_ICMP4 | ICE_ICMP_TYPE) -#define ICE_INSET_ICMP4_CODE (ICE_PROT_ICMP4 | ICE_ICMP_CODE) -#define ICE_INSET_ICMP6_TYPE (ICE_PROT_ICMP6 | ICE_ICMP_TYPE) -#define ICE_INSET_ICMP6_CODE (ICE_PROT_ICMP6 | ICE_ICMP_CODE) +#define ICE_INSET_IPV4_SRC (ICE_PROT_IPV4_OUTER | ICE_IP_SRC) +#define ICE_INSET_IPV4_DST (ICE_PROT_IPV4_OUTER | ICE_IP_DST) +#define ICE_INSET_IPV4_TOS (ICE_PROT_IPV4_OUTER | ICE_IP_TOS) +#define ICE_INSET_IPV4_PROTO (ICE_PROT_IPV4_OUTER | ICE_IP_PROTO) +#define ICE_INSET_IPV4_TTL (ICE_PROT_IPV4_OUTER | ICE_IP_TTL) +#define ICE_INSET_IPV4_PKID (ICE_PROT_IPV4_OUTER | ICE_IP_PK_ID) +#define ICE_INSET_IPV4_FRAG_OFS (ICE_PROT_IPV4_OUTER | ICE_IP_FRAG_OFS) +#define ICE_INSET_IPV6_SRC (ICE_PROT_IPV6_OUTER | ICE_IP_SRC) +#define ICE_INSET_IPV6_DST (ICE_PROT_IPV6_OUTER | ICE_IP_DST) +#define ICE_INSET_IPV6_NEXT_HDR (ICE_PROT_IPV6_OUTER | ICE_IP_PROTO) +#define ICE_INSET_IPV6_HOP_LIMIT (ICE_PROT_IPV6_OUTER | ICE_IP_TTL) +#define ICE_INSET_IPV6_TC (ICE_PROT_IPV6_OUTER | ICE_IP_TOS) +#define ICE_INSET_IPV6_PKID (ICE_PROT_IPV6_OUTER | ICE_IP_PK_ID) + +#define ICE_INSET_TCP_SRC_PORT (ICE_PROT_TCP_OUTER | ICE_SPORT) +#define ICE_INSET_TCP_DST_PORT (ICE_PROT_TCP_OUTER | ICE_DPORT) +#define ICE_INSET_UDP_SRC_PORT (ICE_PROT_UDP_OUTER | ICE_SPORT) +#define ICE_INSET_UDP_DST_PORT (ICE_PROT_UDP_OUTER | ICE_DPORT) +#define ICE_INSET_SCTP_SRC_PORT (ICE_PROT_SCTP_OUTER | ICE_SPORT) +#define ICE_INSET_SCTP_DST_PORT (ICE_PROT_SCTP_OUTER | ICE_DPORT) +#define ICE_INSET_ICMP4_SRC_PORT (ICE_PROT_ICMP4_OUTER | ICE_SPORT) +#define ICE_INSET_ICMP4_DST_PORT (ICE_PROT_ICMP4_OUTER | ICE_DPORT) +#define ICE_INSET_ICMP6_SRC_PORT (ICE_PROT_ICMP6_OUTER | ICE_SPORT) +#define ICE_INSET_ICMP6_DST_PORT (ICE_PROT_ICMP6_OUTER | ICE_DPORT) +#define ICE_INSET_ICMP4_TYPE (ICE_PROT_ICMP4_OUTER | ICE_ICMP_TYPE) +#define ICE_INSET_ICMP4_CODE (ICE_PROT_ICMP4_OUTER | ICE_ICMP_CODE) +#define ICE_INSET_ICMP6_TYPE (ICE_PROT_ICMP6_OUTER | ICE_ICMP_TYPE) +#define ICE_INSET_ICMP6_CODE (ICE_PROT_ICMP6_OUTER | ICE_ICMP_CODE) /* tunnel */ @@ -122,6 +131,22 @@ (ICE_PROT_PFCP | ICE_PFCP_S_FIELD | ICE_PFCP_SEID) #define ICE_INSET_NAT_T_ESP_SPI \ (ICE_PROT_NAT_T_ESP | ICE_ESP_SPI) +#define ICE_INSET_TUN_IPV4_SRC \ + (ICE_PROT_IPV4_INNER | ICE_IP_SRC) +#define ICE_INSET_TUN_IPV4_DST \ + (ICE_PROT_IPV4_INNER | ICE_IP_DST) +#define ICE_INSET_TUN_UDP_SRC_PORT \ + (ICE_PROT_UDP_INNER | ICE_SPORT) +#define ICE_INSET_TUN_UDP_DST_PORT \ + (ICE_PROT_UDP_INNER | ICE_DPORT) +#define ICE_INSET_TUN_TCP_SRC_PORT \ + (ICE_PROT_TCP_INNER | ICE_SPORT) +#define ICE_INSET_TUN_TCP_DST_PORT \ + (ICE_PROT_TCP_INNER | ICE_DPORT) +#define ICE_INSET_TUN_IPV6_SRC \ + (ICE_PROT_IPV6_INNER | ICE_IP_SRC) +#define ICE_INSET_TUN_IPV6_DST \ + (ICE_PROT_IPV6_INNER | ICE_IP_DST) /* empty pattern */ extern enum rte_flow_item_type pattern_empty[]; -- 2.34.1