From patchwork Sun Sep 16 16:53:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ori Kam X-Patchwork-Id: 44767 X-Patchwork-Delegate: ferruh.yigit@amd.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 B89E95B36; Sun, 16 Sep 2018 18:56:42 +0200 (CEST) Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00071.outbound.protection.outlook.com [40.107.0.71]) by dpdk.org (Postfix) with ESMTP id 8370C5B3A for ; Sun, 16 Sep 2018 18:56:41 +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=wK1wxlVEO7/Spa57lJIpEYVWFBLABlyhtPDxbR9P8uk=; b=xCbxco3lKVuYr4x6DQshSzdKFPq6c7EVV3myaj5AGrSLJsnvwzzx+TnVN/c+7NiTKRSQGZrq5zv0ZzFBB2GgU36k2fo+LFpYPtmIhrC2NxyynWbJkAUBQvaQn0Di6UJbbenWpYxEMOh8AjaBBu7S8tSuHNd4VH4AbbAM6uKTiBM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=orika@mellanox.com; Received: from mellanox.com (37.142.13.130) by HE1PR05MB3434.eurprd05.prod.outlook.com (2603:10a6:7:33::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1143.15; Sun, 16 Sep 2018 16:56:37 +0000 From: Ori Kam To: arybchenko@solarflare.com, ferruh.yigit@intel.com, stephen@networkplumber.org, adrien.mazarguil@6wind.com Cc: dev@dpdk.org, dekelp@mellanox.com, thomas@monjalon.net, nelio.laranjeiro@6wind.com, yskoh@mellanox.com, orika@mellanox.com Date: Sun, 16 Sep 2018 16:53:44 +0000 Message-Id: <1537116824-191205-4-git-send-email-orika@mellanox.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1537116824-191205-1-git-send-email-orika@mellanox.com> References: <1537116824-191205-1-git-send-email-orika@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [37.142.13.130] X-ClientProxiedBy: DB6P193CA0021.EURP193.PROD.OUTLOOK.COM (2603:10a6:6:29::31) To HE1PR05MB3434.eurprd05.prod.outlook.com (2603:10a6:7:33::24) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a87d738a-b86f-4147-136e-08d61bf55f2c X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:HE1PR05MB3434; X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3434; 3:Q0Fk3SborpNdDDQY6pW5L9AmCF+udXJhSXmktyyhH7AuU8BuC2ku31uXmpp9uNcseyzwdCWxciwqAU9SUS2ODFA3yKC/jcVRe3vRWwP2aqVLxKiFosr19Jp4hh60+yapaXSMY9hTOuOrIHuZjxZoXoQ0M+0tSXfXio5xmEA5XEi4wAMfYNxWP82L9AOt4zJ3u5CA4mDjGFYmzIKZJK8idAAXbAeSX58pabGb5AOIsFiZGj/U0Cz1g1sH3GLkQSJB; 25:MH+7k5DSWXJMvWk1wDik0zfYdTejxpePEtWvRnWCEzm6XwzWxFVBOQk6H6ZCWXiUwEU9h8u4TlA8cLSc6+GQY9oAzrZj2Kz4y+ZBWnngOtdgrMI9UevRhDvrpTBdEd128fi21mwvwK3ejvCsgLeMvoG0L10tURvh451jPeWVUiJ/qUHECIlf1yLiW29jE4Il3CmrAdtgIOYAMBCzjVdNVtcegymBvGsyyRQB8SjmMSyGeLew9PPjREdTyGbNyIBJsy3ezgK2BtxYW07EBpgnqjxlcpFU7i2GnWxeZuvi8tgiZ1K2XcGvLiXTImnCKRlwQ8HMbvepbrVThBvqQ6xWPg==; 31:OEpTD/GR+vCLRdjTtMxlBG8gm5UAMGxZZJgm1YdvV2VomuEaz2M7A6gLrmWGZsW5utGuY9vH4jUjrPnzj1BO61JD8KCPZKNepn6GfiZSziXeGicVZ06iWBdlVJvsWXWpjCZA/YVST45ZYgO13dS8J6bNs5WgdltRVCclPvDPQQysOoa0QNDCxu60uYTM2TUTOd9eJ+0MAOy/dmTthRYTlV9Uc5d/YqtvclmZyEplcEg= X-MS-TrafficTypeDiagnostic: HE1PR05MB3434: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3434; 20:CmmRkMyfcmNdNJ3P5zRyudTaLU8LDh58q0+52eAueZ6BaecV97vKfLH3nlmNhEtfEB4Jp716CFVWfe4dAxPAgOQiQFsvgyFdjB3c8cTgpyKu33PIDJtvv22Y2ujrYE1g0bQx62XFX9CHEmSkjGHPuUNeeiwG4V4OUO93YQxcSBE+VU4wswdjpfWXkx8wa4JgHUZaOxenuKC0e9RtmxE7E4Vu9p6kd82UcJjCbMGu/DE2ODmev596dDjm+Aq81nLgzRu4eXR0KtnGfyih8Ifu4g/M2pA61KaCVd+1nH3H9JU/AdmWbuHOHiSHMWkwq6pSFyfsnmo/HjolwCucIoBORgyJNt9dditsb6nM3VdE0Kh2PVav+zKg9xZRg6d6sDkmyuh7v9HaAbVge9t25KkxQ9hTzMVfiLWvx+7hIHDh2aOLRVwmazAtBrp/EfBvyQjyGl1ZHQ7VNYvOm6MKvlDxuHLjlBGK58vjNWf1GUuvuUDv7i94v2n0RN+QnspqutBi; 4:VnPCkINxfVTzVAu8uMa/4KBOOC2s8iWU+jFd9odvt0vS4Pwkctz0HWkNzXDIjMNcaQU119SnNAzJhnTk/HCNJBnkJJhfOACgqsFzZKvmzEIpJeh83Cm4v2A6uVJiz3mrYN9IKYSl/gPca5J6TmHDp2hqLfk9hC76mmmWK9px8mpOOay9O9QycP10jsVBShFnml/7Hk9TdM8Pk66LwAjNYusWnQGokCpQf/vffTdkAFZSseQw9kHEuIsw+VkRBeL0QOMPY02VbKQH8h+3Uf1NAQ== 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)(3231355)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201708071742011)(7699050); SRVR:HE1PR05MB3434; BCL:0; PCL:0; RULEID:; SRVR:HE1PR05MB3434; X-Forefront-PRVS: 079756C6B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(136003)(346002)(366004)(396003)(39860400002)(376002)(189003)(199004)(16586007)(47776003)(81156014)(6666003)(50226002)(8936002)(25786009)(5660300001)(68736007)(81166006)(8676002)(4326008)(106356001)(105586002)(2906002)(4720700003)(69596002)(316002)(21086003)(305945005)(8886007)(7736002)(66066001)(33026002)(107886003)(956004)(3846002)(476003)(48376002)(51416003)(478600001)(97736004)(7696005)(52116002)(55016002)(53936002)(26005)(36756003)(186003)(16526019)(386003)(50466002)(76176011)(2616005)(86362001)(6116002)(11346002)(446003)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR05MB3434; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR05MB3434; 23:pcaLl0g6NwE1AwaQLELSm+82tm+Cw4cJXjWfXLRbw?= 9ADKYP/9A7aMV6enpdtvplnSjyGmDFLTSQDHe9fADUAI0b/n8TCSx8VVn5nV/meY84JXqX31rdSH8Z/qfyF83x8tKvE0ex5rmhHDRbiiKugZ/putZGbgQgXK5r/nGPqgp/Nn+OiuRdGXwTB/xx3R/xKzAFhjEsn2ljBUfOE9g37SL/8Nvotnwbri94WTo0FJMSnSme/PbcRDAe7j9RWrN3/BQ9E68Ut652TuqNr28fTamdYEzN16nMHSO+vrOo4eq0HGwqyEEaKUR5de6kfXeSmRCSczxao8UHT7ScJa/12YglIPW56cSOLrzTV6PJFKG85/AhkzTQNsGNgLz2Pr+9R1wZVUd1EecLkRb6N8ADyrbwvdBYoAeLSwTbw+VSjKx8i96txXrguufs1Aa5JQsHxll1lxC32L3Y8adJnxiHAHrctuS0JhsnMCLUIC23fzjq2vWambY2U7bDdj+ldG+lfJX3WXbAbMQIrdQNUt1vTKyUiButUl/o2uCCruwpnnUUos/A4lAjdUIk6z+WzHTQNrMVUhJCruWhLvjwhymoS/1wZ2IiJa3aE0GGy9YQ1/4g3nwVaXPZSxf8OT/ntqO/ypO8a/9N9VjNHFlnGRYr5sJ9uRhLZknf14bt+eQ6BBMRmGIlhCaZsXgX4gQlAWcIKOVUYFc8c75JmDemL56iU5D4ZZuvm4I//S89u05tqttOJcqKVb6+IrLysBINZsVVeWl1FVlBZRHEWCS+ttRkDcutXuNzg/fmhS27GnCVTyHnE4yJHVMAutmVRssOt8aX0an5Jsn7t+64wZ8IGlp5hrOHe97NVXJfiMvlV8GYUVaoLnEsunjoffw9wSRWL3x5fFWg51K4+67uGipmS5FBYAX1QgRYIAvPqqTWApSzEgjpUBkzjWgPQBvUE6/qJMyH/XM49Ry9i2DwGnY9W1MeZ32oxYfQN5QvJr+709f1qtnfBiNFIc+E61WewRyFCbY+XVIhTOUTqBeAgiDg26N2NSQBJs84H283ygKpuec/xXjSr9x0rVp1muv1G923J7WQq4Y6KPyysaw73gvt+vjleMXO2ioanPkOb0vyeKlY7dH5tjAvTUbeKA7+7PT7FDUf0h+EhHT3enBP/JFSg8ohvWlepZtwBn208Vsc6SfyMaDl8FUwNAvAOkuz/rOewGJJGRlvIs7DmnjEMvSE2Z3ryTvD/PWjWf1SSqfBf7z0JuKE2Za8E1Ejq7qlPBl8fnrOr X-Microsoft-Antispam-Message-Info: cpxglRIIfg/joiR/YhPmA8oXLmiWgHFbIBGXJZlwhyev+TfiHOCae+6O7g+QmLtQKrXDbw+A6F3HGfQoaCsvS7YuwljOlkBNHsqvAuw38Fx4zMk8NBuCI+8PLN331FBlWJa4dWHP1bO1X8+C0CUMpfPsqfL/UfHFxHIW+rc9njbXxqnlz7Xir7WtcTg8L9vewLlTznFBZHUNEiWiwhxeQCQArJDYxQg6K/ZoZzBmcE/JtVoOAEWtW7Qkg9ylPWh9Pokdi77Z+qvZA+jFVRqZOYHH4xKsWn+LHZjWNQjt3O1uewYj8yXBQj4V5iG3PRhTqH7BM77B4JO6ysSPQFO0IvI8TRwUXrqr5Vb3MjTzL3I= X-Microsoft-Exchange-Diagnostics: 1; HE1PR05MB3434; 6:1GY3P6ZfmZQRcFFMgWdCBKA4hoDaFmyfgmyFkncc+HweaXFtg8G9VlaBN/kuYeJu4MGTMVAeVF044Hf/Nwg2dJpDWWkABnVVvkBVCTPIUrOo6U5vXOtdNnoz3qQcaTAkjhORrL4+Ahz5NHer6IFqZxTfOqkh6kLtEjedBhvtVfsNKKjXVpYUg6K1XMJCJ2Fno5mwv74DgghVxcyLnKGW0/+kf/WE1cOT0v+b7pO0Bb819NCgzTMHhj7PkQ5cp+QNbBfYmCOASTl7okVFL9Yiu06WxW3RR1Qo9Jj7SlDnYjFQ1NS2qeLW1iQjmmka2qtU+djovI1ljcr1dvojuilc+K3Yt6aF2jUApv20bcht9Te+QKjy75upQFVWExy/c0AHF6d6uZ3Q1xPHzlMrCXU/mRj3ziWkxx+qwn9NAqcfocQoCSut9O/17lAABHoeLTJpFTMtAdmCWVEA9lzkR5ArHw==; 5:tA6EB0wbkRJuY/z2ESBIbxaHK9w755pAAzodRMF7YEt7UZ/0TK65So2D5/RNIXBAqSVU4hsr2dfRzF07YtVVGOLPbAHCDE37CzaSahXh7eNk187cozp/8ml89wFx2rPGVf4qaPyyXNMm2lQIylpKVALfMzXKrmDbZOV1yKX3YUs=; 7:2WJw2gwHtE2i+7JYTkz8TEXpOnu6MJ0RiqpodSDp8PN4yCcYPGK92qMUfbjlCGqfe/gft9OfuRlhxGVerxdzot0dfFIW1q9jCawKicQKeuAkqPntx6my3Yrw39/wU5adefoGcgSqHeuPGFTBcPssNIjZYt7sPN9ZlLK4m4DX57VRb5jRV62ahmSNxZY9ljB/MCmVlCrtB1NONlu5Y0lBGL/IwqFIZvdHgUSyaLbiYbnphjGqLLj4sgKH0/2MFBN4 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2018 16:56:37.8571 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a87d738a-b86f-4147-136e-08d61bf55f2c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR05MB3434 Subject: [dpdk-dev] [PATCH 3/3] ethdev: remove vxlan and nvgre encapsulation commands 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" This patch removes the VXLAN and NVGRE encapsulation commands. Those commands are subset of the TUNNEL_ENCAP command so there is no need to keep both versions. Signed-off-by: Ori Kam --- doc/guides/prog_guide/rte_flow.rst | 107 ------------------------------------- lib/librte_ethdev/rte_flow.h | 34 ------------ 2 files changed, 141 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 0f29435..b600b2d 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1969,113 +1969,6 @@ Implements ``OFPAT_PUSH_MPLS`` ("push a new MPLS tag") as defined by the | ``ethertype`` | EtherType | +---------------+-----------+ -Action: ``VXLAN_ENCAP`` -^^^^^^^^^^^^^^^^^^^^^^^ - -Performs a VXLAN encapsulation action by encapsulating the matched flow in the -VXLAN tunnel as defined in the``rte_flow_action_vxlan_encap`` flow items -definition. - -This action modifies the payload of matched flows. The flow definition specified -in the ``rte_flow_action_tunnel_encap`` action structure must define a valid -VLXAN network overlay which conforms with RFC 7348 (Virtual eXtensible Local -Area Network (VXLAN): A Framework for Overlaying Virtualized Layer 2 Networks -over Layer 3 Networks). The pattern must be terminated with the -RTE_FLOW_ITEM_TYPE_END item type. - -.. _table_rte_flow_action_vxlan_encap: - -.. table:: VXLAN_ENCAP - - +----------------+-------------------------------------+ - | Field | Value | - +================+=====================================+ - | ``definition`` | Tunnel end-point overlay definition | - +----------------+-------------------------------------+ - -.. _table_rte_flow_action_vxlan_encap_example: - -.. table:: IPv4 VxLAN flow pattern example. - - +-------+----------+ - | Index | Item | - +=======+==========+ - | 0 | Ethernet | - +-------+----------+ - | 1 | IPv4 | - +-------+----------+ - | 2 | UDP | - +-------+----------+ - | 3 | VXLAN | - +-------+----------+ - | 4 | END | - +-------+----------+ - -Action: ``VXLAN_DECAP`` -^^^^^^^^^^^^^^^^^^^^^^^ - -Performs a decapsulation action by stripping all headers of the VXLAN tunnel -network overlay from the matched flow. - -The flow items pattern defined for the flow rule with which a ``VXLAN_DECAP`` -action is specified, must define a valid VXLAN tunnel as per RFC7348. If the -flow pattern does not specify a valid VXLAN tunnel then a -RTE_FLOW_ERROR_TYPE_ACTION error should be returned. - -This action modifies the payload of matched flows. - -Action: ``NVGRE_ENCAP`` -^^^^^^^^^^^^^^^^^^^^^^^ - -Performs a NVGRE encapsulation action by encapsulating the matched flow in the -NVGRE tunnel as defined in the``rte_flow_action_tunnel_encap`` flow item -definition. - -This action modifies the payload of matched flows. The flow definition specified -in the ``rte_flow_action_tunnel_encap`` action structure must defined a valid -NVGRE network overlay which conforms with RFC 7637 (NVGRE: Network -Virtualization Using Generic Routing Encapsulation). The pattern must be -terminated with the RTE_FLOW_ITEM_TYPE_END item type. - -.. _table_rte_flow_action_nvgre_encap: - -.. table:: NVGRE_ENCAP - - +----------------+-------------------------------------+ - | Field | Value | - +================+=====================================+ - | ``definition`` | NVGRE end-point overlay definition | - +----------------+-------------------------------------+ - -.. _table_rte_flow_action_nvgre_encap_example: - -.. table:: IPv4 NVGRE flow pattern example. - - +-------+----------+ - | Index | Item | - +=======+==========+ - | 0 | Ethernet | - +-------+----------+ - | 1 | IPv4 | - +-------+----------+ - | 2 | NVGRE | - +-------+----------+ - | 3 | END | - +-------+----------+ - -Action: ``NVGRE_DECAP`` -^^^^^^^^^^^^^^^^^^^^^^^ - -Performs a decapsulation action by stripping all headers of the NVGRE tunnel -network overlay from the matched flow. - -The flow items pattern defined for the flow rule with which a ``NVGRE_DECAP`` -action is specified, must define a valid NVGRE tunnel as per RFC7637. If the -flow pattern does not specify a valid NVGRE tunnel then a -RTE_FLOW_ERROR_TYPE_ACTION error should be returned. - -This action modifies the payload of matched flows. - Action: ``TUNNEL_ENCAP`` ^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index d1f7ebf..9505281 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -1473,40 +1473,6 @@ enum rte_flow_action_type { RTE_FLOW_ACTION_TYPE_OF_PUSH_MPLS, /** - * Encapsulate flow in VXLAN tunnel as defined in - * rte_flow_action_vxlan_encap action structure. - * - * See struct rte_flow_action_vxlan_encap. - */ - RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP, - - /** - * Decapsulate outer most VXLAN tunnel from matched flow. - * - * If flow pattern does not define a valid VXLAN tunnel (as specified by - * RFC7348) then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION - * error. - */ - RTE_FLOW_ACTION_TYPE_VXLAN_DECAP, - - /** - * Encapsulate flow in NVGRE tunnel defined in the - * rte_flow_action_nvgre_encap action structure. - * - * See struct rte_flow_action_nvgre_encap. - */ - RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP, - - /** - * Decapsulate outer most NVGRE tunnel from matched flow. - * - * If flow pattern does not define a valid NVGRE tunnel (as specified by - * RFC7637) then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION - * error. - */ - RTE_FLOW_ACTION_TYPE_NVGRE_DECAP, - - /** * Encapsulate the packet with tunnel header as defined in * rte_flow_action_tunnel_encap action structure. *