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 6F920A0519 for ; Tue, 23 Jun 2020 03:12:01 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4E8FA1D5E9; Tue, 23 Jun 2020 03:12:01 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 70D561D528; Tue, 23 Jun 2020 03:11:57 +0200 (CEST) IronPort-SDR: r1keTpiBgg+8cFiEDXIQ3Ila2Q/gbuPeNNSq9e0m5Q/IIJwawGvxlojy2IXOrK/zXxsIflP0OU v6MV77WrHfAg== X-IronPort-AV: E=McAfee;i="6000,8403,9660"; a="209109989" X-IronPort-AV: E=Sophos;i="5.75,268,1589266800"; d="scan'208";a="209109989" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2020 18:11:55 -0700 IronPort-SDR: XJxdTCU2fEmxwpFe3TLWe7FKCCPvqSWi3GJ3lE12RCrG/cTa5QAxFIJYdj29GnO4FW/ex4YWn/ pxQ4u6so6H+g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,268,1589266800"; d="scan'208";a="311114204" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga002.fm.intel.com with ESMTP; 22 Jun 2020 18:11:55 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 18:11:54 -0700 Received: from FMSEDG002.ED.cps.intel.com (10.1.192.134) by FMSMSX113.amr.corp.intel.com (10.18.116.7) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 18:11:54 -0700 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.175) by edgegateway.intel.com (192.55.55.69) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jun 2020 18:11:54 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ezdt6UHQbMLlqM7ODwmsIUjGQuwOBO+7SWvp9MjRYp38wusGK9OtJRLnDXSOyxOqQYySTnbPHaTQrlvmKuxX0q6ydEejJwxQV+tv/9pCgzt2LaHPFVs/zBxqW0Ob5V/julejJsbigJL8AqsLR6XurXS5UKZAll0xh2GwzhAcLjrfdJVh3qm7mCvlpdd112oYAAfd8Jpv7x25Y/lAVkBpOBVzay8W2JX6t+56A8rgJ0s/lB5/N8jsBm4+afoKx6iHE8sZ8Xogrzw6Pj5Vp92f8BKUCyi6b8vbCNVY6fxLpdALRPn7RWJ5uzQ+Qs0PXbhkDkUtF/qMgl9pia3k8d0Sbw== 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=dumABqWTTYjrYNLnd8aeoH2jIDAJfGtGSTQ639BoGRI=; b=CaF+knKYVVvMwTYZXvorQYm4BMcMLuy9R6c0J6bI7Q/khSr6yW+FLXoQAJd5zCE9ngRN/qsKGvIZx6qBGVpEr8MMGKPltYWr0EF5+PGy4dlpjseQQzJGRcPjbVuq7aovLPu7kw7kDO9F/AozH9FVzeKdEIN4L3ubWRZliJiDhRa28+PU5UNTSjNjCxmm0Gmv1euFhuTw41TXqWisnzX7T6h8WfHkIgu9TOtOuIAsuPNQAdpjxQ3QYI0LTbdf4TFgggTPWUn67bvP3Ib+JJ1FJc75flAsUqZMvKd2+aBzvMlQJczKKUtAr4LsaNSonLDiZfX63sVU9cXqGIHkuQwJwg== 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=dumABqWTTYjrYNLnd8aeoH2jIDAJfGtGSTQ639BoGRI=; b=c1/okWf0qwJ4IMRe4mRk6cgBPm+yEvUDYvoygk5x3mg9d3UPKfUFtU9CdLB5hwa7yfw+8eOgsjhZUblOmNWF7Y1ffXh7mp8da+kCcKA6sSBp06fzg2QKRNrLyf2uXs49GRL4QUfF5dtigMqAK/kvScTLtyVpsdR6Tp49h/7lCzc= Received: from MWHPR11MB1391.namprd11.prod.outlook.com (2603:10b6:300:23::15) by MW3PR11MB4522.namprd11.prod.outlook.com (2603:10b6:303:2d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3109.22; Tue, 23 Jun 2020 01:11:52 +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.3109.027; Tue, 23 Jun 2020 01:11:52 +0000 From: "Zhao1, Wei" To: "Zhang, Qi Z" , "dev@dpdk.org" CC: "stable@dpdk.org" Thread-Topic: [PATCH v2 3/4] net/ice: add check for NVGRE protocol Thread-Index: AQHWRHIMg/pNW+AO1kyk9mWabdYR26jk0KqAgACcpjA= Date: Tue, 23 Jun 2020 01:11:52 +0000 Message-ID: References: <20200605074031.16231-1-wei.zhao1@intel.com> <20200617061429.6447-1-wei.zhao1@intel.com> <20200617061429.6447-4-wei.zhao1@intel.com> <039ED4275CED7440929022BC67E7061154843048@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <039ED4275CED7440929022BC67E7061154843048@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDlkOGRhMzAtMGI2Zi00ZTJjLWEwNTAtZjZhMzI5MzlhNGUwIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiZkdMVGUzb3lRWXZ2WnBiNXdXUFlBQklGYVl1aE5VZEJGTmxrU3lXRlZtZlRQWVVETkFUZDhjeWpzekU1U2pmTSJ9 dlp-version: 11.0.600.7 dlp-product: dlpe-windows x-ctpclassification: CTP_NT dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.222] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0959b7ba-cfcd-430e-82e1-08d8171269ef x-ms-traffictypediagnostic: MW3PR11MB4522: 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:312; x-forefront-prvs: 04433051BF x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: y3p8ZLjW7MxsDZCf2GzMbSGpdo4w1h7n21fVSie6l/sPu5ze6AqycGu/xBAdFLK5OmmAuiUfrjFMPeqpnx+/PFIW7SqnzDOA2jxoCot3XH+ZnJ+FzjqIrvAofU8uLGy8nfKsHDoSJPHIa9eHakUTzLOWSz0algXU6BxRSUQFPO26l4q3PvRS0+pEzpJLICdF8nlLqbp+TKw8biapPtFuePWnI6j+ljQZiWAHtsiNfqrjVo9fWJH6U3HxqLnw+GXm9Ld69RQcv79obdBwCp3ff01Z90+v52CYlMR7aYLj7DbX2FgnQzdMw0iEWsbj6mfe 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)(376002)(346002)(366004)(396003)(71200400001)(66556008)(66476007)(64756008)(66946007)(66446008)(5660300002)(83380400001)(52536014)(76116006)(86362001)(2906002)(186003)(7696005)(450100002)(26005)(4326008)(9686003)(110136005)(33656002)(6506007)(53546011)(8676002)(316002)(478600001)(55016002)(8936002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: XmlMn3ITszqFa74MUHMwZHOW6/d7woIPHEz//0TjmZJTtlinnHkB2uicn78U1GcCBNyyTBZrYn8FRbXpxQA/SYTcaXo4XGmjMTSa36+rp9VcGUB3FJh8tmerhYtdnv7IrRCY4nSeqhcPRtp8kFUKudj7T+CaGScNgUKMCbeGpL3wPYOQp/X59a+IS+RCdPoCqxCJN9UgK1aK/J7iC1f1zsvZwAV6QgZzsMUcsABHrc+r3Q75e5/aV99wc8osqLLVUqd2rfvP+dtY/hoBBro8q/xh+nZC3zq6Hg+1p+qhIPcB38dPTBVFzIXsDBnUet2Fx7ysUhbgNQuTK0AwmT1F0AFESnJ7RccN3NVDi1omYhh466E9hkez39jAQD5A7DSIBx0350eE3vbUxFKL2QYxWO6dCxLXZCXgedYN8GQ836WWDtWMqj0/d3ygMggtwx4aZyiDoogxfEMNer7QTemFQEr2YDcVv2TgtCpO1apdCDB8TwqsJM+NPKd44l2Gxv8u Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 0959b7ba-cfcd-430e-82e1-08d8171269ef X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jun 2020 01:11:52.5650 (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: IsCMEH/c2XP4xO5tnJDJtSxCZQCA7gNMIK2Pngd0BMm9RXwGk7GgN2hRYLwHK1ksachDVOBtoydnmxTtTB27MQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4522 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH v2 3/4] net/ice: add check for NVGRE protocol X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" > -----Original Message----- > From: Zhang, Qi Z > Sent: Monday, June 22, 2020 11:50 PM > To: Zhao1, Wei ; dev@dpdk.org > Cc: stable@dpdk.org > Subject: RE: [PATCH v2 3/4] net/ice: add check for NVGRE protocol >=20 >=20 >=20 > > -----Original Message----- > > From: Zhao1, Wei > > Sent: Wednesday, June 17, 2020 2:14 PM > > To: dev@dpdk.org > > Cc: stable@dpdk.org; Zhang, Qi Z ; Zhao1, Wei > > > > Subject: [PATCH v2 3/4] net/ice: add check for NVGRE protocol >=20 > fix tunnel type for switch rule >=20 > > > > This patch add check for protocol type of IPv4 packet, it need to > > update tunnel type when NVGRE is in payload. >=20 > The patch change default tunnel type to ICE_NON_TUN and only change to > ICE_SW_TUN_AND_NON_TUN to hint switch engine if GRE proto is matched in > a IPv4 header. >=20 Ok, Update in v3=20 > > > > Fixes: 6bc7628c5e0b ("net/ice: change default tunnel type") > > Cc: stable@dpdk.org > > > > Signed-off-by: Wei Zhao > > --- > > drivers/net/ice/ice_switch_filter.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/ice/ice_switch_filter.c > > b/drivers/net/ice/ice_switch_filter.c > > index 3c0c36bce..3b38195d6 100644 > > --- a/drivers/net/ice/ice_switch_filter.c > > +++ b/drivers/net/ice/ice_switch_filter.c > > @@ -28,6 +28,7 @@ > > #define MAX_QGRP_NUM_TYPE 7 > > #define ICE_PPP_IPV4_PROTO 0x0021 > > #define ICE_PPP_IPV6_PROTO 0x0057 > > +#define ICE_IPV4_PROTO_NVGRE 0x2F > To keep consistent > #define ICE_IPV4_NVGRE_PROTO 0x002F >=20 Ok, Update in v3 > > > > #define ICE_SW_INSET_ETHER ( \ > > ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) @@ > -632,6 > > +633,10 @@ ice_switch_inset_get(const struct rte_flow_item pattern[], > > list[t].m_u.ipv4_hdr.protocol =3D > > ipv4_mask->hdr.next_proto_id; > > } > > + if ((ipv4_spec->hdr.next_proto_id & > > + ipv4_mask->hdr.next_proto_id) =3D=3D > > + ICE_IPV4_PROTO_NVGRE) > > + *tun_type =3D ICE_SW_TUN_AND_NON_TUN; > > if (ipv4_mask->hdr.type_of_service) { > > list[t].h_u.ipv4_hdr.tos =3D > > ipv4_spec->hdr.type_of_service; @@ -1526,7 > +1531,7 @@ > > ice_switch_parse_pattern_action(struct ice_adapter *ad, > > const struct rte_flow_item *item =3D pattern; > > uint16_t item_num =3D 0; > > enum ice_sw_tunnel_type tun_type =3D > > - ICE_SW_TUN_AND_NON_TUN; > > + ICE_NON_TUN; > > struct ice_pattern_match_item *pattern_match_item =3D NULL; > > > > for (; item->type !=3D RTE_FLOW_ITEM_TYPE_END; item++) { > > -- > > 2.19.1 >=20