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 5D949A00C3 for ; Thu, 14 May 2020 10:59:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 313F61D6F6; Thu, 14 May 2020 10:59:26 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150051.outbound.protection.outlook.com [40.107.15.51]) by dpdk.org (Postfix) with ESMTP id 68AC01D6DB; Thu, 14 May 2020 10:59:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GYzyyA9FlVwqWbk3w6fvpp33fc7prnHrWa1PKvmXUrN6PCvc5b5y8HeLWVN9tqEncnbd5OhWlW9m2YR/6u3dZPRKhBUMfXUdtJit2OoHTGrrzciJ5VYgIHr9qjxoci9vyalI3vQKSBtMNao1PXZJVgirRqbjsvMNs3V5eQgcD4Z8ex5Qr4SnMwFqiiNGhU/Hlx0F49B4OdmHKr8iqNmH1f5W/7yI0/IdVl5HnqvuDiOO8p5A+ThCmTB8MXqj4e8zrGFg5Pj59GNPupdZ1QpKPbHmXLSfYGOJFVYGT4GTeR/8uW/jBMZo0igTAvHQFvl37DpIc6hpdiuAOXa0gKjbfg== 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=x8bVd2addgMpsgBrX3QM2W0IcOv6Thbt3w/qz34mBGU=; b=b6vYhpfINrBzfq91Jzuftj4PvUWBLoXcYmeijM+eYFaOnv3AbPTXDukSGxckwXN6qXC3Yv0fSHBkMfftGqVnr4ISah++1qRL61qxqrXWa35JMwTeMz7Em9AeUfrWD8PRGXorrkhbEamOPj6p2W8PFvpEgkMruXmxn9A5fOQZ8J9TNzeoWym2AZBASL1X9QKAjkyIFTgtEn6P6DcNMECyCjl25csC75IqY8SPOL9HDQlU0Du6Nu0S5KUVWTaCXXRD0IMKpS5CoNKmr5XdNrkHaplXHYYX8dh89PtguI/8RP+/ZPFpf80woOq7dwfVsrwNY3BDg43Tr/DAetcqXBGhvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=mellanox.com; dmarc=pass action=none header.from=mellanox.com; dkim=pass header.d=mellanox.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=x8bVd2addgMpsgBrX3QM2W0IcOv6Thbt3w/qz34mBGU=; b=cfhjSqcIhR5mloz3MHhNN5bYyGnaGkO7/itIBaoZZrEP0wpQvvU34Ad+K3Fogvirl7UWHogzQJs2MQfPBvthjuJovdvbvue0r0IfZyjC1A+coslUFtYx5Gx6BMZVrmooBE4wBP0k/RH1cZA4BxPjzCY61QKVGEjNC49FopJ4P3s= Received: from AM0PR05MB6707.eurprd05.prod.outlook.com (2603:10a6:20b:15b::17) by AM0PR05MB5921.eurprd05.prod.outlook.com (2603:10a6:208:124::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27; Thu, 14 May 2020 08:59:22 +0000 Received: from AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e]) by AM0PR05MB6707.eurprd05.prod.outlook.com ([fe80::508:747b:cc12:5f6e%5]) with mapi id 15.20.2979.033; Thu, 14 May 2020 08:59:22 +0000 From: Raslan Darawsheh To: Dekel Peled , Matan Azrad , Slava Ovsiienko CC: "dev@dpdk.org" , "stable@dpdk.org" Thread-Topic: [PATCH] net/mlx5: fix VLAN actions with wildcard VLAN iten Thread-Index: AQHWKV+gSkPamfu56USpPoUDh1E496inSPjQ Date: Thu, 14 May 2020 08:59:22 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: mellanox.com; dkim=none (message not signed) header.d=none;mellanox.com; dmarc=none action=none header.from=mellanox.com; x-originating-ip: [188.161.229.217] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b3dff484-0a02-4a08-5b6f-08d7f7e51848 x-ms-traffictypediagnostic: AM0PR05MB5921:|AM0PR05MB5921: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2449; x-forefront-prvs: 040359335D x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: oj1j2twefE/zXpUElgr3VOVVyQFooqpPTdab5kryriKHhCVMX5YeGYUa6rMZqcVA7h8h+GX8tNHCW1eESgyEqXgb2zbA58A2w9aNwwraD9Ho9X4LyPZYSai8zH9PZ+UmaUJ3dyLsC+bVmH/iDPDVeBygFu1+K3oE9NMky5WfvvjtxBhlanF0gR4ZHU1quOOCHKZojD/h07xL6oTZmMVm6KeiRqvp3FZulV7DApn3s9PL5Wy9LD2rSgJtbdUwWQB3nnfdK0Q49CzRsP0XePYVl3tn88DFX7iVxAFkA5OcB7/c9L+TQDd2VAF/MT2t3ws3djmzkAmAWASuLI7cGQBPfE57DBnVytTjpQgCKvklqm3zaa6kGpqIGMufFNWkmzKQISmWFUCjGDKiz1MYiWFOhnVEPhi5GHKSclGgPr+MU6nDIGSR9Ff9RDwDiJGjwAvy x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM0PR05MB6707.eurprd05.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(376002)(136003)(396003)(39860400002)(366004)(346002)(9686003)(54906003)(450100002)(6636002)(86362001)(316002)(71200400001)(110136005)(2906002)(8936002)(8676002)(186003)(26005)(66476007)(6506007)(53546011)(76116006)(5660300002)(4326008)(66946007)(33656002)(64756008)(7696005)(66556008)(478600001)(66446008)(52536014)(55016002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: /2VrBdSToqT11hemveQu0OPf7DQh6Tff+LAOFWf3LcyJv0abRU/XbefrLV2/MjpZw2ut+cUpmnrYBAQZWIM2bgkq8fl2mgY/SPXjdkz6NlHcd8adDCrjQtC+w3r71ngZfTJor+ySNv0Oq6mpLkicbq8IseUcdFtEsTEabIAZdDlukW0AyEQfrlFV0eitEr9vDAD53AVARKCNdPE1+deH1FQaKj85u6u+n0LY8XIkUlkv4gGLptKdFmDTkmWseWEp4pEYWfEb+/kKAphIU5cEI4BiWCdRJSNfEsVhlQtARL8OlX98xEefmm+8MQ/soUrgHbZe0+ijuG6O72cwoki5iOg6xhKw7LiO4d1fmQRADvXB1rBhRaGJBLmvUze+CUtv/gxrWjLekLkFBO6ZB9ikq4fPhruBnYR6kVSgcpZhWd2qUvju50S87Q9zSyWpUdEn2TDeIfBGFHIWgKA0B+Bz8nJqpmvC6zwFjWPpg3nhT5YkR9KztFILly65w/+NmDRP Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3dff484-0a02-4a08-5b6f-08d7f7e51848 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 May 2020 08:59:22.2573 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: QWEY1IaIef4Oc/SHNXbm2uT2LDi8J+WDAjhGF2MLO/JDqHI5I32Yw3LFN3Q0IMY+ehMCqhPJmca4hl25rBQDag== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR05MB5921 Subject: Re: [dpdk-stable] [PATCH] net/mlx5: fix VLAN actions with wildcard VLAN iten 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, > -----Original Message----- > From: Dekel Peled > Sent: Wednesday, May 13, 2020 10:49 PM > To: Matan Azrad ; Slava Ovsiienko > ; Raslan Darawsheh > Cc: dev@dpdk.org; stable@dpdk.org > Subject: [PATCH] net/mlx5: fix VLAN actions with wildcard VLAN iten >=20 > Previous patch added support of VLAN item without VLAN ID value, > i.e. using wildcard VLAN item, to match VLAN with any VLAN ID. > The implication on VLAN actions was not taken into consideration. > VLAN actions (e.g. push vlan) use the VLAN ID value in the VLAN item, > and expect it to be valid. >=20 > This patch updates function flow_dev_get_vlan_info_from_items() to > check the VLAN item contents before trying to use it. >=20 > Fixes: 92818d839e8e ("net/mlx5: fix match on empty VLAN item in DV > mode") > Cc: stable@dpdk.org >=20 > Signed-off-by: Dekel Peled > Acked-by: Viacheslav Ovsiienko > --- > drivers/net/mlx5/mlx5_flow_dv.c | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_dv.c > b/drivers/net/mlx5/mlx5_flow_dv.c > index 8b018fb..ed2ecd2 100644 > --- a/drivers/net/mlx5/mlx5_flow_dv.c > +++ b/drivers/net/mlx5/mlx5_flow_dv.c > @@ -1881,6 +1881,9 @@ struct field_modify_info modify_tcp[] =3D { > const struct rte_flow_item_vlan *vlan_m =3D items->mask; > const struct rte_flow_item_vlan *vlan_v =3D items->spec; >=20 > + /* If VLAN item in pattern doesn't contain data, return here. > */ > + if (!vlan_v) > + return; > if (!vlan_m) > vlan_m =3D &nic_mask; > /* Only full match values are accepted */ > -- > 1.8.3.1 Fixed typo in commit title (iten->item) Patch applied to next-net-mlx, Kindest regards, Raslan Darawsheh