From patchwork Thu Mar 25 02:56:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yan, Zhirun" X-Patchwork-Id: 89785 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 06783A0A02; Thu, 25 Mar 2021 04:04:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DEC4F140D9F; Thu, 25 Mar 2021 04:04:55 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id CFE2F4067B for ; Thu, 25 Mar 2021 04:04:54 +0100 (CET) IronPort-SDR: bquQJImxVJN+Jk8p6yPtjBszKdgfeOpOuKMrohSKegDYQ2aQCsfjR0YWwu35Nkr4bNd67gP1lC /XR/d+Jzl6wA== X-IronPort-AV: E=McAfee;i="6000,8403,9933"; a="188540838" X-IronPort-AV: E=Sophos;i="5.81,276,1610438400"; d="scan'208";a="188540838" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2021 20:04:53 -0700 IronPort-SDR: 8vNgDnFDtJtK9xjboO9Dej7vRBg1rZTMH0NfQnawPvztfqWXgT3OI9GEr64opCvGBBCodAJ0X8 lqL5pptCBImg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,276,1610438400"; d="scan'208";a="442547742" Received: from dpdk-zhirun-dev.sh.intel.com ([10.67.118.176]) by fmsmga002.fm.intel.com with ESMTP; 24 Mar 2021 20:04:51 -0700 From: Zhirun Yan To: dev@dpdk.org, qi.z.zhang@intel.com, xiao.w.wang@intel.com Cc: yahui.cao@intel.com, junfeng.guo@intel.com, ting.xu@intel.com, Zhirun Yan Date: Thu, 25 Mar 2021 10:56:31 +0800 Message-Id: <20210325025631.330425-1-zhirun.yan@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2] net/ice: support VXLAN VNI field in FDIR 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: , Reply-To: 20210324082521.3862163-1-zhirun.yan@intel.com Errors-To: dev-bounces@dpdk.org Sender: "dev" Add support for VNI field in FDIR. Treat VXLAN flow type as ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN to align with shared code. It allows to match outer L2/L3, VNI and inner L2/L3 fields with VXLAN pattern. VNI takes 24 bits in VXLAN header, but uses 32 bits for matching in shared code. The 8 bits reserved field adjacent should always be 0. Signed-off-by: Zhirun Yan --- drivers/net/ice/ice_fdir_filter.c | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir_filter.c index 3af5812660..adbdea0c09 100644 --- a/drivers/net/ice/ice_fdir_filter.c +++ b/drivers/net/ice/ice_fdir_filter.c @@ -71,8 +71,8 @@ ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT) #define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\ - ICE_FDIR_INSET_ETH | \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) + ICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \ + ICE_INSET_TUN_VXLAN_VNI) #define ICE_FDIR_INSET_IPV4_GTPU (\ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID) @@ -903,6 +903,7 @@ ice_fdir_input_set_parse(uint64_t inset, enum ice_flow_field *field) {ICE_INSET_TUN_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}, }; for (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) { @@ -954,6 +955,12 @@ ice_fdir_input_set_hdrs(enum ice_fltr_ptype flow, struct ice_flow_seg_info *seg) ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER); break; + case ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN: + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP | + ICE_FLOW_SEG_HDR_IPV4 | + ICE_FLOW_SEG_HDR_VXLAN | + ICE_FLOW_SEG_HDR_IPV_OTHER); + break; case ICE_FLTR_PTYPE_NONF_IPV4_GTPU: ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 | @@ -1897,13 +1904,15 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, vxlan_mask = item->mask; is_outer = false; - if (vxlan_spec || vxlan_mask) { - rte_flow_error_set(error, EINVAL, - RTE_FLOW_ERROR_TYPE_ITEM, - item, - "Invalid vxlan field"); - return -rte_errno; - } + if (!(vxlan_spec && vxlan_mask)) + break; + + if ((vxlan_mask->vni[0] | vxlan_mask->vni[1] | + vxlan_mask->vni[2]) == UINT8_MAX) + *input_set |= ICE_INSET_TUN_VXLAN_VNI; + + filter->input.vxlan_data.vni = vxlan_spec->vni[2] << 24 | + vxlan_spec->vni[1] << 16 | vxlan_spec->vni[0] << 8; break; case RTE_FLOW_ITEM_TYPE_GTPU: @@ -1965,6 +1974,8 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, else if (tunnel_type == ICE_FDIR_TUNNEL_TYPE_GTPU_EH && flow_type == ICE_FLTR_PTYPE_NONF_IPV6_UDP) flow_type = ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH; + else if (tunnel_type == ICE_FDIR_TUNNEL_TYPE_VXLAN) + flow_type = ICE_FLTR_PTYPE_NONF_IPV4_UDP_VXLAN; filter->tunnel_type = tunnel_type; filter->input.flow_type = flow_type;