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 D10D8A04DB for ; Thu, 15 Oct 2020 10:56:49 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C73AB1DD1B; Thu, 15 Oct 2020 10:56:48 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 29C501DD1B; Thu, 15 Oct 2020 10:56:45 +0200 (CEST) IronPort-SDR: Zm/tlxqUkItODPGKTx9F5UMxnpKdNyD9Pr4uTjuu3godGpjhzg5G9G66Km1wCxfN6aFEc83NT+ KSgssL4v72+w== X-IronPort-AV: E=McAfee;i="6000,8403,9774"; a="166359065" X-IronPort-AV: E=Sophos;i="5.77,378,1596524400"; d="scan'208";a="166359065" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Oct 2020 01:56:45 -0700 IronPort-SDR: 4zbf/EO7dylc1RpcgvIPOmmg/SAAcipXF05AXP9scvehCSBSM7WbmtLcsBqfkMYipnUW+sh3ZE se+rVK16788A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,378,1596524400"; d="scan'208";a="356921451" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by FMSMGA003.fm.intel.com with ESMTP; 15 Oct 2020 01:56:44 -0700 Received: from fmsmsx603.amr.corp.intel.com (10.18.126.83) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Thu, 15 Oct 2020 01:56:44 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) 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.1713.5 via Frontend Transport; Thu, 15 Oct 2020 01:56:43 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.168) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Thu, 15 Oct 2020 01:56:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IwimcZdTy9/Qdkies+Xg+vdWOSsxL03wB0r1drzvwMBQNCUHXoST2huo0hH69sc+lhbD8gzq+sdKxyK7yX87EncpeXKUT1nYpn8UIy8uaw/t4+vevgEG+WzKuBRntDcwYHF9EG3rSZ/xNI41DJJqkZaHaPy6cresxafgFhl/+KKMhUzFeUKQiWsYirpTda4tmlVCPGLLbNaq8QWwtfP7SJL2NgOXmAMCJKj9gR2P0g7OtacYc2GCcyZ4fGusByAiMoAsU72PSrkp/8fXTwGB87mk0nUINJf+zhEXAAHVDmLvYYh8s1DE+gA7spwKt3qBL5vvTtbhYCub++zYobfq2w== 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=XHCviZyKmhACVn1UZIhBq4YhGNPlWnu5+xITqgBL1z0=; b=ggcXYL9akX97Yb/YFXElONXNWgXCMlJ/inDJvm4BB9233xDgnMf7eOzUij9QG1IPUYpTcJmE4tswX8yOEhXlk1jlSzqN39BsyoiwAt0PM9sE2CMq7qsxBCUkBmRubU2hXPTaNTsnAYpNsx/mMuNejhT9koajPcovhQuTjBhUl8jIkNKkCoH/fZAqzMU4NEavR8n/iQP696FQKm12hWPbs6PRtZnSdqEEAMz5bFRfzdLTsQdFRaHFFU8xaUv7m2Aam++lB1paVUrpTJrG+Tt2EqrAs09gm0lyDk258HKTLlKXBgGiuejCX5wVTP5st24uE/d24qciBUEDpskSRGYczQ== 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=XHCviZyKmhACVn1UZIhBq4YhGNPlWnu5+xITqgBL1z0=; b=DYpU5/FJ/bZmcUxZlKnOLlqTBRuK+/RxmCjNrpb+6/L7hNE1kjV+iUBZ+nfhwj/i6QRskmY3fJit4qwHBX3WVaahjG1UJ4faTS5tHc77dAg/6m6u3g0KFw7gwCEI7C/2g+ZngD0/QmH0ntUZ265XHUOPZZOOBEB4WOP8Bpifjzs= Received: from DM6PR11MB2537.namprd11.prod.outlook.com (2603:10b6:5:cd::16) by DM6PR11MB3196.namprd11.prod.outlook.com (2603:10b6:5:5b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3455.27; Thu, 15 Oct 2020 08:56:41 +0000 Received: from DM6PR11MB2537.namprd11.prod.outlook.com ([fe80::bcd1:7fe:8536:f15]) by DM6PR11MB2537.namprd11.prod.outlook.com ([fe80::bcd1:7fe:8536:f15%5]) with mapi id 15.20.3477.021; Thu, 15 Oct 2020 08:56:41 +0000 From: "Iremonger, Bernard" To: "Connolly, Padraig J" , "Xing, Beilei" CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH v2] net/i40e: fix qinq flow pattern to allow non full mask Thread-Index: AQHWokd1vnCCsYcCg0GXnPDGZ0GnH6mYXBxg Date: Thu, 15 Oct 2020 08:56:40 +0000 Message-ID: References: <20201013135756.23193-1> <20201014163047.69981-1-padraig.j.connolly@intel.com> In-Reply-To: <20201014163047.69981-1-padraig.j.connolly@intel.com> 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 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: [86.45.36.39] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: e6b130a2-f4d0-4982-78ac-08d870e83bcb x-ms-traffictypediagnostic: DM6PR11MB3196: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2512; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 3xPTlCZ4u06+JPBB+0D4IiLIvWw5aRLnDtQgYG2rj3OCTeVUUYYRxDoQxv7pXAZeMTUsGEQhy72q/nWyMq/gdXbtB+1goXcxDhFLNcO1hGojx4YTXtlt/rT/aJeYQBprNi10IgWrekp0rGvesNqaaZs7wA/E34FedBZq79H5ldSdLPg9dr3/rhuIaTwnA+iWJ/AFYa2OV3UFHYYNnI5UEgJKGO0Z5z7i7MIAYQtn7wW0As5wvfF09zbpsixMzYE+MvrJeAzuz3InzkpxUI21ZlEuU7Bl2HCe7oF/DxdZo1b43ouRBskUf7CHIlvEj291JIsQmIRnMiXUi5jWQefR1Q== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB2537.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39860400002)(396003)(136003)(366004)(478600001)(66446008)(71200400001)(66476007)(66946007)(64756008)(76116006)(6636002)(83380400001)(5660300002)(8676002)(66556008)(6506007)(55016002)(52536014)(53546011)(33656002)(86362001)(8936002)(110136005)(186003)(9686003)(26005)(54906003)(316002)(2906002)(4326008)(7696005)(450100002); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: QviOm3cuu6wADR/uUhzShItAAtpsWA3bdtxedI9JGS5EBN0F1mC7yOHWV7QFycbH6hIhJDEZAhd5X/1R61mp0IORZoxnXhd9NEIMjKG5l2l/0H/tVvgk91ppnapDZm9AuFPeKXBE7ivSU7ZTLucWvqErYf0tl/pbT2jiMgfJh/kZ44HYWVK/P4AYKRBBR8EX9552ulc9qci21PifNSfrxAzEUuHD2hIxqQAcVcHA2zckw20rl9M9Hp/pnmFc+Cg6AOJL+OfxOiHUyuMhTmhLd52zvCrXWVOf6P4ZPXSUGhHndTDLjlSICA2JP23IotmSqvTBaecn6stYbc2GwVnFMmQlMAF5W0iGupcoA+GH0mULObpar3/e83jCP9ueRM4YizEKu4eOtAyqZAjDxupx0048IYYq5UU8AKvuOYk+GqoNKwDURNrKaqrZeQb1btStkqRrJNBoAiY02AZ8Vy9VpAMZ5SHna1pXwIEmEFs6cXRNjYfTn/Rd8EXL4QRYVjdl9sRlpd+8Aw4fhHhl2U67jSpQHCQEY58c9cau2j+z8mfTf5zgrx9l3+wHTdG4dgm3SNLG7NKD7YOzQYPTIAZkoC0wpNTT7rpf2une2ulMIlv7IczcwSououUyHDAZVUD9lb4QNXDyJ4+cTBsgInszGg== 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: DM6PR11MB2537.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6b130a2-f4d0-4982-78ac-08d870e83bcb X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Oct 2020 08:56:40.8930 (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: 9OjIbREEFFn8kgqv3hzNXOtikw1OqsRB8UST5hezTR6KSv5+Bn9BKDLanNJKye0+GMB1RM2x4EpGahlmOoJb7Sa2rXP/G4u0Mb9p1/+FiUg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB3196 X-OriginatorOrg: intel.com Subject: Re: [dpdk-stable] [PATCH v2] net/i40e: fix qinq flow pattern to allow non full mask 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" Hi Padraig, > -----Original Message----- > From: Connolly, Padraig J > Sent: Wednesday, October 14, 2020 5:31 PM > To: Xing, Beilei > Cc: dev@dpdk.org; Connolly, Padraig J ; > Iremonger, Bernard ; stable@dpdk.org > Subject: [PATCH v2] net/i40e: fix qinq flow pattern to allow non full mas= k >=20 > Issue reported by customer that only full mask was allowed on inner and > outer VLAN tag, thus not allowing mask to set VLAN ID filter only. > Removed check that enforces inner vlan and outer vlan to equal > I40E_TCI_MASK (full mask 0xffff). >=20 > Fixes: c2be7f9b232f ("net/i40e: fix parsing QinQ pattern") > Fixes: d37705068ee8 ("net/i40e: parse QinQ pattern") >=20 > Cc: bernard.iremonger@intel.com > Cc: stable@dpdk.org >=20 > Tested-by: Padraig Connolly > Signed-off-by: Padraig Connolly > --- > drivers/net/i40e/i40e_flow.c | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) >=20 > diff --git a/drivers/net/i40e/i40e_flow.c b/drivers/net/i40e/i40e_flow.c > index adc5da1c5..8e7a9989b 100644 > --- a/drivers/net/i40e/i40e_flow.c > +++ b/drivers/net/i40e/i40e_flow.c > @@ -4649,14 +4649,9 @@ i40e_flow_parse_qinq_pattern(__rte_unused > struct rte_eth_dev *dev, > } >=20 > /* Get filter specification */ > - if ((o_vlan_mask !=3D NULL) && (o_vlan_mask->tci =3D=3D > - rte_cpu_to_be_16(I40E_TCI_MASK)) && > - (i_vlan_mask !=3D NULL) && > - (i_vlan_mask->tci =3D=3D > rte_cpu_to_be_16(I40E_TCI_MASK))) { > - filter->outer_vlan =3D rte_be_to_cpu_16(o_vlan_spec->tci) > - & I40E_TCI_MASK; > - filter->inner_vlan =3D rte_be_to_cpu_16(i_vlan_spec->tci) > - & I40E_TCI_MASK; > + if (o_vlan_mask !=3D NULL && i_vlan_mask !=3D NULL) { > + filter->outer_vlan =3D rte_be_to_cpu_16(o_vlan_spec->tci); > + filter->inner_vlan =3D rte_be_to_cpu_16(i_vlan_spec->tci); > } else { > rte_flow_error_set(error, EINVAL, > RTE_FLOW_ERROR_TYPE_ITEM, > -- > 2.17.1 The following fixes line can be removed: Fixes: c2be7f9b232f ("net/i40e: fix parsing QinQ pattern") As the fix in the above patch is not changed by this fix. Otherwise=20 Acked-by: Bernard Iremonger