From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9883FA0518; Thu, 30 Jul 2020 12:11:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 86AC937B7; Thu, 30 Jul 2020 12:11:55 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 51E6037B7 for ; Thu, 30 Jul 2020 12:11:53 +0200 (CEST) IronPort-SDR: lgcAmKlu+vkdkBeSHlvHNARiAej162rpxNzm86+2lVtSpjabBijYv4lQJsbQPs241QGdbpe/iT wyiEPSA1zV3g== X-IronPort-AV: E=McAfee;i="6000,8403,9697"; a="139110235" X-IronPort-AV: E=Sophos;i="5.75,414,1589266800"; d="scan'208";a="139110235" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jul 2020 03:11:51 -0700 IronPort-SDR: 0C7aw+5YZL0PCoVOfw81LI73qgXzzLXNNt7a30D1SFOvE9kMVBe1I3HQ9I2utBZ2doEp5O0PUj n1hfC1O+XaVA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,414,1589266800"; d="scan'208";a="365127610" Received: from orsmsx101.amr.corp.intel.com ([10.22.225.128]) by orsmga001.jf.intel.com with ESMTP; 30 Jul 2020 03:11:51 -0700 Received: from ORSEDG001.ED.cps.intel.com (10.7.248.4) by ORSMSX101.amr.corp.intel.com (10.22.225.128) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Jul 2020 03:11:51 -0700 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (104.47.58.109) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 30 Jul 2020 03:11:51 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eLqdSqCpAMC5NhbG+88hRmSYtXJUy/qCp1orUWu6lxUZ3wT+rlAn/X4uRxqeByaYgDm2LwvruJ/DlQUF6T0yiknM88pKgmy8y3Ajfq5nuT9z7RFHTeOSsgDLCDKC8JeWtQHE9+KRmBamU1GS2N1fI3PX6Aa/32S4ldqXiJFLLBr9VX+vupBzzfZnrd4v4qqyQkaKS75lmBsDtJTgSneemgU9R9ZUaDVNwjgrvFf9iRoh6Arja02Fab49zC+HsZ8tyPqBv/x+24QF2G+HU6bO0LF7q4bsFj3XuL/7H145Vn+ahsFEpNoiZi/fCCC3ASzXFPvdSCV81/NRpAg7bCXcww== 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-SenderADCheck; bh=SA+n7r+fZNaPXTlCRQVEcORYJI22vCZUe4uu6UioAEU=; b=T/fDKMKV5VfCZrdLAdRssiiUHHSQ104JyUDGB9fy8epTJ5zsQ+5dTPv5aNTkNR8ZxYgI+hJJmvlS2Mr6EH68izmQj+3bzkAyRokklKW+B5lbEeDzPPxdXR22aUSdNcLJ+qgG0SJV3H6NE96nTgyGUQy/x3IgDb1vkzAL0efwjbeSJyeyQq2wd9AyAIxJjYPuIQlBBGebUZeYrR5uFI2qf6LfF8NUK121Rqvif+Q3nGv4zQ30+Z846DN2/o82ZAlK5FuYq4EyXlJ3kG/DNCL1ggormCGnw1IjT7zvCPINnb02HXjuEsnovhzqJRqr2TOWTTGYtVL/yRp2kEt1V3aFvA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=SA+n7r+fZNaPXTlCRQVEcORYJI22vCZUe4uu6UioAEU=; b=c6//kZSbzMYkjlXiJSIDEaXiqvY5bgCi2W3HEMpjUcKx5Y3dwYckoYKVRtGdZsZWFV79WyHvG04FV+Oo1OrUF6/bkgAgrApqMZu91FZR4DuZfiquAdIUq927YSePC4ZwunAC8faiEbnioKFKdakyyxr249/kfcVakhUW4CqUe/M= Received: from MWHPR11MB1391.namprd11.prod.outlook.com (2603:10b6:300:23::15) by MWHPR11MB0063.namprd11.prod.outlook.com (2603:10b6:301:6c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3216.26; Thu, 30 Jul 2020 10:11:49 +0000 Received: from MWHPR11MB1391.namprd11.prod.outlook.com ([fe80::f8f5:b48c:be92:ac17]) by MWHPR11MB1391.namprd11.prod.outlook.com ([fe80::f8f5:b48c:be92:ac17%3]) with mapi id 15.20.3239.019; Thu, 30 Jul 2020 10:11:49 +0000 From: "Zhao1, Wei" To: "dev@dpdk.org" CC: "Zhang, Qi Z" , "Huang, ZhiminX" Thread-Topic: [PATCH v2] net/ice: fix FDIR GTPU rule create fail Thread-Index: AQHWZldt46N7vQgZrkGoIe4GF5snQKkf5sNw Date: Thu, 30 Jul 2020 10:11:49 +0000 Message-ID: References: <20200730083034.21616-1-wei.zhao1@intel.com> <20200730092801.31771-1-wei.zhao1@intel.com> In-Reply-To: <20200730092801.31771-1-wei.zhao1@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTM3YTBiNzctOTNlNC00MzY1LWJjYWItMGMwOWM0MmMyYTYyIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiUjI3UUpxdSt4NXRQV1BiNTBpN0dobjFlZkMxXC9GNTNBSUNxcGFNR3FwRU1MbmF4XC9RMGxPVlA2T2tSSEV4cExXIn0= dlp-version: 11.0.600.7 dlp-product: dlpe-windows x-ctpclassification: CTP_NT dlp-reaction: no-action authentication-results: dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.209] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 24e6956c-7bf0-4ef0-1207-08d83470f94a x-ms-traffictypediagnostic: MWHPR11MB0063: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3276; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: NuLhvYT4JlVigyNHqw1dv37CS/sZmeTUb8ZAGAZkgUEyyTOapatXWr9h5q8xLSGwLjmMBbpK0tIZrQEGix4huDkkXQUJLKa+cDEjgK9D52wayhekD2IpETxfcXTbubr27iAKwrS48y9o2PqRWaY3bJOXXU7lW+Em+IDg9BVtpvO2V78Zw5KH9ZXk+WDmxpCJZ0hd0tfc24BrwkTf3eWRhVe1ntVwM1wB3rGF3SfjYvxxuy17RsKLlkrgntKqAfHuW6ZR3N8Uoxz/G+jOaNKV0YDXs+kxgzgCeQTc+vY2EwHMXkZtC0+T9UgC+WkdfpjL x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MWHPR11MB1391.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(136003)(346002)(396003)(366004)(376002)(8676002)(54906003)(71200400001)(316002)(33656002)(83380400001)(7696005)(4326008)(186003)(64756008)(26005)(53546011)(8936002)(6506007)(6916009)(2906002)(9686003)(66476007)(86362001)(5660300002)(107886003)(55016002)(66446008)(52536014)(478600001)(76116006)(66946007)(66556008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: Pkp6j3mSMAvBO9gX2oD2+fBQQNZQTmqF5n7nMhcMVIWKIZosp2Xi/fu+tcJ8v3qptFJUQd9xG/OA/M12LWn0lrDxiVjnhp5spTXQdL9OrYX/d/1yjITsWVdyt1wMJrbyGSjCGhpe31qZXoj6mVvFnEdSMJBljF90oaQEfbglNj1jIXRkXaFIj7kAXeXcc46SUm759l8rQzcqyvqL9/7eSTzSlGAl0iPj+VmJxUvlLXvGhWaP6cUcjEBPeI96AzKEl3809f9N63IlZEXpkGKlMEVd1qwZVZ+yqJQFD1C8N1vHHeocgr4B5KsWt6aAYWNn2UFjOH7NHm/CoX3VOHv2OWvazmzxrry1Cq9ZbYe1GVM84UvJTxi7yRPc4JgMOhFi4NMLKuBNclDxz7qYeRzO5/3FhLcbLMvJlkiVVl5V9EBbdMG4z6iCJkbdcIl70zJcpPVPgp2oA5vDPAp4jSVEi/wFkPI4nyXtuLEC3OVwPoXjVOELjpqMCKw59n9wQONk 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: MWHPR11MB1391.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24e6956c-7bf0-4ef0-1207-08d83470f94a X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Jul 2020 10:11:49.5268 (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: TrzedvujtRP8T0cw0t9OhrJwdHnPw/nOxu4qOD5OxANje8YZzB4kWUvYWAYhGTPiBlbgWnraYIN6y5jITb9T6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR11MB0063 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH v2] net/ice: fix FDIR GTPU rule create fail X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" Add Cc zhiminx.huang > -----Original Message----- > From: Zhao1, Wei > Sent: Thursday, July 30, 2020 5:28 PM > To: dev@dpdk.org > Cc: Zhang, Qi Z ; Zhao1, Wei > Subject: [PATCH v2] net/ice: fix FDIR GTPU rule create fail >=20 > For GTPU rule without extend header the trainning packet for FDIR is diff= erent. > This patch enable these case. >=20 > Fixes: 934fd00c9389 ("net/ice/base: fix GTPU IP hash") >=20 > Signed-off-by: Wei Zhao > --- > drivers/net/ice/base/ice_fdir.c | 63 +++++++++++++++++++++++- > drivers/net/ice/base/ice_type.h | 2 + > drivers/net/ice/ice_fdir_filter.c | 80 +++++++++++++------------------ > 3 files changed, 97 insertions(+), 48 deletions(-) >=20 > diff --git a/drivers/net/ice/base/ice_fdir.c b/drivers/net/ice/base/ice_f= dir.c > index 2c47fb57b..a904ff513 100644 > --- a/drivers/net/ice/base/ice_fdir.c > +++ b/drivers/net/ice/base/ice_fdir.c > @@ -89,6 +89,37 @@ static const u8 ice_fdir_icmp4_gtpu4_pkt[] =3D { }; >=20 > static const u8 ice_fdir_ipv4_gtpu4_pkt[] =3D { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00, > + 0x00, 0x44, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x08, 0x68, 0x08, 0x68, 0x00, 0x00, > + 0x00, 0x00, 0x33, 0xff, 0x00, 0x20, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x85, 0x45, 0x00, > + 0x00, 0x14, 0x00, 0x00, 0x40, 0x00, 0x40, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, > +}; > + > +static const u8 ice_fdir_ipv6_gtpu6_pkt[] =3D { > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00, > + 0x00, 0x00, 0x00, 0x44, 0x11, 0x40, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x08, 0x68, > + 0x08, 0x68, 0x00, 0x44, 0x7f, 0xed, 0x33, 0xff, > + 0x00, 0x34, 0x12, 0x34, 0x56, 0x78, 0x00, 0x00, > + 0x00, 0x85, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x3b, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > + 0x00, 0x00, > +}; > + > +static const u8 ice_fdir_ipv4_gtpu4_eh_pkt[] =3D { > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x45, 0x00, > 0x00, 0x44, 0x00, 0x00, 0x40, 0x00, 0x40, 0x11, @@ -102,7 +133,7 @@ > static const u8 ice_fdir_ipv4_gtpu4_pkt[] =3D { > 0x00, 0x00, > }; >=20 > -static const u8 ice_fdir_ipv6_gtpu6_pkt[] =3D { > +static const u8 ice_fdir_ipv6_gtpu6_eh_pkt[] =3D { > 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, > 0x00, 0x00, 0x00, 0x00, 0x86, 0xdd, 0x60, 0x00, > 0x00, 0x00, 0x00, 0x44, 0x11, 0x40, 0x00, 0x00, @@ -492,6 +523,20 @@ > static const struct ice_fdir_base_pkt ice_fdir_pkt[] =3D { > sizeof(ice_fdir_ipv6_gtpu6_pkt), > ice_fdir_ipv6_gtpu6_pkt, > }, > + { > + ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER, > + sizeof(ice_fdir_ipv4_gtpu4_eh_pkt), > + ice_fdir_ipv4_gtpu4_eh_pkt, > + sizeof(ice_fdir_ipv4_gtpu4_eh_pkt), > + ice_fdir_ipv4_gtpu4_eh_pkt, > + }, > + { > + ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER, > + sizeof(ice_fdir_ipv6_gtpu6_eh_pkt), > + ice_fdir_ipv6_gtpu6_eh_pkt, > + sizeof(ice_fdir_ipv6_gtpu6_eh_pkt), > + ice_fdir_ipv6_gtpu6_eh_pkt, > + }, > { > ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3, > sizeof(ice_fdir_ipv4_l2tpv3_pkt), ice_fdir_ipv4_l2tpv3_pkt, @@ > -1053,6 +1098,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct > ice_fdir_fltr *input, > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP: > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP: > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER: > + ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET, > + input->ip.v4.src_ip); > + ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET, > + input->ip.v4.dst_ip); > + ice_pkt_insert_u32(loc, ICE_IPV4_GTPU_TEID_OFFSET, > + input->gtpu_data.teid); > + break; > + case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER: > ice_pkt_insert_u32(loc, ICE_IPV4_DST_ADDR_OFFSET, > input->ip.v4.src_ip); > ice_pkt_insert_u32(loc, ICE_IPV4_SRC_ADDR_OFFSET, @@ -1063,6 > +1116,14 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct > ice_fdir_fltr *input, > input->gtpu_data.qfi); > break; > case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER: > + ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET, > + input->ip.v6.src_ip); > + ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET, > + input->ip.v6.dst_ip); > + ice_pkt_insert_u32(loc, ICE_IPV6_GTPU_TEID_OFFSET, > + input->gtpu_data.teid); > + break; > + case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER: > ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_DST_ADDR_OFFSET, > input->ip.v6.src_ip); > ice_pkt_insert_ipv6_addr(loc, ICE_IPV6_SRC_ADDR_OFFSET, diff --git > a/drivers/net/ice/base/ice_type.h b/drivers/net/ice/base/ice_type.h index > c13cd7b00..3775689a9 100644 > --- a/drivers/net/ice/base/ice_type.h > +++ b/drivers/net/ice/base/ice_type.h > @@ -297,6 +297,8 @@ enum ice_fltr_ptype { > ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP, > ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER, > ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER, > + ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER, > + ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER, > ICE_FLTR_PTYPE_NONF_IPV4_L2TPV3, > ICE_FLTR_PTYPE_NONF_IPV6_L2TPV3, > ICE_FLTR_PTYPE_NONF_IPV4_ESP, > diff --git a/drivers/net/ice/ice_fdir_filter.c b/drivers/net/ice/ice_fdir= _filter.c > index 745d7291a..c59fe46b9 100644 > --- a/drivers/net/ice/ice_fdir_filter.c > +++ b/drivers/net/ice/ice_fdir_filter.c > @@ -778,30 +778,15 @@ ice_fdir_cross_prof_conflict(struct ice_pf *pf, > goto err; > break; > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER: > - cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER; > + cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP; > if (!ice_fdir_prof_resolve_conflict > (pf, cflct_ptype, is_tunnel)) > goto err; > - cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER; > + cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP; > if (!ice_fdir_prof_resolve_conflict > (pf, cflct_ptype, is_tunnel)) > goto err; > - cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER; > - if (!ice_fdir_prof_resolve_conflict > - (pf, cflct_ptype, is_tunnel)) > - goto err; > - break; > - /* IPv6 GTPU */ > - case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER: > - cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER; > - if (!ice_fdir_prof_resolve_conflict > - (pf, cflct_ptype, is_tunnel)) > - goto err; > - cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER; > - if (!ice_fdir_prof_resolve_conflict > - (pf, cflct_ptype, is_tunnel)) > - goto err; > - cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER; > + cflct_ptype =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP; > if (!ice_fdir_prof_resolve_conflict > (pf, cflct_ptype, is_tunnel)) > goto err; > @@ -1025,30 +1010,26 @@ ice_fdir_input_set_conf(struct ice_pf *pf, enum > ice_fltr_ptype flow, > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP: > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP: > case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER: > - if (ttype =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU) > - ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP | > - ICE_FLOW_SEG_HDR_IPV4 | > - ICE_FLOW_SEG_HDR_IPV_OTHER); > - else if (ttype =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU_EH) > - ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH | > - ICE_FLOW_SEG_HDR_GTPU_IP | > - ICE_FLOW_SEG_HDR_IPV4 | > - ICE_FLOW_SEG_HDR_IPV_OTHER); > - else > - PMD_DRV_LOG(ERR, "not supported tunnel type."); > + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP | > + ICE_FLOW_SEG_HDR_IPV4 | > + ICE_FLOW_SEG_HDR_IPV_OTHER); > + break; > + case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER: > + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH | > + ICE_FLOW_SEG_HDR_GTPU_IP | > + ICE_FLOW_SEG_HDR_IPV4 | > + ICE_FLOW_SEG_HDR_IPV_OTHER); > break; > case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER: > - if (ttype =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU) > - ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP | > - ICE_FLOW_SEG_HDR_IPV6 | > - ICE_FLOW_SEG_HDR_IPV_OTHER); > - else if (ttype =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU_EH) > - ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH | > - ICE_FLOW_SEG_HDR_GTPU_IP | > - ICE_FLOW_SEG_HDR_IPV6 | > - ICE_FLOW_SEG_HDR_IPV_OTHER); > - else > - PMD_DRV_LOG(ERR, "not supported tunnel type."); > + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_IP | > + ICE_FLOW_SEG_HDR_IPV6 | > + ICE_FLOW_SEG_HDR_IPV_OTHER); > + break; > + case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER: > + ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_GTPU_EH | > + ICE_FLOW_SEG_HDR_GTPU_IP | > + ICE_FLOW_SEG_HDR_IPV6 | > + ICE_FLOW_SEG_HDR_IPV_OTHER); > break; > case ICE_FLTR_PTYPE_NON_IP_L2: > ICE_FLOW_SET_HDRS(seg, ICE_FLOW_SEG_HDR_ETH_NON_IP); > @@ -2007,13 +1988,18 @@ ice_fdir_parse_pattern(__rte_unused struct > ice_adapter *ad, > } > } >=20 > - if (tunnel_type =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU || > - tunnel_type =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU_EH) { > - if (flow_type =3D=3D ICE_FLTR_PTYPE_NONF_IPV4_UDP) > - flow_type =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER; > - else > - flow_type =3D ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER; > - } > + if (tunnel_type =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU && > + flow_type =3D=3D ICE_FLTR_PTYPE_NONF_IPV4_UDP) > + flow_type =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER; > + else if (tunnel_type =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU_EH && > + flow_type =3D=3D ICE_FLTR_PTYPE_NONF_IPV4_UDP) > + flow_type =3D ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_OTHER; > + else if (tunnel_type =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU && > + flow_type =3D=3D ICE_FLTR_PTYPE_NONF_IPV6_UDP) > + flow_type =3D ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER; > + else if (tunnel_type =3D=3D ICE_FDIR_TUNNEL_TYPE_GTPU_EH && > + flow_type =3D=3D ICE_FLTR_PTYPE_NONF_IPV4_UDP) > + flow_type =3D ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER; >=20 > filter->tunnel_type =3D tunnel_type; > filter->input.flow_type =3D flow_type; > -- > 2.19.1