From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 94EE8A04BA; Thu, 1 Oct 2020 21:01:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DB5731D592; Thu, 1 Oct 2020 21:01:40 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 4D8E61D58F for ; Thu, 1 Oct 2020 21:01:39 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from dekelp@nvidia.com) with SMTP; 1 Oct 2020 22:01:32 +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 091J1Wjb016619; Thu, 1 Oct 2020 22:01:32 +0300 From: Dekel Peled To: orika@nvidia.com, thomas@monjalon.net, ferruh.yigit@intel.com, arybchenko@solarflare.com Cc: dev@dpdk.org, maxime.leroy@6wind.com, Dekel Peled Date: Thu, 1 Oct 2020 22:01:16 +0300 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: <209f5087596180d7866a43f0a0f12c9a032eb7ce.1601577847.git.dekelp@nvidia.com> References: <209f5087596180d7866a43f0a0f12c9a032eb7ce.1601577847.git.dekelp@nvidia.com> Subject: [dpdk-dev] [PATCH v2] 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" From: Dekel Peled 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. [1] https://mails.dpdk.org/archives/dev/2020-August/177536.html Signed-off-by: Dekel Peled --- doc/guides/rel_notes/release_20_11.rst | 7 +++++++ lib/librte_ethdev/rte_flow.h | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index 7f9d0dd..801a744 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -173,6 +173,13 @@ API Changes * ``_rte_eth_dev_callback_process()`` -> ``rte_eth_dev_callback_process()`` * ``_rte_eth_dev_reset`` -> ``rte_eth_dev_internal_reset()`` +* ethdev: Added new field ``vlan_exist`` to structure ``rte_flow_item_eth``, + indicating that at least one VLAN exists in the packet header. + +* ethdev: Added new field ``more_vlans_exist`` to structure + ``rte_flow_item_vlan``, indicating that at least one more VLAN exists in + packet header, following this VLAN. + * rawdev: Added a structure size parameter to the functions ``rte_rawdev_queue_setup()``, ``rte_rawdev_queue_conf_get()``, ``rte_rawdev_info_get()`` and ``rte_rawdev_configure()``, diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h index da8bfa5..39d04ef 100644 --- a/lib/librte_ethdev/rte_flow.h +++ b/lib/librte_ethdev/rte_flow.h @@ -723,14 +723,18 @@ struct rte_flow_item_raw { * 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 vlan_exist can be used to match specific packet types, instead + * of using the @p type field. + * This can be used to match any type of tagged packets. + * If the @p type and @p vlan_exist 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 vlan_exist:1; /**< At least one VLAN exist in header. */ + uint32_t reserved:31; /**< Reserved, must be zero. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_ETH. */ @@ -752,10 +756,16 @@ 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 more_vlans_exist can be used to match specific packet types, + * instead of using the @p inner_type field. + * This can be used to match any type of tagged packets. */ struct rte_flow_item_vlan { rte_be16_t tci; /**< Tag control information. */ rte_be16_t inner_type; /**< Inner EtherType or TPID. */ + uint32_t more_vlans_exist:1; + /**< At least one more VLAN exist in header, following this VLAN. */ + uint32_t reserved:31; /**< Reserved, must be zero. */ }; /** Default mask for RTE_FLOW_ITEM_TYPE_VLAN. */ -- 1.8.3.1