From patchwork Fri Apr 23 07:42:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhang, Yuying" X-Patchwork-Id: 92057 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5B960A0548; Fri, 23 Apr 2021 09:53:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5986341DCA; Fri, 23 Apr 2021 09:53:19 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id D4411416FF for ; Fri, 23 Apr 2021 09:53:16 +0200 (CEST) IronPort-SDR: hX3nnqoR7twhfb6PJjqZe5Ea9O8h0QIm7f0XRbJ2ysQ5dwCd2XnHb2AqgG6vQXlKm7uFnViUTo 2fxqXrUTeQJA== X-IronPort-AV: E=McAfee;i="6200,9189,9962"; a="281360800" X-IronPort-AV: E=Sophos;i="5.82,245,1613462400"; d="scan'208";a="281360800" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2021 00:53:16 -0700 IronPort-SDR: TpOwyXU80Z8ncModATSq37ifOUYfgOFkziUwmrxyOYNnbf0gjMtfKclySVHFz7x9tI70C+oI/8 0iwyx0dB1Svw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,245,1613462400"; d="scan'208";a="456127577" Received: from dpdk-yyzhang2.sh.intel.com ([10.67.117.129]) by fmsmga002.fm.intel.com with ESMTP; 23 Apr 2021 00:53:14 -0700 From: Yuying Zhang To: dev@dpdk.org, qi.z.zhang@intel.com, haiyue.wang@intel.com Cc: junfeng.guo@intel.com, Zhirun.Yan@intel.com, Yuying Zhang Date: Fri, 23 Apr 2021 07:42:03 +0000 Message-Id: <20210423074203.948915-2-yuying.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210423074203.948915-1-yuying.zhang@intel.com> References: <20210422100541.935478-1-yuying.zhang@intel.com> <20210423074203.948915-1-yuying.zhang@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/2] net/ice: clean redundant macro definition of filters 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 Sender: "dev" The input set has been divided into two parts to distinguish inner and outer field. ICE_INSET_TUN_* is the same as non tunnel macro definition. Clean redundant ICE_INSET_TUN_* codes. Signed-off-by: Yuying Zhang --- drivers/net/ice/ice_fdir_filter.c | 22 +++++------ drivers/net/ice/ice_generic_flow.h | 61 ++--------------------------- drivers/net/ice/ice_switch_filter.c | 16 ++++---- 3 files changed, 22 insertions(+), 77 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 3b8ea32b1a..ad2dc40815 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -72,7 +72,7 @@ #define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\ ICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \ - ICE_INSET_TUN_VXLAN_VNI) + ICE_INSET_VXLAN_VNI) #define ICE_FDIR_INSET_IPV4_GTPU (\ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID) @@ -893,17 +893,17 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) {ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT}, {ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT}, {ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT}, - {ICE_INSET_TUN_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA}, - {ICE_INSET_TUN_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA}, - {ICE_INSET_TUN_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT}, - {ICE_INSET_TUN_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT}, - {ICE_INSET_TUN_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT}, - {ICE_INSET_TUN_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT}, - {ICE_INSET_TUN_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT}, - {ICE_INSET_TUN_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT}, + {ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA}, + {ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA}, + {ICE_INSET_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT}, + {ICE_INSET_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT}, + {ICE_INSET_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT}, + {ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT}, + {ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT}, + {ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT}, {ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID}, {ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI}, - {ICE_INSET_TUN_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI}, + {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI}, }; for (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) { @@ -1916,7 +1916,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, } if (vxlan_mask->hdr.vx_vni) - *input_set |= ICE_INSET_TUN_VXLAN_VNI; + *input_set |= ICE_INSET_VXLAN_VNI; filter->input.vxlan_data.vni = vxlan_spec->hdr.vx_vni; diff --git a/drivers/net/ice/ice_generic_flow.h b/drivers/net/ice/ice_generic_flow.h index a4d0b6671d..b7634b9662 100644 --- a/drivers/net/ice/ice_generic_flow.h +++ b/drivers/net/ice/ice_generic_flow.h @@ -92,64 +92,9 @@ /* tunnel */ -#define ICE_INSET_TUN_SMAC \ - (ICE_PROT_MAC | ICE_SMAC) -#define ICE_INSET_TUN_DMAC \ - (ICE_PROT_MAC | ICE_DMAC) - -#define ICE_INSET_TUN_IPV4_SRC \ - (ICE_PROT_IPV4 | ICE_IP_SRC) -#define ICE_INSET_TUN_IPV4_DST \ - (ICE_PROT_IPV4 | ICE_IP_DST) -#define ICE_INSET_TUN_IPV4_TTL \ - (ICE_PROT_IPV4 | ICE_IP_TTL) -#define ICE_INSET_TUN_IPV4_PROTO \ - (ICE_PROT_IPV4 | ICE_IP_PROTO) -#define ICE_INSET_TUN_IPV4_TOS \ - (ICE_PROT_IPV4 | ICE_IP_TOS) -#define ICE_INSET_TUN_IPV6_SRC \ - (ICE_PROT_IPV6 | ICE_IP_SRC) -#define ICE_INSET_TUN_IPV6_DST \ - (ICE_PROT_IPV6 | ICE_IP_DST) -#define ICE_INSET_TUN_IPV6_HOP_LIMIT \ - (ICE_PROT_IPV6 | ICE_IP_TTL) -#define ICE_INSET_TUN_IPV6_NEXT_HDR \ - (ICE_PROT_IPV6 | ICE_IP_PROTO) -#define ICE_INSET_TUN_IPV6_TC \ - (ICE_PROT_IPV6 | ICE_IP_TOS) - -#define ICE_INSET_TUN_TCP_SRC_PORT \ - (ICE_PROT_TCP | ICE_SPORT) -#define ICE_INSET_TUN_TCP_DST_PORT \ - (ICE_PROT_TCP | ICE_DPORT) -#define ICE_INSET_TUN_UDP_SRC_PORT \ - (ICE_PROT_UDP | ICE_SPORT) -#define ICE_INSET_TUN_UDP_DST_PORT \ - (ICE_PROT_UDP | ICE_DPORT) -#define ICE_INSET_TUN_SCTP_SRC_PORT \ - (ICE_PROT_SCTP | ICE_SPORT) -#define ICE_INSET_TUN_SCTP_DST_PORT \ - (ICE_PROT_SCTP | ICE_DPORT) -#define ICE_INSET_TUN_ICMP4_SRC_PORT \ - (ICE_PROT_ICMP4 | ICE_SPORT) -#define ICE_INSET_TUN_ICMP4_DST_PORT \ - (ICE_PROT_ICMP4 | ICE_DPORT) -#define ICE_INSET_TUN_ICMP6_SRC_PORT \ - (ICE_PROT_ICMP6 | ICE_SPORT) -#define ICE_INSET_TUN_ICMP6_DST_PORT \ - (ICE_PROT_ICMP6 | ICE_DPORT) -#define ICE_INSET_TUN_ICMP4_TYPE \ - (ICE_PROT_ICMP4 | ICE_ICMP_TYPE) -#define ICE_INSET_TUN_ICMP4_CODE \ - (ICE_PROT_ICMP4 | ICE_ICMP_CODE) -#define ICE_INSET_TUN_ICMP6_TYPE \ - (ICE_PROT_ICMP6 | ICE_ICMP_TYPE) -#define ICE_INSET_TUN_ICMP6_CODE \ - (ICE_PROT_ICMP6 | ICE_ICMP_CODE) - -#define ICE_INSET_TUN_VXLAN_VNI \ +#define ICE_INSET_VXLAN_VNI \ (ICE_PROT_VXLAN | ICE_VXLAN_VNI) -#define ICE_INSET_TUN_NVGRE_TNI \ +#define ICE_INSET_NVGRE_TNI \ (ICE_PROT_NVGRE | ICE_NVGRE_TNI) #define ICE_INSET_GTPU_TEID \ (ICE_PROT_GTPU | ICE_GTPU_TEID) @@ -473,8 +418,8 @@ enum ice_flow_classification_stage { /* pattern structure */ struct ice_pattern_match_item { enum rte_flow_item_type *pattern_list; - uint64_t input_set_mask_o; /* used for tunnel outer or non tunnel fields */ /* pattern_list must end with RTE_FLOW_ITEM_TYPE_END */ + uint64_t input_set_mask_o; /* used for tunnel outer or non tunnel fields */ uint64_t input_set_mask_i; /* only used for tunnel inner fields */ void *meta; }; diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index c9d2ec7410..9603103b88 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -68,26 +68,26 @@ ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) #define ICE_SW_INSET_DIST_NVGRE_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \ - ICE_INSET_TUN_NVGRE_TNI) + ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \ - ICE_INSET_TUN_VXLAN_VNI) + ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_TUN_NVGRE_TNI) + ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_TUN_NVGRE_TNI) + ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_TUN_VXLAN_VNI) + ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_TUN_VXLAN_VNI) + ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TOS) @@ -911,7 +911,7 @@ ice_switch_parse_pattern(const struct rte_flow_item pattern[], (vxlan_mask->vni[2] << 16) | (vxlan_mask->vni[1] << 8) | vxlan_mask->vni[0]; - *input |= ICE_INSET_TUN_VXLAN_VNI; + *input |= ICE_INSET_VXLAN_VNI; input_set_byte += 2; } t++; @@ -949,7 +949,7 @@ ice_switch_parse_pattern(const struct rte_flow_item pattern[], (nvgre_mask->tni[2] << 16) | (nvgre_mask->tni[1] << 8) | nvgre_mask->tni[0]; - *input |= ICE_INSET_TUN_NVGRE_TNI; + *input |= ICE_INSET_NVGRE_TNI; input_set_byte += 2; } t++;