From patchwork Thu Oct 15 15:51:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dekel Peled X-Patchwork-Id: 80965 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9F276A04DB; Thu, 15 Oct 2020 17:53:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5BC951EB46; Thu, 15 Oct 2020 17:52:48 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 59D031EB06 for ; Thu, 15 Oct 2020 17:52:43 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from dekelp@nvidia.com) with SMTP; 15 Oct 2020 18:52:39 +0300 Received: from mtl-vdi-280.wap.labs.mlnx. (mtl-vdi-280.wap.labs.mlnx [10.228.134.250]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 09FFqcPp003312; Thu, 15 Oct 2020 18:52:39 +0300 From: Dekel Peled To: orika@nvidia.com, wenzhuo.lu@intel.com, beilei.xing@intel.com, bernard.iremonger@intel.com, mdr@ashroe.eu, nhorman@tuxdriver.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru Cc: dev@dpdk.org Date: Thu, 15 Oct 2020 18:51:46 +0300 Message-Id: <406ab1872004e841ea694e554dbc44e8dd2c9bd3.1602776948.git.dekelp@nvidia.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: <209f5087596180d7866a43f0a0f12c9a032eb7ce.1601577847.git.dekelp@nvidia.com> Subject: [dpdk-dev] [PATCH v5 1/2] ethdev: add VLAN attributes to ETH and VLAN items 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 implements the change proposes in RFC [1], adding dedicated fields to ETH and VLAN items structs, to clearly define the required characteristic of a packet, and enable precise match criteria. Documentation is updated accordingly. [1] https://mails.dpdk.org/archives/dev/2020-August/177536.html Signed-off-by: Dekel Peled Acked-by: Matan Azrad Acked-by: Ori Kam --- doc/guides/prog_guide/rte_flow.rst | 13 ++++++++++--- doc/guides/rel_notes/deprecation.rst | 5 ----- doc/guides/rel_notes/release_20_11.rst | 7 +++++++ lib/librte_ethdev/rte_flow.h | 17 +++++++++++++---- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 55497c9..b93cc77 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -907,13 +907,15 @@ EtherType/TPID provided by the subsequent pattern item. This is the same order as on the wire. If the ``type`` field contains a TPID value, then only tagged packets with the specified TPID will match the pattern. -Otherwise, only untagged packets will match the pattern. -If the ``ETH`` item is the only item in the pattern, and the ``type`` field is -not specified, then both tagged and untagged packets will match the pattern. +The field ``has_vlan`` can be used to match any type of tagged packets, +instead of using the ``type`` field. +If the ``type`` and ``has_vlan`` fields are not specified, then both tagged +and untagged packets will match the pattern. - ``dst``: destination MAC. - ``src``: source MAC. - ``type``: EtherType or TPID. +- ``has_vlan``: packet header contains at least one VLAN. - Default ``mask`` matches destination and source addresses only. Item: ``VLAN`` @@ -926,9 +928,14 @@ The corresponding standard outer EtherType (TPID) values are preceding pattern item. If a ``VLAN`` item is present in the pattern, then only tagged packets will match the pattern. +The field ``has_more_vlan`` can be used to match any type of tagged packets, +instead of using the ``inner_type field``. +If the ``inner_type`` and ``has_more_vlan`` fields are not specified, +then any tagged packets will match the pattern. - ``tci``: tag control information. - ``inner_type``: inner EtherType or TPID. +- ``has_more_vlan``: packet header contains at least one more VLAN, after this VLAN. - Default ``mask`` matches the VID part of TCI only (lower 12 bits). Item: ``IPV4`` diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index d1f5ed3..99520cd 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -154,11 +154,6 @@ Deprecation Notices as deprecated in DPDK 20.11, along with the associated macros ``ETH_MIRROR_*``. This API will be fully removed in DPDK 21.11. -* ethdev: The ``struct rte_flow_item_eth`` and ``struct rte_flow_item_vlan`` - structs will be modified, to include an additional value, indicating existence - or absence of a VLAN header following the current header, as proposed in RFC - https://mails.dpdk.org/archives/dev/2020-August/177536.html. - * security: The API ``rte_security_session_create`` takes only single mempool for session and session private data. So the application need to create mempool for twice the number of sessions needed and will also lead to diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index f8686a5..e371d39 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -321,6 +321,13 @@ API Changes As the data of ``uint8_t`` will be truncated when queue number under a TC is greater than 256. +* ethdev: Added new field ``has_vlan`` to structure ``rte_flow_item_eth``, + indicating that packet header contains at least one VLAN. + +* ethdev: Added new field ``has_more_vlan`` to structure + ``rte_flow_item_vlan``, indicating that packet header contains at least one + more VLAN, after this VLAN. + * vhost: Moved vDPA APIs from experimental to stable. * rawdev: Added a structure size parameter to the functions diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index d3e8d8a..4839528 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -728,15 +728,17 @@ struct rte_flow_item_raw { * same order as on the wire. * If the @p type field contains a TPID value, then only tagged packets with the * specified TPID will match the pattern. - * Otherwise, only untagged packets will match the pattern. - * If the @p ETH item is the only item in the pattern, and the @p type field - * is not specified, then both tagged and untagged packets will match the - * pattern. + * The field @p has_vlan can be used to match any type of tagged packets, + * instead of using the @p type field. + * If the @p type and @p has_vlan fields are not specified, then both tagged + * and untagged packets will match the pattern. */ struct rte_flow_item_eth { struct rte_ether_addr dst; /**< Destination MAC. */ struct rte_ether_addr src; /**< Source MAC. */ rte_be16_t type; /**< EtherType or TPID. */ + uint32_t has_vlan:1; /**< Packet header contains at least one VLAN. */ + uint32_t reserved:31; /**< Reserved, must be zero. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */ @@ -758,10 +760,17 @@ struct rte_flow_item_eth { * the preceding pattern item. * If a @p VLAN item is present in the pattern, then only tagged packets will * match the pattern. + * The field @p has_more_vlan can be used to match any type of tagged packets, + * instead of using the @p inner_type field. + * If the @p inner_type and @p has_more_vlan fields are not specified, + * then any tagged packets will match the pattern. */ struct rte_flow_item_vlan { rte_be16_t tci; /**< Tag control information. */ rte_be16_t inner_type; /**< Inner EtherType or TPID. */ + uint32_t has_more_vlan:1; + /**< Packet header contains at least one more VLAN, after this VLAN. */ + uint32_t reserved:31; /**< Reserved, must be zero. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_VLAN. */