From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10069.outbound.protection.outlook.com [40.107.1.69]) by dpdk.org (Postfix) with ESMTP id BFE431B43A for ; Tue, 23 Oct 2018 18:52:13 +0200 (CEST) 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=4n1wy3jnrDW6OpMcG0TCdrnV2cgDUm2xIRrAdDzcR+o=; b=gAU6Zskv0D2cR2GicOMGvuUs+aCfMtwc3MEiq0L19kcyZ89J5bFzOiwTsh6tk2v31EEay+LMPRWaARZiC9ge8jt7sQXac0yb+6AlfXHxmaFPq6e2CSF1NYnpeOkOnpXot40EMZZ+iH03edsZqNiScNhOHGHBS7UexpRb9ANj3o4= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4026.eurprd05.prod.outlook.com (52.134.72.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.29; Tue, 23 Oct 2018 16:52:12 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::f8a1:fcab:94f0:97cc]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::f8a1:fcab:94f0:97cc%4]) with mapi id 15.20.1250.028; Tue, 23 Oct 2018 16:52:12 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , Ori Kam Thread-Topic: [PATCH v2 3/5] net/mlx5: fix item validation in Direct Verbs Thread-Index: AQHUavC+oMa9LSW7Xk6ZeD4XdmOiTw== Date: Tue, 23 Oct 2018 16:52:12 +0000 Message-ID: <20181023165200.2454-4-yskoh@mellanox.com> References: <20181017020739.11203-1-yskoh@mellanox.com> <20181023165200.2454-1-yskoh@mellanox.com> In-Reply-To: <20181023165200.2454-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR08CA0009.namprd08.prod.outlook.com (2603:10b6:a03:100::22) To DB3PR0502MB3980.eurprd05.prod.outlook.com (2603:10a6:8:10::27) authentication-results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [209.116.155.178] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DB3PR0502MB4026; 6:EOclG3selcu7dFmMwPjQGRkaDBfER9sPyrhWEf0BTwi8mv9nTZXPUlW6awWmrkQp4BRLVPfJPAyHN0AmxD2rorqQ+VVGOv3SmCOSsm4jBFOuUI7hbFt/4EnYFkAz5dlLSmpf0PECOREltAWytiYb5BnoBjg0QOanrAZZw8dndiyc6g/nTz3ObO/kHxpG2zCfEmJA3DQcRt0E8QCLSZyVwVaZzEcNVwQO34kNX5dhp3Vq1pMDL2rEwQwGz8bBfuzEgW/zGpzUfCPC2cYXKybQCiDHecG1S8F9uvepjx4iah4YYujY+oj45jb+Hu/b7KAqZ70lQOCaAWKqgE4ZPhthIYBMMQBmswqxSPNnnrqbE7t4q6C4IoKEWhrlxlApqJA/0uHCotMASwAZQ2xdS+uVU7pH9AJIvdabxoct5HJCmtZ+uKP7UwTahkCznOy9hiOYGQ9kbUyZP0qxN3/oNHZA5w==; 5:xg3kGkVJsi8+3YPv29+HsnPtYTgaKETU1pA4ab+cO7HQ/0HdPueXgCcStbPDeOVe3+idOz9y044tkdpKliFLIWCALqLQjzLkVTQ7XE7Pq3E9VZXijGKpdmJEOOBn/LsWEddeiQXeFNiFk2w5OOkMGArvcUqUaRChEnrPmt3prFk=; 7:dMESWDqKty3uV0JsjKYaXM7ap9WyNxSa8FLjyKBml0+f85SZCWMNEuVky4lmaURRJnv68wSNfEBQuDyZmcew/VBzeHYRVwllclLMsrao8b0lBFcIqRQa+JkvCs/gyhYSjXBCprRajgIOND2pPdLp+pwR06j7DQDfDW5cTubfq6mnGITJBRk1QDezeVZYmriWK5Ns/P0qLUTATuAyzTEQ1zR31b0dTsIwPZhLeLkLobbxKeyfCiSc8DA2H8mg/voe x-ms-office365-filtering-correlation-id: 9167229a-6c21-4d92-2290-08d63907e0e9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB3PR0502MB4026; x-ms-traffictypediagnostic: DB3PR0502MB4026: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(148016)(149066)(150057)(6041310)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB4026; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4026; x-forefront-prvs: 0834BAF534 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(346002)(366004)(396003)(376002)(136003)(39860400002)(199004)(189003)(6506007)(3846002)(37006003)(7736002)(99286004)(5250100002)(1076002)(5660300001)(386003)(66066001)(2900100001)(316002)(71200400001)(76176011)(2906002)(71190400001)(36756003)(81166006)(54906003)(81156014)(305945005)(6436002)(25786009)(26005)(52116002)(6116002)(8676002)(107886003)(256004)(105586002)(53936002)(4326008)(476003)(68736007)(6512007)(86362001)(102836004)(8936002)(6486002)(478600001)(14444005)(14454004)(106356001)(486006)(6862004)(2616005)(446003)(97736004)(6636002)(11346002)(186003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4026; H:DB3PR0502MB3980.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-microsoft-antispam-message-info: CuarAKAAkZzeF7IbJ8cBKGrOChYxhK4NOoYk4grfzHDM5agecRKkTEt7YhEFsdqvHogX3pBNeq1QnmxFAu7qBL3Vy2Dv/MT+iIa/m8tZ1x3C9cc5kKg6RRrMeA0e1z5NZS1dxp570gGN5ai1G9cNn1hFcypKpKLiYUU7UdcTuYNzfRlLTOEW9INE4dQvdRxNJPLKjMkqg+ntJOK+dIcVQoiNhUnGoDqCpIuXhcDiEodoiaICjjLQzIX7jRHYUzLpVM3n79wLHGtqLEw2rfwh0hIPUjw5KjUi5ugsJX6AbxCrcTEzJsJKoCQs14eheCEUOm1rlivuRFDlCO3dlDhpzii4rJqJpmQDPmcDKXnP6FE= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9167229a-6c21-4d92-2290-08d63907e0e9 X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Oct 2018 16:52:12.3645 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4026 Subject: [dpdk-dev] [PATCH v2 3/5] net/mlx5: fix item validation in Direct Verbs 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: Tue, 23 Oct 2018 16:52:14 -0000 1) remove MPLS item in validation as it doesn't have a translator. 2) add missing NVGRE item to validation 3) match switch-case order between validation and translation. Fixes: fc2c498ccb94 ("net/mlx5: add Direct Verbs translate items") Fixes: 3d69434113d1 ("net/mlx5: add Direct Verbs validation function") Cc: orika@mellanox.com Signed-off-by: Yongseok Koh Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow_dv.c | 50 +++++++++++++++++--------------------= ---- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_d= v.c index 57884e9f98..15603401cf 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -225,6 +225,17 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct= rte_flow_attr *attr, ((const struct rte_flow_item_ipv6 *) items->spec)->hdr.proto; break; + case RTE_FLOW_ITEM_TYPE_TCP: + ret =3D mlx5_flow_validate_item_tcp + (items, item_flags, + next_protocol, + &rte_flow_item_tcp_mask, + error); + if (ret < 0) + return ret; + item_flags |=3D tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP : + MLX5_FLOW_LAYER_OUTER_L4_TCP; + break; case RTE_FLOW_ITEM_TYPE_UDP: ret =3D mlx5_flow_validate_item_udp(items, item_flags, next_protocol, @@ -234,16 +245,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struc= t rte_flow_attr *attr, item_flags |=3D tunnel ? MLX5_FLOW_LAYER_INNER_L4_UDP : MLX5_FLOW_LAYER_OUTER_L4_UDP; break; - case RTE_FLOW_ITEM_TYPE_TCP: - ret =3D mlx5_flow_validate_item_tcp - (items, item_flags, - next_protocol, - &rte_flow_item_tcp_mask, - error); + case RTE_FLOW_ITEM_TYPE_GRE: + case RTE_FLOW_ITEM_TYPE_NVGRE: + ret =3D mlx5_flow_validate_item_gre(items, item_flags, + next_protocol, error); if (ret < 0) return ret; - item_flags |=3D tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP : - MLX5_FLOW_LAYER_OUTER_L4_TCP; + item_flags |=3D MLX5_FLOW_LAYER_GRE; break; case RTE_FLOW_ITEM_TYPE_VXLAN: ret =3D mlx5_flow_validate_item_vxlan(items, item_flags, @@ -260,21 +268,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct= rte_flow_attr *attr, return ret; item_flags |=3D MLX5_FLOW_LAYER_VXLAN_GPE; break; - case RTE_FLOW_ITEM_TYPE_GRE: - ret =3D mlx5_flow_validate_item_gre(items, item_flags, - next_protocol, error); - if (ret < 0) - return ret; - item_flags |=3D MLX5_FLOW_LAYER_GRE; - break; - case RTE_FLOW_ITEM_TYPE_MPLS: - ret =3D mlx5_flow_validate_item_mpls(items, item_flags, - next_protocol, - error); - if (ret < 0) - return ret; - item_flags |=3D MLX5_FLOW_LAYER_MPLS; - break; case RTE_FLOW_ITEM_TYPE_META: ret =3D flow_dv_validate_item_meta(dev, items, attr, error); @@ -982,9 +975,6 @@ flow_dv_create_item(void *matcher, void *key, struct mlx5_flow_dv_matcher *tmatcher =3D matcher; =20 switch (item->type) { - case RTE_FLOW_ITEM_TYPE_VOID: - case RTE_FLOW_ITEM_TYPE_END: - break; case RTE_FLOW_ITEM_TYPE_ETH: flow_dv_translate_item_eth(tmatcher->mask.buf, key, item, inner); @@ -1032,14 +1022,14 @@ flow_dv_create_item(void *matcher, void *key, (IBV_RX_HASH_SRC_PORT_UDP | IBV_RX_HASH_DST_PORT_UDP)); break; - case RTE_FLOW_ITEM_TYPE_NVGRE: - flow_dv_translate_item_nvgre(tmatcher->mask.buf, key, item, - inner); - break; case RTE_FLOW_ITEM_TYPE_GRE: flow_dv_translate_item_gre(tmatcher->mask.buf, key, item, inner); break; + case RTE_FLOW_ITEM_TYPE_NVGRE: + flow_dv_translate_item_nvgre(tmatcher->mask.buf, key, item, + inner); + break; case RTE_FLOW_ITEM_TYPE_VXLAN: case RTE_FLOW_ITEM_TYPE_VXLAN_GPE: flow_dv_translate_item_vxlan(tmatcher->mask.buf, key, item, --=20 2.11.0