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 A11E342A01; Wed, 26 Apr 2023 10:14:00 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85B87410FA; Wed, 26 Apr 2023 10:14:00 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id B012640DDA for ; Wed, 26 Apr 2023 10:13:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682496838; x=1714032838; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=K3ybHygaFofmEFvGhEvtlpmtU1tHkIXZsiROIayZ3iA=; b=eC8Y42z9rDpnESqdZKMb35ufUHLE/zQMNxK+xEpCsr5GUn8LQDyc01PS wD2UHK4k8jqwMnySzeFICDkoX+ITHkbCOEEI+16ZXok/c+0pA4ZurVxol P08FkGSultqOkusM5R1eqcBEV8pJGh3rfrqaV9rXcVfRKxRBjBcHe/7B/ Fwdt1bPm6bZ4RMyMA0RwXMjH2aOVhvNPKvR+RMlKwPusVPjhwW0cm4229 TV1bZffAmV9NqxYcTdEMDS19Sy6GvsanZYl99FnRlPAN8wg1Hp1I7f4Eh S60+Mo4UYU+sj6RTF4kvJ78p2rX2spGbAOp6R8LMuijhrR0SqnUKB7Tva Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10691"; a="331263207" X-IronPort-AV: E=Sophos;i="5.99,227,1677571200"; d="scan'208";a="331263207" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Apr 2023 01:13:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10691"; a="868201381" X-IronPort-AV: E=Sophos;i="5.99,227,1677571200"; d="scan'208";a="868201381" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga005.jf.intel.com with ESMTP; 26 Apr 2023 01:13:56 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 26 Apr 2023 01:13:55 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Wed, 26 Apr 2023 01:13:55 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.41) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Wed, 26 Apr 2023 01:13:55 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f4c163Rzb/xlSTUHPg3I0w23nenks3FuqXw+cIyQcced5jO2X/zTcg9z60sIInV9Gi2mANVkbNRKBsJo5vGGgFciKWUdhuBveWI9oPPqUWXJi3Z60dxPo0vikIU9B4Zo3h41Vp2NcbkZTGzIZZuNrGcyExE0LajpNe6bEjyge20TRHzkDo4Q5zy/l1kfacU8RTslZSG65OF4R5GAxHI8YoAdxMwMbifhSn6v8OWBi/0wQV+hDy0TyG8u3R1xt6PFY2IfNHoKlbJGEnuHilicMWBhVjlr3sq6p7i3oTLeIVD5rTKuVu3fQT2oKJ71RgMNl9Z2b1LuB3xiUvOsZjYARA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aXQ7K7ayudOdPgBPC5NKhx8MmHXqHo3sBdxhaa0kisY=; b=H4GeKebx4d3dHl+GqLC3tJlE3ts3xLrA+uWq6/z30pqbPLqA0kE9WMR9twhPTbccRcloZaSU/cWNFUH56Y5ObMFQYR7qjJbqDMSqfwNAjKyQodBj2qxno9E1bPUJaBORZERhc59XME4lYB4oKmTxC2tJLnV0JG3Mia8NcUFYgXzS5kWgGDbZNhBVdPGRPGeFAo+dThCIRtioMRT/rKHuxng5L0uLi4kwGS7cICied1Y0f1yjCKVE3xprC6bCB42jyjwSrmXQMWq1NxPhvjsuu0Ocm2FrsoXYjf+TAdYV5Hc8qoy6ltvlhVlenvz3W68EYhItVSF3ByArp5dKfVLqTg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM4PR11MB5994.namprd11.prod.outlook.com (2603:10b6:8:5d::20) by DM4PR11MB5359.namprd11.prod.outlook.com (2603:10b6:5:396::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.21; Wed, 26 Apr 2023 08:13:53 +0000 Received: from DM4PR11MB5994.namprd11.prod.outlook.com ([fe80::e570:d9a7:df1b:1589]) by DM4PR11MB5994.namprd11.prod.outlook.com ([fe80::e570:d9a7:df1b:1589%6]) with mapi id 15.20.6319.034; Wed, 26 Apr 2023 08:13:53 +0000 From: "Zhang, Qi Z" To: "Yan, Zhirun" , "dev@dpdk.org" , "Yang, Qiming" CC: "Wang, Xiao W" Subject: RE: [PATCH v1 3/3] net/ice: fix flow management in FDIR Thread-Topic: [PATCH v1 3/3] net/ice: fix flow management in FDIR Thread-Index: AQHYheS+nVxyP46cFU6qKSCm3uf1iK8/IjIg Date: Wed, 26 Apr 2023 08:13:53 +0000 Message-ID: References: <20220622030032.474770-1-zhirun.yan@intel.com> <20220622030032.474770-4-zhirun.yan@intel.com> In-Reply-To: <20220622030032.474770-4-zhirun.yan@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM4PR11MB5994:EE_|DM4PR11MB5359:EE_ x-ms-office365-filtering-correlation-id: 7100155c-d109-458f-4ec2-08db462e2cd4 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Jgyj63G/TPVmjR/WVGGgq/QFs1GstHwRuCL2QJ6ptV1/2eNA9aSyom0jlToUSdvyQbce3ySLP3PItGQUw9eS7x1AJN1ZtbCpRIPwbwAMkofLSu3FQLb67WfgyHmcsQIdtKOHuW1XUBTCfdiAD4F6hIt3zqauaX2vywq2ATLmZm5bx7Qo2FV9LIW/839rfABnL0NFxeOlnK1FKfDmvoldf8bHNcMpy3llCTrvGWlIPa2k7sXW6CaUo1FsFUrlKmHX9P/xpDMFu/TZTlM0amfBInmf73kTC6uMLnBRQI3OyUqsw2s0wzqWZFNy7k6XPeub1buYjqa2FMc1scSjvGIcP0JFkHG9KdT1x445ePZMIHxdFpM3hUhQFvvjVWyGN4QZ0IJfhIZxoILTpIejPjGnGqWV6pKKIKcS0GG5z9MpDJYDyv0FFJngk0HO4CFWS9QDoWARIGh7Er943xNjr6AMCEWfiHLWM0RfRX9d9jnH7ivmJkW0lZjF2xu+FsRRYfNldCRwBP4shmHO4X110j9iG51RYdo9wp3zFvtqfFYJOZze5aMoz0p5naJrxdseHVbWy71C0l7+5SD+NjdIQTaBTONH0IKsglrT0JkevAdxyiDh1qALYNtjOOG0ZvimCtCu x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM4PR11MB5994.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(136003)(346002)(376002)(396003)(39860400002)(366004)(451199021)(66556008)(66946007)(66476007)(64756008)(76116006)(66446008)(316002)(6636002)(4326008)(110136005)(55016003)(5660300002)(52536014)(82960400001)(38070700005)(41300700001)(8936002)(8676002)(2906002)(122000001)(38100700002)(186003)(53546011)(9686003)(107886003)(6506007)(26005)(83380400001)(33656002)(86362001)(478600001)(7696005)(71200400001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ACLxguz03lvEURh7WF74KJKN9/3WKjWoZ7du8FsmjyLxEgr0WUoepPr2/QT1?= =?us-ascii?Q?lKNA7hATKWqsErAb1Uva6bHo7LdOoVG1Y2LpFogbiBZd5Qm+FjizLKN6tA8k?= =?us-ascii?Q?dHUk18t4vhFONVupdp7d2gQTAJqYfm3NWu1GM7wobjz69h/TsWvfP27dQ4u5?= =?us-ascii?Q?N0aLlG+JsItW7hjgA4YY4eFk0cidWJjZO1pYQGfyvIcY3T7CGqpYciGTUZKj?= =?us-ascii?Q?Puz0ohRacGL4qeISVZWp229YduZyu6tfSr0ycr+NDqAc7HCanR4Xf9XMHmtR?= =?us-ascii?Q?ewUIUThC1GvGPGLZj5YDig4oU8bCQ+gh5pKiOiuuBkJZeSzZxjyUjhI1XOEd?= =?us-ascii?Q?lhsYrSBifHZ1sKlkGeJF3xUIKxAiVHIwWqHuRIA2av63gThLGjiq3e97+19w?= =?us-ascii?Q?p4S1b9luGzMoGKRhzMdo9ZdFh3quV6ZwRqU7LYIZJafvwF3bjo0eNxwr7RJ+?= =?us-ascii?Q?LQhMTbzMeazQSlEIOvDj9Uj9K5bbyUuJ00LOvkg4DMtlIhHIRuFFROWYIkvK?= =?us-ascii?Q?vy8UMm7rjp10il7WSgUt27eeHlDgVE3mpQRwbdLhjN4E2YSDdDSlPCYwLn60?= =?us-ascii?Q?eVNyZDOlS+dqzt8QWzcnibaw3nLfzmPCL1B7quXqBO7UmnDIPOpLiEwBGSYE?= =?us-ascii?Q?ZosGVXADyAP4wEiEqNV3FqmMnOAtjj2SBiumm7bPl44bVXa0hqgtj31q7iz0?= =?us-ascii?Q?mb0PiKZrHt/vEFVw8l7701ad1wbexElfendLbqDgAzzjduA1URXy+CBJMsB7?= =?us-ascii?Q?3+kYxt7gJXLAz1dBYMhEnR1SCnEtdk8vW8Ixk7LOnFk9NkUd9hwZYDGV/BqH?= =?us-ascii?Q?uoPQ4cZ6ojFr9xfqBtNN8Og9i3a6crA7UKPMD2SUAso2g5/6YhWv4W5qjDhb?= =?us-ascii?Q?98X8rNE/H/stNahtrdBWqh9aleSsNtvWBH2emlK5IMf972eE59KiK6FlYIeG?= =?us-ascii?Q?JYGjHK/r+nvJOJi4QWP7BTQbb70fJXO9ktKGCY46kLbZOsX4imJKh62rrMg/?= =?us-ascii?Q?jXFfot3TTQ0/4Lz0HOiu2OllhorhiMz+6ykXUcWKvy1wY74p4WiBGKR5ChDF?= =?us-ascii?Q?e6/T2ZA8U91+Xq+H/U/OnVPFWrSKj7FFd8YkwRq+g/6qVvQQ6Lpm9Dd/BoNi?= =?us-ascii?Q?rrFWmGYQo8DzNk2r3Ktj7cCJr6Dsj1l0MTfz7WbVOMzyPo3nGFIusbJHkQ7s?= =?us-ascii?Q?X+bNf3wJor5y5EOoDrCsleeRZ6Q001Y1r+LacXN4HOgQEE/a9iy/Yd5gNNyS?= =?us-ascii?Q?OoxBfFT9l7mgvosd5pqL+BQxL32kL/jWWOdWDVpY+LkVS473O2lQ40wu2vTU?= =?us-ascii?Q?oOHEiO93vw7FZDmoVtrHWwekGHP6jC7BQErr17NPf3Cgq3HEoLguldmJx+ja?= =?us-ascii?Q?hVSiowthocO+wC8BMxDMzKUZdSLifTKt29ndcrqTxNaGFAgVaWYvV5OgpWFv?= =?us-ascii?Q?x4EDCmOKl5tZ5kLO4o/Bwn/GHP1uou/BXD/gfGwducTYYNji9JXwa2SoxCvk?= =?us-ascii?Q?wSzftQfKDJv/iz56H50PCQOaVJq1CzDKHj6Wo1cIdStrn9LIZiN5VNd3zUNV?= =?us-ascii?Q?kQlcjYUDhwF0UlS49UrSzoFSWQJsgYT66/iFkBmW?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB5994.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7100155c-d109-458f-4ec2-08db462e2cd4 X-MS-Exchange-CrossTenant-originalarrivaltime: 26 Apr 2023 08:13:53.6992 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nvWKDdphuct8Q9f1Nq7zydN8tJMJLbcYsCqIhOa7kORY5rvRlA0JnGbVSUhPmiuj81bOAB8BR92YpYoJ+NDFpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR11MB5359 X-OriginatorOrg: intel.com 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 > -----Original Message----- > From: Yan, Zhirun > Sent: Wednesday, June 22, 2022 11:01 AM > To: dev@dpdk.org; Zhang, Qi Z ; Yang, Qiming > > Cc: Wang, Xiao W > Subject: [PATCH v1 3/3] net/ice: fix flow management in FDIR >=20 If this is a fix, please add fixline > From: Xiao Wang >=20 > The supported protocol fields e.g. outer tuples should be included in the= key > definition of rte_hash table. Besides, a protocol field should be used on= ly > when the corresponding mask is set. >=20 > Signed-off-by: Xiao Wang > --- > drivers/net/ice/ice_ethdev.h | 8 ++ > drivers/net/ice/ice_fdir_filter.c | 128 ++++++++++++++++++++---------- > 2 files changed, 92 insertions(+), 44 deletions(-) >=20 > diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h = index > 791e8566ea..15db79d56f 100644 > --- a/drivers/net/ice/ice_ethdev.h > +++ b/drivers/net/ice/ice_ethdev.h > @@ -360,6 +360,14 @@ struct ice_fdir_fltr_pattern { > struct ice_fdir_v6 v6; > } ip, mask; >=20 > + union { > + struct ice_fdir_v4 v4; > + struct ice_fdir_v6 v6; > + } ip_outer, mask_outer; > + > + struct ice_fdir_udp_vxlan vxlan_data; > + struct ice_fdir_udp_vxlan vxlan_mask; > + > struct ice_fdir_udp_gtp gtpu_data; > struct ice_fdir_udp_gtp gtpu_mask; >=20 > diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir= _filter.c > index 4b0b6b5b23..3503e95979 100644 > --- a/drivers/net/ice/ice_fdir_filter.c > +++ b/drivers/net/ice/ice_fdir_filter.c > @@ -1245,11 +1245,19 @@ ice_fdir_extract_fltr_key(struct > ice_fdir_fltr_pattern *key, > key->flow_type =3D input->flow_type; > rte_memcpy(&key->ip, &input->ip, sizeof(key->ip)); > rte_memcpy(&key->mask, &input->mask, sizeof(key->mask)); > + > + rte_memcpy(&key->ip_outer, &input->ip_outer, sizeof(key- > >ip_outer)); > + rte_memcpy(&key->mask_outer, &input->mask_outer, > +sizeof(key->mask_outer)); > + > rte_memcpy(&key->ext_data, &input->ext_data, sizeof(key- > >ext_data)); > rte_memcpy(&key->ext_mask, &input->ext_mask, sizeof(key- > >ext_mask)); >=20 > rte_memcpy(&key->ext_data_outer, &input->ext_data_outer, > sizeof(key->ext_data_outer)); > rte_memcpy(&key->ext_mask_outer, &input->ext_mask_outer, > sizeof(key->ext_mask_outer)); > + > + rte_memcpy(&key->vxlan_data, &input->vxlan_data, sizeof(key- > >vxlan_data)); > + rte_memcpy(&key->vxlan_mask, &input->vxlan_mask, > +sizeof(key->vxlan_mask)); > + > rte_memcpy(&key->gtpu_data, &input->gtpu_data, sizeof(key- > >gtpu_data)); > rte_memcpy(&key->gtpu_mask, &input->gtpu_mask, sizeof(key- > >gtpu_mask)); >=20 > @@ -2052,23 +2060,31 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > if (ipv4_mask->hdr.dst_addr && > ipv4_mask->hdr.dst_addr !=3D UINT32_MAX) > return -rte_errno; > + /* Mask for IPv4 tos not supported */ > + if (ipv4_mask->hdr.type_of_service && > + ipv4_mask->hdr.type_of_service !=3D UINT8_MAX) > + return -rte_errno; >=20 > - if (ipv4_mask->hdr.dst_addr =3D=3D UINT32_MAX) > + 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) > + p_v4->dst_ip =3D ipv4_spec->hdr.dst_addr; > + } > + if (ipv4_mask->hdr.src_addr =3D=3D UINT32_MAX) { > *input_set |=3D ICE_INSET_IPV4_SRC; > - if (ipv4_mask->hdr.time_to_live =3D=3D UINT8_MAX) > + p_v4->src_ip =3D ipv4_spec->hdr.src_addr; > + } > + if (ipv4_mask->hdr.time_to_live =3D=3D UINT8_MAX) { > *input_set |=3D ICE_INSET_IPV4_TTL; > - if (ipv4_mask->hdr.next_proto_id =3D=3D UINT8_MAX) > + p_v4->ttl =3D ipv4_spec->hdr.time_to_live; > + } > + if (ipv4_mask->hdr.next_proto_id =3D=3D UINT8_MAX) { > *input_set |=3D ICE_INSET_IPV4_PROTO; > - if (ipv4_mask->hdr.type_of_service =3D=3D UINT8_MAX) > + p_v4->proto =3D ipv4_spec->hdr.next_proto_id; > + } > + if (ipv4_mask->hdr.type_of_service =3D=3D UINT8_MAX) { > *input_set |=3D ICE_INSET_IPV4_TOS; > - > - p_v4->dst_ip =3D ipv4_spec->hdr.dst_addr; > - p_v4->src_ip =3D ipv4_spec->hdr.src_addr; > - 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; > + p_v4->tos =3D ipv4_spec->hdr.type_of_service; > + } >=20 > /* fragment Ipv4: > * spec is 0x2000, mask is 0x2000 > @@ -2114,27 +2130,35 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > } >=20 > if (!memcmp(ipv6_mask->hdr.src_addr, > ipv6_addr_mask, > - RTE_DIM(ipv6_mask->hdr.src_addr))) > + RTE_DIM(ipv6_mask->hdr.src_addr))) { > *input_set |=3D ICE_INSET_IPV6_SRC; > + rte_memcpy(&p_v6->src_ip, > + ipv6_spec->hdr.src_addr, 16); > + } > if (!memcmp(ipv6_mask->hdr.dst_addr, > ipv6_addr_mask, > - RTE_DIM(ipv6_mask->hdr.dst_addr))) > + RTE_DIM(ipv6_mask->hdr.dst_addr))) { > *input_set |=3D ICE_INSET_IPV6_DST; > + rte_memcpy(&p_v6->dst_ip, > + ipv6_spec->hdr.dst_addr, 16); > + } >=20 > if ((ipv6_mask->hdr.vtc_flow & > rte_cpu_to_be_32(ICE_IPV6_TC_MASK)) > - =3D=3D rte_cpu_to_be_32(ICE_IPV6_TC_MASK)) > + =3D=3D rte_cpu_to_be_32(ICE_IPV6_TC_MASK)) { > *input_set |=3D ICE_INSET_IPV6_TC; > - if (ipv6_mask->hdr.proto =3D=3D UINT8_MAX) > + vtc_flow_cpu =3D > rte_be_to_cpu_32(ipv6_spec->hdr.vtc_flow); > + p_v6->tc =3D (uint8_t)(vtc_flow_cpu >> > + ICE_FDIR_IPV6_TC_OFFSET); > + } > + if (ipv6_mask->hdr.proto =3D=3D UINT8_MAX) { > *input_set |=3D ICE_INSET_IPV6_NEXT_HDR; > - if (ipv6_mask->hdr.hop_limits =3D=3D UINT8_MAX) > + p_v6->proto =3D ipv6_spec->hdr.proto; > + } > + if (ipv6_mask->hdr.hop_limits =3D=3D UINT8_MAX) { > *input_set |=3D ICE_INSET_IPV6_HOP_LIMIT; > + p_v6->hlim =3D ipv6_spec->hdr.hop_limits; > + } >=20 > - rte_memcpy(&p_v6->dst_ip, ipv6_spec- > >hdr.dst_addr, 16); > - rte_memcpy(&p_v6->src_ip, ipv6_spec- > >hdr.src_addr, 16); > - vtc_flow_cpu =3D rte_be_to_cpu_32(ipv6_spec- > >hdr.vtc_flow); > - p_v6->tc =3D (uint8_t)(vtc_flow_cpu >> > ICE_FDIR_IPV6_TC_OFFSET); > - 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; @@ - > 2210,12 +2234,16 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > /* Get filter info */ > if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV4) { > assert(p_v4); > - p_v4->dst_port =3D tcp_spec->hdr.dst_port; > - p_v4->src_port =3D tcp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_TCP_SRC_PORT) > + p_v4->src_port =3D tcp_spec- > >hdr.src_port; > + if (*input_set & ICE_INSET_TCP_DST_PORT) > + p_v4->dst_port =3D tcp_spec- > >hdr.dst_port; > } else if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV6) { > assert(p_v6); > - p_v6->dst_port =3D tcp_spec->hdr.dst_port; > - p_v6->src_port =3D tcp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_TCP_SRC_PORT) > + p_v6->src_port =3D tcp_spec- > >hdr.src_port; > + if (*input_set & ICE_INSET_TCP_DST_PORT) > + p_v6->dst_port =3D tcp_spec- > >hdr.dst_port; > } > break; > case RTE_FLOW_ITEM_TYPE_UDP: > @@ -2257,12 +2285,16 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > /* Get filter info */ > if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV4) { > assert(p_v4); > - p_v4->dst_port =3D udp_spec->hdr.dst_port; > - p_v4->src_port =3D udp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_UDP_SRC_PORT) > + p_v4->src_port =3D udp_spec- > >hdr.src_port; > + if (*input_set & ICE_INSET_UDP_DST_PORT) > + p_v4->dst_port =3D udp_spec- > >hdr.dst_port; > } else if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV6) { > assert(p_v6); > - p_v6->src_port =3D udp_spec->hdr.src_port; > - p_v6->dst_port =3D udp_spec->hdr.dst_port; > + if (*input_set & ICE_INSET_UDP_SRC_PORT) > + p_v6->src_port =3D udp_spec- > >hdr.src_port; > + if (*input_set & ICE_INSET_UDP_DST_PORT) > + p_v6->dst_port =3D udp_spec- > >hdr.dst_port; > } > break; > case RTE_FLOW_ITEM_TYPE_SCTP: > @@ -2302,12 +2334,20 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > /* Get filter info */ > if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV4) { > assert(p_v4); > - p_v4->dst_port =3D sctp_spec->hdr.dst_port; > - p_v4->src_port =3D sctp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_SCTP_SRC_PORT) > + p_v4->src_port =3D > + sctp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_SCTP_DST_PORT) > + p_v4->dst_port =3D > + sctp_spec->hdr.dst_port; > } else if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV6) { > assert(p_v6); > - p_v6->dst_port =3D sctp_spec->hdr.dst_port; > - p_v6->src_port =3D sctp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_SCTP_SRC_PORT) > + p_v6->src_port =3D > + sctp_spec->hdr.src_port; > + if (*input_set & ICE_INSET_SCTP_DST_PORT) > + p_v6->dst_port =3D > + sctp_spec->hdr.dst_port; > } > break; > case RTE_FLOW_ITEM_TYPE_VOID: > @@ -2329,10 +2369,10 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > return -rte_errno; > } >=20 > - if (vxlan_mask->hdr.vx_vni) > + if (vxlan_mask->hdr.vx_vni) { > *input_set |=3D ICE_INSET_VXLAN_VNI; > - > - filter->input.vxlan_data.vni =3D vxlan_spec->hdr.vx_vni; > + filter->input.vxlan_data.vni =3D vxlan_spec- > >hdr.vx_vni; > + } >=20 > break; > case RTE_FLOW_ITEM_TYPE_GTPU: > @@ -2354,10 +2394,10 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > return -rte_errno; > } >=20 > - if (gtp_mask->teid =3D=3D UINT32_MAX) > + if (gtp_mask->teid =3D=3D UINT32_MAX) { > input_set_o |=3D ICE_INSET_GTPU_TEID; > - > - filter->input.gtpu_data.teid =3D gtp_spec->teid; > + filter->input.gtpu_data.teid =3D gtp_spec->teid; > + } > break; > case RTE_FLOW_ITEM_TYPE_GTP_PSC: > tunnel_type =3D ICE_FDIR_TUNNEL_TYPE_GTPU_EH; > @@ -2367,11 +2407,11 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > if (!(gtp_psc_spec && gtp_psc_mask)) > break; >=20 > - if (gtp_psc_mask->hdr.qfi =3D=3D 0x3F) > + if (gtp_psc_mask->hdr.qfi =3D=3D 0x3F) { > input_set_o |=3D ICE_INSET_GTPU_QFI; > - > - filter->input.gtpu_data.qfi =3D > - gtp_psc_spec->hdr.qfi; > + filter->input.gtpu_data.qfi =3D > + gtp_psc_spec->hdr.qfi; > + } > break; > case RTE_FLOW_ITEM_TYPE_ESP: > if (l3 =3D=3D RTE_FLOW_ITEM_TYPE_IPV4 && > -- > 2.25.1