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 A4555A0548; Fri, 2 Apr 2021 04:06:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E95C40F35; Fri, 2 Apr 2021 04:06:52 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 9E98D40150 for ; Fri, 2 Apr 2021 04:06:48 +0200 (CEST) IronPort-SDR: AUVCoz7TfJwkh4RZS7nJMv1rMuSP7ch5anHyHrYFJQScXB4QTKiGw1Az7oPJ2KQXlQeYWMQDei HkgmYSO+HN7g== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="191851293" X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="191851293" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 19:06:47 -0700 IronPort-SDR: VQvsmEsn+pkBGHA+oTZMiLva15PunZereTilNorYnhvIa8b8pyTDXwbUOLPye28aFEvG1VfQFZ t6E0eVLI7fOA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="456236302" Received: from fmsmsx606.amr.corp.intel.com ([10.18.126.86]) by orsmga001.jf.intel.com with ESMTP; 01 Apr 2021 19:06:47 -0700 Received: from shsmsx605.ccr.corp.intel.com (10.109.6.215) by fmsmsx606.amr.corp.intel.com (10.18.126.86) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Thu, 1 Apr 2021 19:06:46 -0700 Received: from shsmsx601.ccr.corp.intel.com (10.109.6.141) by SHSMSX605.ccr.corp.intel.com (10.109.6.215) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Fri, 2 Apr 2021 10:06:44 +0800 Received: from shsmsx601.ccr.corp.intel.com ([10.109.6.141]) by SHSMSX601.ccr.corp.intel.com ([10.109.6.141]) with mapi id 15.01.2106.013; Fri, 2 Apr 2021 10:06:44 +0800 From: "Guo, Jia" To: "Xu, Ting" , "Yang, Qiming" , "Zhang, Qi Z" CC: "dev@dpdk.org" Thread-Topic: [PATCH v2 3/3] net/ice: support FDIR for IP fragment packet Thread-Index: AQHXILXGq71wTkHROEuCgSLD7Jq/RKqbYRwAgAUm8EA= Date: Fri, 2 Apr 2021 02:06:44 +0000 Message-ID: <5764fd6b815a406db92b74ff43d9932a@intel.com> References: <20210317034335.31974-1-jia.guo@intel.com> <20210324135407.60637-1-jia.guo@intel.com> <20210324135407.60637-4-jia.guo@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 x-originating-ip: [10.239.127.36] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 3/3] net/ice: support FDIR for IP fragment packet 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" Hi, ting > -----Original Message----- > From: Xu, Ting > Sent: Tuesday, March 30, 2021 11:25 AM > To: Guo, Jia ; Yang, Qiming ; > Zhang, Qi Z > Cc: dev@dpdk.org > Subject: RE: [PATCH v2 3/3] net/ice: support FDIR for IP fragment packet >=20 > Hi, Jeff >=20 > > -----Original Message----- > > From: Guo, Jia > > Sent: Wednesday, March 24, 2021 9:54 PM > > To: Yang, Qiming ; Zhang, Qi Z > > > > Cc: Xu, Ting ; dev@dpdk.org; Guo, Jia > > > > Subject: [PATCH v2 3/3] net/ice: support FDIR for IP fragment packet > > > > New FDIR parsing are added to handle the fragmented IPv4/IPv6 packet. > > > > Signed-off-by: Jeff Guo > > --- > > drivers/net/ice/ice_fdir_filter.c | 96 > > +++++++++++++++++++++++++++---- > > 1 file changed, 85 insertions(+), 11 deletions(-) > > > > diff --git a/drivers/net/ice/ice_fdir_filter.c > > b/drivers/net/ice/ice_fdir_filter.c > > index 3af5812660..3504d3c6c2 100644 > > --- a/drivers/net/ice/ice_fdir_filter.c > > +++ b/drivers/net/ice/ice_fdir_filter.c > > @@ -24,7 +24,7 @@ > > #define ICE_FDIR_INSET_ETH_IPV4 (\ > > ICE_FDIR_INSET_ETH | \ > > ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_IPV4_TOS | \ > > -ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_PROTO) > > +ICE_INSET_IPV4_TTL | ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_PKID) > > > > #define ICE_FDIR_INSET_ETH_IPV4_UDP (\ > > ICE_FDIR_INSET_ETH_IPV4 | \ > > @@ -41,7 +41,8 @@ > > #define ICE_FDIR_INSET_ETH_IPV6 (\ > > ICE_INSET_DMAC | \ > > ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST | ICE_INSET_IPV6_TC | \ > > -ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_NEXT_HDR) > > +ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_NEXT_HDR | \ > > +ICE_INSET_IPV6_PKID) > > > > #define ICE_FDIR_INSET_ETH_IPV6_UDP (\ > > ICE_FDIR_INSET_ETH_IPV6 | \ > > @@ -56,7 +57,8 @@ > > ICE_INSET_SCTP_SRC_PORT | ICE_INSET_SCTP_DST_PORT) > > > > #define ICE_FDIR_INSET_IPV4 (\ > > -ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) > > +ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ > > +ICE_INSET_IPV4_PKID) > > > > #define ICE_FDIR_INSET_IPV4_TCP (\ > > ICE_FDIR_INSET_IPV4 | \ > > @@ -72,7 +74,8 @@ > > > > #define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\ ICE_FDIR_INSET_ETH | \ > > -ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) > > +ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ > > +ICE_INSET_IPV4_PKID) > > > > #define ICE_FDIR_INSET_IPV4_GTPU (\ > > ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID) > @@ > > -95,6 +98,7 @@ static struct ice_pattern_match_item > > ice_fdir_pattern_list[] =3D { {pattern_eth_ipv4_tcp, > > ICE_FDIR_INSET_ETH_IPV4_TCP,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > {pattern_eth_ipv4_sctp, > > ICE_FDIR_INSET_ETH_IPV4_SCTP,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > {pattern_eth_ipv6, > > ICE_FDIR_INSET_ETH_IPV6,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > +{pattern_eth_ipv6_frag_ext, > > ICE_FDIR_INSET_ETH_IPV6,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > {pattern_eth_ipv6_udp, > > ICE_FDIR_INSET_ETH_IPV6_UDP,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > {pattern_eth_ipv6_tcp, > > ICE_FDIR_INSET_ETH_IPV6_TCP,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > {pattern_eth_ipv6_sctp, > > ICE_FDIR_INSET_ETH_IPV6_SCTP,ICE_INSET_NONE, > > ICE_INSET_NONE}, > > @@ -882,11 +886,13 @@ ice_fdir_input_set_parse(uint64_t inset, enum > > ice_flow_field *field) {ICE_INSET_IPV4_TOS, > > ICE_FLOW_FIELD_IDX_IPV4_DSCP}, {ICE_INSET_IPV4_TTL, > > ICE_FLOW_FIELD_IDX_IPV4_TTL}, {ICE_INSET_IPV4_PROTO, > > ICE_FLOW_FIELD_IDX_IPV4_PROT}, > > +{ICE_INSET_IPV4_PKID, ICE_FLOW_FIELD_IDX_IPV4_ID}, > > {ICE_INSET_IPV6_SRC, ICE_FLOW_FIELD_IDX_IPV6_SA}, > > {ICE_INSET_IPV6_DST, ICE_FLOW_FIELD_IDX_IPV6_DA}, > {ICE_INSET_IPV6_TC, > > ICE_FLOW_FIELD_IDX_IPV6_DSCP}, {ICE_INSET_IPV6_NEXT_HDR, > > ICE_FLOW_FIELD_IDX_IPV6_PROT}, {ICE_INSET_IPV6_HOP_LIMIT, > > ICE_FLOW_FIELD_IDX_IPV6_TTL}, > > +{ICE_INSET_IPV6_PKID, ICE_FLOW_FIELD_IDX_IPV6_ID}, > > {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}, @@ -935,6 +941,10 @@ > > 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_IPV4 | > > ICE_FLOW_SEG_HDR_IPV_OTHER); > > break; > > +case ICE_FLTR_PTYPE_FRAG_IPV4: > > +ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV4 | > > + ICE_FLOW_SEG_HDR_IPV_FRAG); > > +break; > > case ICE_FLTR_PTYPE_NONF_IPV6_UDP: > > ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_UDP | > > ICE_FLOW_SEG_HDR_IPV6 | > > @@ -951,6 +961,10 @@ ice_fdir_input_set_hdrs(enum ice_fltr_ptype flow, > > struct ice_flow_seg_info *seg) > > ICE_FLOW_SEG_HDR_IPV_OTHER); > > break; > > case ICE_FLTR_PTYPE_NONF_IPV6_OTHER: > > +ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6 | > > + ICE_FLOW_SEG_HDR_IPV_FRAG); > > +break; > > +case ICE_FLTR_PTYPE_FRAG_IPV6: >=20 > Are the frag and non-frag cases inverted? >=20 That is right as you said, will correct it in coming version. Thanks. > > ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_IPV6 | > > ICE_FLOW_SEG_HDR_IPV_OTHER); > > break; > > @@ -1592,8 +1606,10 @@ ice_fdir_parse_pattern(__rte_unused struct > > ice_adapter *ad, enum rte_flow_item_type l3 =3D > RTE_FLOW_ITEM_TYPE_END; > > enum ice_fdir_tunnel_type tunnel_type =3D ICE_FDIR_TUNNEL_TYPE_NONE; > > const struct rte_flow_item_eth *eth_spec, *eth_mask; -const struct > > rte_flow_item_ipv4 *ipv4_spec, *ipv4_mask; > > +const struct rte_flow_item_ipv4 *ipv4_spec, *ipv4_last, *ipv4_mask; > > const struct rte_flow_item_ipv6 *ipv6_spec, *ipv6_mask; > > +const struct rte_flow_item_ipv6_frag_ext *ipv6_frag_spec, > > +*ipv6_frag_last, *ipv6_frag_mask; > > const struct rte_flow_item_tcp *tcp_spec, *tcp_mask; const struct > > rte_flow_item_udp *udp_spec, *udp_mask; const struct > > rte_flow_item_sctp *sctp_spec, *sctp_mask; @@ -1615,6 > > +1631,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter *ad, > > struct ice_fdir_extra *p_ext_data; > > struct ice_fdir_v4 *p_v4 =3D NULL; > > struct ice_fdir_v6 *p_v6 =3D NULL; > > +bool spec_all_pid =3D false; > > > > for (item =3D pattern; item->type !=3D RTE_FLOW_ITEM_TYPE_END; item++)= { > > if (item->type =3D=3D RTE_FLOW_ITEM_TYPE_VXLAN) @@ -1632,13 > > +1649,14 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter > > +*ad, > > * flow. input_set_i is used for inner part. > > */ > > for (item =3D pattern; item->type !=3D RTE_FLOW_ITEM_TYPE_END; item++)= { > > -if (item->last) { > > +if (item->last && (item_type !=3D RTE_FLOW_ITEM_TYPE_IPV4 || > > + item_type !=3D > > + RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT)) { > > rte_flow_error_set(error, EINVAL, > > - RTE_FLOW_ERROR_TYPE_ITEM, > > - item, > > + RTE_FLOW_ERROR_TYPE_ITEM, item, > > "Not support range"); > > -return -rte_errno; > > } > > + > > item_type =3D item->type; > > > > input_set =3D (tunnel_type && !is_outer) ? > > @@ -1689,6 +1707,7 @@ ice_fdir_parse_pattern(__rte_unused struct > > ice_adapter *ad, flow_type =3D ICE_FLTR_PTYPE_NONF_IPV4_OTHER; > > l3 =3D RTE_FLOW_ITEM_TYPE_IPV4; > > ipv4_spec =3D item->spec; > > +ipv4_last =3D item->last; > > ipv4_mask =3D item->mask; > > p_v4 =3D (tunnel_type && is_outer) ? > > &filter->input.ip_outer.v4 : > > @@ -1700,8 +1719,6 @@ ice_fdir_parse_pattern(__rte_unused struct > > ice_adapter *ad, > > /* Check IPv4 mask and update input set */ if > > (ipv4_mask->hdr.version_ihl || > > ipv4_mask->hdr.total_length || > > - ipv4_mask->hdr.packet_id || > > - ipv4_mask->hdr.fragment_offset || > > ipv4_mask->hdr.hdr_checksum) { > > rte_flow_error_set(error, EINVAL, > > > > RTE_FLOW_ERROR_TYPE_ITEM, > > @@ -1710,6 +1727,20 @@ ice_fdir_parse_pattern(__rte_unused struct > > ice_adapter *ad, return -rte_errno; } > > > > +if (ipv4_last->hdr.version_ihl || > > + ipv4_last->hdr.type_of_service || > > + ipv4_last->hdr.time_to_live || > > + ipv4_last->hdr.total_length | > > + ipv4_last->hdr.next_proto_id || > > + ipv4_last->hdr.hdr_checksum || > > + ipv4_last->hdr.src_addr || > > + ipv4_last->hdr.dst_addr) { > > +rte_flow_error_set(error, EINVAL, > > + > > RTE_FLOW_ERROR_TYPE_ITEM, > > + item, "Invalid IPv4 last."); > > +return -rte_errno; > > +} > > + > > if (ipv4_mask->hdr.dst_addr =3D=3D UINT32_MAX) *input_set |=3D > > ICE_INSET_IPV4_DST; if (ipv4_mask->hdr.src_addr =3D=3D UINT32_MAX) @@ = - > > 1726,6 +1757,24 @@ ice_fdir_parse_pattern(__rte_unused struct > > ice_adapter *ad, p_v4->ttl =3D ipv4_spec->hdr.time_to_live; > > p_v4->proto =3D ipv4_spec->hdr.next_proto_id; p_v4->tos =3D > > ipv4_spec->hdr.type_of_service; > > + > > +if (ipv4_mask->hdr.packet_id =3D=3D UINT16_MAX) { if (ipv4_last && > > + ipv4_spec->hdr.packet_id =3D=3D 0 && > > + ipv4_last->hdr.packet_id =3D=3D 0xffff) spec_all_pid =3D true; > > + > > +/* All IPv4 fragment packet has the same > > + * ethertype, if the spec is for all invalid > > + * packet id, set ethertype into input set. > > + */ > > +*input_set |=3D spec_all_pid ? > > +ICE_INSET_ETHERTYPE : > > +ICE_INSET_IPV4_PKID; > > +} > > + > > +if (ipv4_mask->hdr.fragment_offset =3D=3D UINT16_MAX) flow_type =3D > > +ICE_FLTR_PTYPE_FRAG_IPV4; > > break; > > case RTE_FLOW_ITEM_TYPE_IPV6: > > flow_type =3D ICE_FLTR_PTYPE_NONF_IPV6_OTHER; @@ > > -1771,6 +1820,31 @@ ice_fdir_parse_pattern(__rte_unused struct > > ice_adapter *ad, p_v6->proto =3D ipv6_spec->hdr.proto; p_v6->hlim =3D > > ipv6_spec->hdr.hop_limits; break; > > +case RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT: > > +l3 =3D RTE_FLOW_ITEM_TYPE_IPV6_FRAG_EXT; flow_type =3D > > +ICE_FLTR_PTYPE_FRAG_IPV6; ipv6_frag_spec =3D item->spec; > ipv6_frag_last > > +=3D item->last; ipv6_frag_mask =3D item->mask; > > + > > +if (!(ipv6_frag_spec && ipv6_frag_mask)) break; > > + > > +if (ipv6_frag_last && > > + ipv6_frag_spec->hdr.id =3D=3D 0 && > > + ipv6_frag_last->hdr.id =3D=3D > > + 0xffffffff) > > +spec_all_pid =3D true; > > + > > +/* All IPv6 fragment packet has the same ethertype, if > > + * the spec is for all invalid packet id, set ethertype > > + * into input set. > > + */ > > +*input_set |=3D spec_all_pid ? > > +ICE_INSET_ETHERTYPE : > > +ICE_INSET_IPV6_PKID; > > +break; > > + > > case RTE_FLOW_ITEM_TYPE_TCP: > > if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV4) > > flow_type =3D ICE_FLTR_PTYPE_NONF_IPV4_TCP; > > -- > > 2.20.1 >=20