From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 709BE4C90 for ; Fri, 5 Oct 2018 15:27:38 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Oct 2018 06:27:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,344,1534834800"; d="scan'208";a="80131909" Received: from dhamidov-mobl.ger.corp.intel.com (HELO [10.252.7.109]) ([10.252.7.109]) by orsmga006.jf.intel.com with ESMTP; 05 Oct 2018 06:27:16 -0700 To: Ori Kam , 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, shahafs@mellanox.com References: <1537116824-191205-1-git-send-email-orika@mellanox.com> <1537995646-95260-1-git-send-email-orika@mellanox.com> <1537995646-95260-4-git-send-email-orika@mellanox.com> From: Mohammad Abdul Awal Message-ID: <10c73dc1-dbc8-ce7b-cffb-42f930de28f5@intel.com> Date: Fri, 5 Oct 2018 14:27:15 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: <1537995646-95260-4-git-send-email-orika@mellanox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [dpdk-dev] [PATCH v2 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: , X-List-Received-Date: Fri, 05 Oct 2018 13:27:39 -0000 On 26/09/2018 22:00, Ori Kam wrote: > 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 | 103 ----------------------------------- > 2 files changed, 210 deletions(-) > > diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst > index 3ba8018..9e739f3 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 e29c561..55521e3 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. > * > @@ -1837,75 +1803,6 @@ struct rte_flow_action_of_push_mpls { > * @warning > * @b EXPERIMENTAL: this structure may change without prior notice > * > - * RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP > - * > - * VXLAN tunnel end-point encapsulation data definition > - * > - * The tunnel definition is provided through the flow item pattern, the > - * provided pattern must conform to RFC7348 for the tunnel specified. The flow > - * definition must be provided in order from the RTE_FLOW_ITEM_TYPE_ETH > - * definition up the end item which is specified by RTE_FLOW_ITEM_TYPE_END. > - * > - * The mask field allows user to specify which fields in the flow item > - * definitions can be ignored and which have valid data and can be used > - * verbatim. > - * > - * Note: the last field is not used in the definition of a tunnel and can be > - * ignored. > - * > - * Valid flow definition for RTE_FLOW_ACTION_TYPE_VXLAN_ENCAP include: > - * > - * - ETH / IPV4 / UDP / VXLAN / END > - * - ETH / IPV6 / UDP / VXLAN / END > - * - ETH / VLAN / IPV4 / UDP / VXLAN / END > - * > - */ > -struct rte_flow_action_vxlan_encap { > - /** > - * Encapsulating vxlan tunnel definition > - * (terminated by the END pattern item). > - */ > - struct rte_flow_item *definition; > -}; > - > -/** > - * @warning > - * @b EXPERIMENTAL: this structure may change without prior notice > - * > - * RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP > - * > - * NVGRE tunnel end-point encapsulation data definition > - * > - * The tunnel definition is provided through the flow item pattern the > - * provided pattern must conform with RFC7637. The flow definition must be > - * provided in order from the RTE_FLOW_ITEM_TYPE_ETH definition up the end item > - * which is specified by RTE_FLOW_ITEM_TYPE_END. > - * > - * The mask field allows user to specify which fields in the flow item > - * definitions can be ignored and which have valid data and can be used > - * verbatim. > - * > - * Note: the last field is not used in the definition of a tunnel and can be > - * ignored. > - * > - * Valid flow definition for RTE_FLOW_ACTION_TYPE_NVGRE_ENCAP include: > - * > - * - ETH / IPV4 / NVGRE / END > - * - ETH / VLAN / IPV6 / NVGRE / END > - * > - */ > -struct rte_flow_action_nvgre_encap { > - /** > - * Encapsulating vxlan tunnel definition > - * (terminated by the END pattern item). > - */ > - struct rte_flow_item *definition; > -}; > - > -/** > - * @warning > - * @b EXPERIMENTAL: this structure may change without prior notice > - * > * RTE_FLOW_ACTION_TYPE_TUNNEL_ENCAP > * > * Tunnel end-point encapsulation data definition Acked-by: Mohammad Abdul Awal