From patchwork Wed Oct 17 02:07:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongseok Koh X-Patchwork-Id: 46937 X-Patchwork-Delegate: shahafs@mellanox.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 61C265B38; Wed, 17 Oct 2018 04:08:00 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0056.outbound.protection.outlook.com [104.47.2.56]) by dpdk.org (Postfix) with ESMTP id 617765A6A for ; Wed, 17 Oct 2018 04:07:57 +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=573lbmPhmLa8e5XqCGSTGZ7j3XlN5o1zB0CTeLGr22k=; b=FWDMrWQ4jtE7yIJFlWFFP7Pm8T+tm5GsfaXvH38qeE7d3OY8ZvGQRxrnEqtNlnCtcCkaLCwaz4f0wX6kByEQijTO+iSKXrH0Ej2auCz240noW0VJ7wS1N5khYqY5xPk4yTHZfVKmEtE4tDDfmqYW54jYnP5HgGLSJVhn2x/1ioY= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB3946.eurprd05.prod.outlook.com (52.134.71.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1250.21; Wed, 17 Oct 2018 02:07:56 +0000 Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::f8a1:fcab:94f0:97cc]) by DB3PR0502MB3980.eurprd05.prod.outlook.com ([fe80::f8a1:fcab:94f0:97cc%3]) with mapi id 15.20.1228.027; Wed, 17 Oct 2018 02:07:56 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , Ori Kam Thread-Topic: [PATCH 3/5] net/mlx5: fix item validation in Direct Verbs Thread-Index: AQHUZb44AcExSwUxDk2qtSFWK9hDtg== Date: Wed, 17 Oct 2018 02:07:55 +0000 Message-ID: <20181017020739.11203-3-yskoh@mellanox.com> References: <20181017020739.11203-1-yskoh@mellanox.com> In-Reply-To: <20181017020739.11203-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR01CA0006.prod.exchangelabs.com (2603:10b6:a02:80::19) 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; DB3PR0502MB3946; 6:2CmzNNL3weD+RBFCaNiqeYgS6cKWecZo98ukVKe3fr6+fvMf6KENpnvLzuQfmZ/xTmmD4PlSgaTQEiwKePyOJnWlgSgyzhOQPVygWc80pO0xiBF/Gh23qwrc9u5gxDzYGyOtuOz93EVBr+lKFSW1IqJVNmVd60lEzeBCClEVSJgJnlUdV+ZUVqNkYeaTAiuegfEOPQwvNiD/25oQXdK1PBLKCCYd/BLXP687laRxI6gQ511Ru2+qzFhmqQ9jWYzkZaTCuni2y+RttJE8BmsEOqPQBjqMClOoFfFSRumU1sSGiIS/WRXMf5e6Uj3sRVnGjN0GEL2fhoSxbdMiQoqMvrxmupayw7e3v3DkixKdllIPhOSOGgQv5nX5X5kkMKI7f1mGROPaGJxTw4iVIeAii8IS/HsJkMRbQazc4ppYkm1hiKF57BD1gKU29muT/8/Ne25DQMYnW6XEu1z8YoNzGw==; 5:AtXmohlC9B0yTvrl57nAARob48oTvCE4sePXYOpTXvIQEgDNBIoHtF+NY1mQKkTHSIooOcwxl7k/vYwRH2GEESQxevqwBrLH4rVFcwl0qi0R2v0zo89wbO6iwGEhIgESdoHqs/6re9RujztCCHXk4rmqCggBYGov62K8bUksMjE=; 7:kXxBSkDMB9ksgQ3gB00tbh+sOX3nTBCH3gzHk1q39lQgnsdxp9CldREuN/QO7fjtkMM/KXrPuN1768cBg7Y7AZOZIvvmjgfXFgB3IqaIzMx0OR6oGe1V8h0t0yK767QMei38+Wr/2mj3K6N6s00FX8uFc954hYQu6ZtkEMUtROhwl6+CtzO163W3N7Vzbcs9VEKawEGO55QkyGaT9HMMRY8zZoYC6adFf52U26gqXYnOkV0SMySx19cNvL4/njs8 x-ms-office365-filtering-correlation-id: 25e06db3-2f52-498c-840f-08d633d55a3d 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:DB3PR0502MB3946; x-ms-traffictypediagnostic: DB3PR0502MB3946: 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)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231355)(944501410)(52105095)(3002001)(6055026)(149066)(150057)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991084); SRVR:DB3PR0502MB3946; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB3946; x-forefront-prvs: 08286A0BE2 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(346002)(376002)(136003)(366004)(199004)(189003)(71200400001)(71190400001)(105586002)(66066001)(97736004)(76176011)(86362001)(52116002)(2900100001)(99286004)(107886003)(36756003)(478600001)(14454004)(5250100002)(106356001)(54906003)(316002)(446003)(37006003)(6636002)(6486002)(11346002)(256004)(305945005)(8936002)(2616005)(476003)(14444005)(486006)(6436002)(81166006)(81156014)(8676002)(53936002)(6862004)(4326008)(2906002)(25786009)(6512007)(5660300001)(186003)(7736002)(1076002)(102836004)(68736007)(3846002)(26005)(386003)(6116002)(6506007); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB3946; 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: QWra94VE93Zshr3KglLXA2MF+cK+3Ml1bLXZAf44ARAn+LlO3qhp6lMKUao/uNMdpsEvr6LGfiRa/DN19/2skXwQad5mE3/MCzgGi2dHyp6TbVMybTDyF2XK5JY5Mhs22KAsaZUTpv62WYO8feV+mVk1KSUzckH+0Ny++23TtyJfeTbUGbrNF+jJqawwdu7C6QGCjIs366Q9jEGdJeAwrN/3AlJyPbF85JfNqKF7Vow5CQiIWsi0FuqqBRq0NyHiU02119z1rTmTuqlEDSNGZ9KYff5jqkHU+44it3StzGT8M7O6QrbRKmbN1l0KWNXE8jwdKy1/3wWMmBxhRDY1glWrmt8zJ5JkrlaPPxJkLgY= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 25e06db3-2f52-498c-840f-08d633d55a3d X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Oct 2018 02:07:55.9691 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB3946 Subject: [dpdk-dev] [PATCH 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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_dv.c index 2b362dae11..ea8e1f4831 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -164,6 +164,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 = mlx5_flow_validate_item_tcp + (items, item_flags, + next_protocol, + &rte_flow_item_tcp_mask, + error); + if (ret < 0) + return ret; + item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP : + MLX5_FLOW_LAYER_OUTER_L4_TCP; + break; case RTE_FLOW_ITEM_TYPE_UDP: ret = mlx5_flow_validate_item_udp(items, item_flags, next_protocol, @@ -173,16 +184,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_UDP : MLX5_FLOW_LAYER_OUTER_L4_UDP; break; - case RTE_FLOW_ITEM_TYPE_TCP: - ret = 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 = mlx5_flow_validate_item_gre(items, item_flags, + next_protocol, error); if (ret < 0) return ret; - item_flags |= tunnel ? MLX5_FLOW_LAYER_INNER_L4_TCP : - MLX5_FLOW_LAYER_OUTER_L4_TCP; + item_flags |= MLX5_FLOW_LAYER_GRE; break; case RTE_FLOW_ITEM_TYPE_VXLAN: ret = mlx5_flow_validate_item_vxlan(items, item_flags, @@ -199,21 +207,6 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, return ret; item_flags |= MLX5_FLOW_LAYER_VXLAN_GPE; break; - case RTE_FLOW_ITEM_TYPE_GRE: - ret = mlx5_flow_validate_item_gre(items, item_flags, - next_protocol, error); - if (ret < 0) - return ret; - item_flags |= MLX5_FLOW_LAYER_GRE; - break; - case RTE_FLOW_ITEM_TYPE_MPLS: - ret = mlx5_flow_validate_item_mpls(items, item_flags, - next_protocol, - error); - if (ret < 0) - return ret; - item_flags |= MLX5_FLOW_LAYER_MPLS; - break; default: return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, @@ -879,9 +872,6 @@ flow_dv_create_item(void *matcher, void *key, struct mlx5_flow_dv_matcher *tmatcher = matcher; 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); @@ -929,14 +919,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,