From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0087.outbound.protection.outlook.com [104.47.2.87]) by dpdk.org (Postfix) with ESMTP id A87FB10A3 for ; Tue, 30 Oct 2018 08:53:09 +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=+aPzHWsDm9DYYFNIdT0hH2bF6sRnPHB3oQ5gCC6+PDc=; b=XqfPpyZ4J4a9Q5JjzHoTfdhY2ryv24HHVHQKDAXB0CUuD7wRErFvE6uDPetw2mR0WCBc2yK5mAuoVN3y5rKTaYQiJRc2QK5Fx4W3C+xdZC1M0yHNiJ7mSrywqW6qM8W/Tp3epn/vczNH9zzXQ9IGDHw6/cckgkXFDhh8hojupgw= Received: from DB3PR0502MB3980.eurprd05.prod.outlook.com (52.134.72.27) by DB3PR0502MB4091.eurprd05.prod.outlook.com (52.134.68.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1273.26; Tue, 30 Oct 2018 07:53:07 +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.1273.027; Tue, 30 Oct 2018 07:53:07 +0000 From: Yongseok Koh To: Shahaf Shuler CC: "dev@dpdk.org" , Yongseok Koh , Ori Kam Thread-Topic: [PATCH] net/mlx5: fix validation of MLPS-in-GRE Thread-Index: AQHUcCWY3ZesampBsUuqhMKOHVpexA== Date: Tue, 30 Oct 2018 07:53:07 +0000 Message-ID: <20181030075259.41100-1-yskoh@mellanox.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BYAPR07CA0067.namprd07.prod.outlook.com (2603:10b6:a03:60::44) 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; DB3PR0502MB4091; 6:SCoJBS0enPfHFekRY20uCu3NhfF+mFW7u9JVckZSl4nsMiXexei+hNm52LXTcdGuzfjHKTWbE08RLhnrY3t/5ddsYDVMahoEoGW4xvjdTcs9txuBd10WdO1Io5dWvqWdrv3+4QbTcTC+HfVothNvexzhb8v68gHw3LRa9gWkKSG2uojdKhE2LMSZKz0mpvZGnXsJsFp/CuebW4+idwB6C4Zw0mV19xccifywGZz12ad9ydwHJ8B5vXXW07DESYPX2qvT2EO7u9p/xJei81HZyf9BhMaP0AOmBaOyfECgxNw/GqFJ7o2g482qve8SHjZlQvhLWOM4GkubdQKMZj2gWrzAdSoGf+dFv++YvV67MOh5t1Rxf6pdEloKpDxQ7bIu3+J4DPo8pXh90iYaCOibLXO2NLH/WFmQEvMWOdb+swYw4uIT24Y7FGwBDo2r/uwjG0L68mI9T+1Q2/L3NMWxHw==; 5:Z+XZGuVWFKRzjidaYG3rmvunbcub1JgCe0NfEuWilXROSdZ0ZToMwBG/UgjetqN4muVfy93pRr70qH5WrLXpvZehmwhQDUw7Rq3chqTNywP16BtubGr/a36BkhUgacKRzGGgmVjqN7LBUKiiX3F8XOIwJZZxHEUEmPWlnTMDZMg=; 7:fdW/xMbZB7IAuUteRWE4eRZWHY6SO0KzKlVWHK+LhHtMugOkbfer+JVY3U3zqbcmFj6MDf5AV428iSSi2htFD3P7GoFoFEEytYMNNedGEYfML9VtuWkP5Bq+e0/42g1VZkEkaazxt8+30ipmuMoPfw== x-ms-office365-filtering-correlation-id: bea0b353-57a1-4024-acf6-08d63e3cbacb 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:DB3PR0502MB4091; x-ms-traffictypediagnostic: DB3PR0502MB4091: 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)(93006095)(93001095)(10201501046)(3002001)(3231382)(944501410)(52105095)(6055026)(148016)(149066)(150057)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:DB3PR0502MB4091; BCL:0; PCL:0; RULEID:; SRVR:DB3PR0502MB4091; x-forefront-prvs: 08417837C5 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(346002)(376002)(396003)(39860400002)(366004)(199004)(189003)(2906002)(6486002)(6436002)(71200400001)(6512007)(97736004)(2900100001)(71190400001)(14454004)(8676002)(8936002)(186003)(5660300001)(6506007)(81166006)(102836004)(81156014)(86362001)(26005)(5250100002)(316002)(37006003)(386003)(54906003)(1857600001)(52116002)(36756003)(256004)(25786009)(53936002)(7736002)(14444005)(107886003)(4326008)(6862004)(1076002)(6116002)(476003)(99286004)(305945005)(66066001)(68736007)(6636002)(106356001)(486006)(105586002)(2616005)(3846002)(478600001); DIR:OUT; SFP:1101; SCL:1; SRVR:DB3PR0502MB4091; 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: 7jxrqZxz8Wf5CpD2ud7dzdnK9Soh3uQ6VqvzZSPJM9ddxtWRxLHeFUHJvFBTSQ4ZWUxFSGLqbD/UY57wmv0qspYBPo3r6/sGMYqNJVFKG0vsElcBXwNH6ns/1Ogv/prSF8NbrtH2rzvnpy/PQuUrdLlUuQiMlUGqpUnqN9Nlpn2OTZpCEcyW5DBIJ4JkYWW/Uho5Q+vdMLdT8UMLpIp5lN1jdeV0qhCmtHETcbt5C7wqE2WEY613sY/UC9ubDlTU/kRrJq9BL4rYk7RE2nUC4KeQTBxt+jDQsHwlBsY0Ce1pHrqrXgQQt0JPP6yce9SF/oNvuHjaMXGsLx9dpfSYdgTY3YzqUIB+Bot5t5xN0Po= 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: bea0b353-57a1-4024-acf6-08d63e3cbacb X-MS-Exchange-CrossTenant-originalarrivaltime: 30 Oct 2018 07:53:07.7847 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR0502MB4091 Subject: [dpdk-dev] [PATCH] net/mlx5: fix validation of MLPS-in-GRE 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, 30 Oct 2018 07:53:09 -0000 Multiple tunnel isn't allowed but MPLS over GRE should be accepted. Fixes: 23c1d42c7138 ("net/mlx5: split flow validation to dedicated function= ") Cc: orika@mellanox.com Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_flow.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 2dd481f81a..7d0197839a 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -1619,7 +1619,9 @@ mlx5_flow_validate_item_mpls(const struct rte_flow_it= em *item __rte_unused, RTE_FLOW_ERROR_TYPE_ITEM, item, "protocol filtering not compatible" " with MPLS layer"); - if (item_flags & MLX5_FLOW_LAYER_TUNNEL) + /* Multi-tunnel isn't allowed but MPLS over GRE is an exception. */ + if ((item_flags & MLX5_FLOW_LAYER_TUNNEL) && + !(item_flags & MLX5_FLOW_LAYER_GRE)) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ITEM, item, "multiple tunnel layers not" --=20 2.11.0