From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-eopbgr30040.outbound.protection.outlook.com [40.107.3.40]) by dpdk.org (Postfix) with ESMTP id 69A23239 for ; Sun, 27 Jan 2019 12:19:43 +0100 (CET) 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=kZM8KuS3fUIu+1z18ncgcZ0cg3zvqUxX1vxgpL+Gbk4=; b=EEaf5E5F1GWViv/0K5Oq2k1sxDZqsIng2ExW7010xo1w6RpPzipcVJ50Lye8EGJwZU8FeLF9xg0tHCjB9Sbaf3hDmrpPmP4Sth/xbMwcq6pUCa8uP2JJftQvxR2I4BV5lv6Am51T+osvqrDbpU7bqbDAXxmqknTH65ebCDePP/E= Received: from AM0PR0502MB3795.eurprd05.prod.outlook.com (52.133.47.29) by AM0PR0502MB3924.eurprd05.prod.outlook.com (52.133.48.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1558.21; Sun, 27 Jan 2019 11:19:41 +0000 Received: from AM0PR0502MB3795.eurprd05.prod.outlook.com ([fe80::3c5d:79ff:4933:c7ea]) by AM0PR0502MB3795.eurprd05.prod.outlook.com ([fe80::3c5d:79ff:4933:c7ea%6]) with mapi id 15.20.1558.022; Sun, 27 Jan 2019 11:19:41 +0000 From: Shahaf Shuler To: Slava Ovsiienko , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH] net/mlx5: fix ETH and VLAN items for E-Switch flows Thread-Index: AQHUtMEc4jMkfkfi20utJ0Uh6fa/zKXC+jJw Date: Sun, 27 Jan 2019 11:19:41 +0000 Message-ID: References: <1548429450-27678-1-git-send-email-viacheslavo@mellanox.com> In-Reply-To: <1548429450-27678-1-git-send-email-viacheslavo@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=shahafs@mellanox.com; x-originating-ip: [31.154.10.105] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR0502MB3924; 6:rxOugB4X/O/bE+CVSoLzVzw3o3p5be00NiFsVUGh1yfvhpbTfUMEd535VvumPJYskRwdat1ZlSr8tpGm3bDMODDnDqRvRf4ukTTawy+wddiPh8UhV4BSJoAZb/DTStH8LJKJTeosSU6m+Igzw3aB8mG/SLSNxFNkmAysHIkdlGvSxueGfOedAPjONqFOw29jwWr9XaLPuPtnyGWkpJZyHUIX+px0ajvQMYdxpGggtK82D4x7l6w/fN4cfbI2lvdukUH3tdwmedr5DTwrvRAABkW93i3SKuOGn4ZDFXXjg7gNoT2EGy9rdstLaNmJdG/SwvLFsdCVDh8s8I+zjaOukXDqbMin5MaeWmIA3djGFaRqotHUCSldt+EZCINY9X15wIDRyeC0Cviwm4EXpJcA/EjQ0e9iEd8sqMUG8naGBz8LR7SRYUxO0xqFPbgQNKnbnDLrzAj3L2aQlWNpvOPHcg==; 5:xH2pCUANjU0vu41FXqGqdf0l20uxiNVH5Oo6biQuIj0oQTY6b7Cw2ORJ2ISiWqjngESOqYLnEmszQlPrxLMjDbzOVcvVPSHbMkFOgXuRCcxRzVTXsTDe1QyvfF0iURgciUTKqb2yQDVNb+kqkHP7mGPC4wDy/KRKVBlqxiSYDDHB4A9ap9kENCKRvzxIhYZ9shlvNvGkr0tN3+KTUY3xng==; 7:7m5xnYDz6ZXn9QRpQvzAPiiPLa5pUIt9g73X8LnygJOsZmeZJ8PJxeYbnoMQ09Vh+XVNidCnHOM702gYYt9uTLFQeM3SNepsBlDQdt2+mLAPc1tmYXr51sbuhPI0J7epnwtc9vpdTBChH2bsdvAhnw== x-ms-exchange-antispam-srfa-diagnostics: SOS; x-ms-office365-filtering-correlation-id: 68107b74-5dae-4f10-2ba3-08d68449550f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(5600110)(711020)(4605077)(4618075)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:AM0PR0502MB3924; x-ms-traffictypediagnostic: AM0PR0502MB3924: x-microsoft-antispam-prvs: x-forefront-prvs: 0930AAFAD9 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39850400004)(346002)(396003)(366004)(136003)(376002)(199004)(189003)(6116002)(25786009)(6246003)(3846002)(478600001)(71190400001)(33656002)(86362001)(71200400001)(14454004)(2906002)(53936002)(256004)(97736004)(2501003)(305945005)(102836004)(7736002)(11346002)(9686003)(229853002)(6506007)(106356001)(486006)(105586002)(446003)(186003)(26005)(476003)(66066001)(7696005)(81166006)(76176011)(81156014)(8936002)(55016002)(74316002)(6436002)(68736007)(99286004)(316002)(110136005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR0502MB3924; H:AM0PR0502MB3795.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: NYnDcTrMTOH87pEhRU2PRysyjo4zkTmZskl/5GAH0YrNmYOd+uIxwHkNuDTUHYns8aYuJrPUR2RVxx/Xw6NpBH2ybdamHzxdetmtos6rcvkxrUpPWjusIJMlo8bOMZL47DqepPX35dXv19hYYVa00atMYPykSpxIBj3jzr70l1/CXPAY0kjprXP2G4RGy0w00WK6tzVD1dfkUBXn11eE8yJoGOmLKSzg2rEM+pLVzp3T2/qm6/rtZsgbCCvQkCFtM1qcOgcmoLfvo89nOFVOtsOIr+bBAQLYVJWXnaIMrsOHqEJRC03ijtJ+2GjSeoWCmeZgN6AANDBNmTuQHBpQjCe9/XV+L6GdFua/KXUioqpKQjHYHJ97p5wIDUWyhlVpFFc2y+oUX+sE7QWo6a63jGhgWsIoL3bSjWnnI3jmUo0= 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: 68107b74-5dae-4f10-2ba3-08d68449550f X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jan 2019 11:19:41.2609 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR0502MB3924 Subject: Re: [dpdk-dev] [PATCH] net/mlx5: fix ETH and VLAN items for E-Switch flows 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: , X-List-Received-Date: Sun, 27 Jan 2019 11:19:43 -0000 Hi Slava, Friday, January 25, 2019 5:18 PM, Viacheslav Ovsiienko: > Subject: [dpdk-dev] [PATCH] net/mlx5: fix ETH and VLAN items for E-Switch > flows >=20 > This patch fixes two issues for E-Switch Flows >=20 > - RTE_FLOW_ITEM_TYPE_ETH and RTE_FLOW_ITEM_TYPE_VLAN with NULL > in spec field caused the asserts in debug version and segfault in release= , > fixed, now empty items are allowed and treated in correctl way >=20 > - empty RTE_FLOW_ITEM_TYPE_VLAN now sets the ethernet type to > ETH_P_802.1Q, in previous version empty VLAN item was ignored w/ Verbs, for example, having VLAN spec w/o a specific match on the VLAN ID= will make packets also w/o VLAN to match the flow. The reason is the way the kernel driver build the VLAN flow item for the de= vice. Have you verified we don't hit the same case w/ TC as well?=20 >=20 > Fixes: 3d14ad9be30e ("net/mlx5: support ethernet type for tunnels on E- > Switch") >=20 > Signed-off-by: Viacheslav Ovsiienko > --- > drivers/net/mlx5/mlx5_flow_tcf.c | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) >=20 > diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c > b/drivers/net/mlx5/mlx5_flow_tcf.c > index b8204df..916d3a0 100644 > --- a/drivers/net/mlx5/mlx5_flow_tcf.c > +++ b/drivers/net/mlx5/mlx5_flow_tcf.c > @@ -2052,7 +2052,8 @@ struct pedit_parser { > mask.eth, > "no support for partial mask on" > " \"type\" field"); > - assert(items->spec); > + if (!items->spec) > + break; > spec.eth =3D items->spec; > if (mask.eth->type && > (item_flags & MLX5_FLOW_LAYER_TUNNEL) && > @@ -2123,7 +2124,8 @@ struct pedit_parser { > "outer eth_type conflict," > " must be 802.1Q"); > outer_etype =3D RTE_BE16(ETH_P_8021Q); > - assert(items->spec); > + if (!items->spec) > + break; > spec.vlan =3D items->spec; > if (mask.vlan->inner_type && > vlan_etype !=3D RTE_BE16(ETH_P_ALL) && @@ - > 2520,10 +2522,14 @@ struct pedit_parser { > case RTE_FLOW_ITEM_TYPE_PORT_ID: > break; > case RTE_FLOW_ITEM_TYPE_ETH: > + if (!items->spec) > + break; > size +=3D SZ_NLATTR_DATA_OF(ETHER_ADDR_LEN) * > 4; > /* dst/src MAC addr and mask. */ > break; > case RTE_FLOW_ITEM_TYPE_VLAN: > + if (!items->spec) > + break; > size +=3D SZ_NLATTR_TYPE_OF(uint16_t) + > /* VLAN Ether type. */ > SZ_NLATTR_TYPE_OF(uint8_t) + /* VLAN > prio. */ @@ -3319,6 +3325,8 @@ struct pedit_parser { > assert(mask.eth); > if (mask.eth =3D=3D &flow_tcf_mask_empty.eth) > break; > + if (!items->spec) > + break; > spec.eth =3D items->spec; > if (mask.eth->type) { > if (item_flags & > MLX5_FLOW_LAYER_TUNNEL) @@ -3363,12 +3371,13 @@ struct > pedit_parser { > sizeof(flow_tcf_mask_supported.vlan), > error); > assert(mask.vlan); > - if (mask.vlan =3D=3D &flow_tcf_mask_empty.vlan) > - break; > - spec.vlan =3D items->spec; > assert(outer_etype =3D=3D RTE_BE16(ETH_P_ALL) || > outer_etype =3D=3D RTE_BE16(ETH_P_8021Q)); > outer_etype =3D RTE_BE16(ETH_P_8021Q); > + if (mask.vlan =3D=3D &flow_tcf_mask_empty.vlan) > + break; > + assert(items->spec); > + spec.vlan =3D items->spec; > if (mask.vlan->inner_type) > vlan_etype =3D spec.vlan->inner_type; > if (mask.vlan->tci & RTE_BE16(0xe000)) > -- > 1.8.3.1