> -----Original Message-----
> From: Dekel Peled <dek...@nvidia.com>
> Sent: Thursday, October 15, 2020 6:52 PM
> Subject: [PATCH v5 1/2] ethdev: add VLAN attributes to ETH and VLAN items
>
> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmails.dp
> dk.org%2Farchives%2Fdev%2F2020-
> August%2F177536.html&data=02%7C01%7Corika%40nvidia.com%7C4325
> 4e0b28ab40e5940208d871225b10%7C43083d15727340c1b7db39efd9ccc17a%
> 7C0%7C0%7C637383739649652879&sdata=Zg9cH%2BYP%2B%2Fd0YItuAq
> 9totU3ES40i6H2ELDi74ok%2FBI%3D&reserved=0
>
> Signed-off-by: Dekel Peled <dek...@nvidia.com>
> Acked-by: Matan Azrad <ma...@nvidia.com>
> ---
> 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://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fmails.dp
> dk.org%2Farchives%2Fdev%2F2020-
> August%2F177536.html&data=02%7C01%7Corika%40nvidia.com%7C4325
> 4e0b28ab40e5940208d871225b10%7C43083d15727340c1b7db39efd9ccc17a%
> 7C0%7C0%7C637383739649652879&sdata=Zg9cH%2BYP%2B%2Fd0YItuAq
> 9totU3ES40i6H2ELDi74ok%2FBI%3D&reserved=0.
> -
> * 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. */
> --
> 1.8.3.1
Acked-by: Ori Kam <or...@nvidia.com>
Thanks,
Ori
