Hi all,
I'd like to test this feature somehow but this patch just implements the API...
Will there
be some PMD support soon? I could see that mlx5 implements some internal hidden
RTE Flow
item SC already that matches this behaviour... It would be great to make it
available
via this TX_QUEUE feature. Any plans for this (Ori)?
Jan
On Thu, 20 Apr 2023 10:59:01 +0530
<kirankum...@marvell.com> wrote:
> From: Kiran Kumar K <kirankum...@marvell.com>
>
> Adding support for send queue flow matching item.
> This item is valid only for egress rules.
> An example use case would be that application can
> set different vlan insert rules with different PCP values
> based on tx queue number.
>
> Signed-off-by: Kiran Kumar K <kirankum...@marvell.com>
> ---
> app/test-pmd/cmdline_flow.c | 28 +++++++++++++++++++
> doc/guides/prog_guide/rte_flow.rst | 7 +++++
> doc/guides/rel_notes/release_23_07.rst | 31 ++-------------------
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 4 +++
> lib/ethdev/rte_flow.c | 1 +
> lib/ethdev/rte_flow.h | 26 +++++++++++++++++
> 6 files changed, 68 insertions(+), 29 deletions(-)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 58939ec321..a68a6080a8 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -496,6 +496,8 @@ enum index {
> ITEM_QUOTA_STATE_NAME,
> ITEM_AGGR_AFFINITY,
> ITEM_AGGR_AFFINITY_VALUE,
> + ITEM_TX_QUEUE,
> + ITEM_TX_QUEUE_VALUE,
>
> /* Validate/create actions. */
> ACTIONS,
> @@ -1452,6 +1454,7 @@ static const enum index next_item[] = {
> ITEM_METER,
> ITEM_QUOTA,
> ITEM_AGGR_AFFINITY,
> + ITEM_TX_QUEUE,
> END_SET,
> ZERO,
> };
> @@ -1953,6 +1956,12 @@ static const enum index item_aggr_affinity[] = {
> ZERO,
> };
>
> +static const enum index item_tx_queue[] = {
> + ITEM_TX_QUEUE_VALUE,
> + ITEM_NEXT,
> + ZERO,
> +};
> +
> static const enum index next_action[] = {
> ACTION_END,
> ACTION_VOID,
> @@ -6945,6 +6954,22 @@ static const struct token token_list[] = {
> .args = ARGS(ARGS_ENTRY(struct rte_flow_item_aggr_affinity,
> affinity)),
> },
> + [ITEM_TX_QUEUE] = {
> + .name = "tx_queue",
> + .help = "match on the tx queue of send packet",
> + .priv = PRIV_ITEM(TX_QUEUE,
> + sizeof(struct rte_flow_item_tx_queue)),
> + .next = NEXT(item_tx_queue),
> + .call = parse_vc,
> + },
> + [ITEM_TX_QUEUE_VALUE] = {
> + .name = "tx_queue_value",
> + .help = "tx queue value",
> + .next = NEXT(item_tx_queue, NEXT_ENTRY(COMMON_UNSIGNED),
> + item_param),
> + .args = ARGS(ARGS_ENTRY(struct rte_flow_item_tx_queue,
> + tx_queue)),
> + },
> };
>
> /** Remove and return last entry from argument stack. */
> @@ -11849,6 +11874,9 @@ flow_item_default_mask(const struct rte_flow_item
> *item)
> case RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY:
> mask = &rte_flow_item_aggr_affinity_mask;
> break;
> + case RTE_FLOW_ITEM_TYPE_TX_QUEUE:
> + mask = &rte_flow_item_tx_queue_mask;
> + break;
> default:
> break;
> }
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index 32fc45516a..7154b56330 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -1486,6 +1486,13 @@ This item is meant to use the same structure as `Item:
> PORT_REPRESENTOR`_.
>
> See also `Action: REPRESENTED_PORT`_.
>
> +Item: ``TX_QUEUE``
> +^^^^^^^^^^^^^^^^^^^^^^^
> +
> +Matches on the tx queue of send packet .
> +
> +- ``tx_queue``: Tx queue.
> +
> Item: ``AGGR_AFFINITY``
> ^^^^^^^^^^^^^^^^^^^^^^^
>
> diff --git a/doc/guides/rel_notes/release_23_07.rst
> b/doc/guides/rel_notes/release_23_07.rst
> index a9b1293689..631cbd2b58 100644
> --- a/doc/guides/rel_notes/release_23_07.rst
> +++ b/doc/guides/rel_notes/release_23_07.rst
> @@ -24,36 +24,9 @@ DPDK Release 23.07
> New Features
> ------------
>
> -.. This section should contain new features added in this release.
> - Sample format:
> +* **Added flow matching of tx queue.**
>
> - * **Add a title in the past tense with a full stop.**
> -
> - Add a short 1-2 sentence description in the past tense.
> - The description should be enough to allow someone scanning
> - the release notes to understand the new feature.
> -
> - If the feature adds a lot of sub-features you can use a bullet list
> - like this:
> -
> - * Added feature foo to do something.
> - * Enhanced feature bar to do something else.
> -
> - Refer to the previous release notes for examples.
> -
> - Suggested order in release notes items:
> - * Core libs (EAL, mempool, ring, mbuf, buses)
> - * Device abstraction libs and PMDs (ordered alphabetically by vendor
> name)
> - - ethdev (lib, PMDs)
> - - cryptodev (lib, PMDs)
> - - eventdev (lib, PMDs)
> - - etc
> - * Other libs
> - * Apps, Examples, Tools (if significant)
> -
> - This section is a comment. Do not overwrite or remove it.
> - Also, make sure to start the actual text at the margin.
> - =======================================================
> + Added ``RTE_FLOW_ITEM_TYPE_TX_QUEUE`` to match tx queue of send packet.
>
>
> Removed Items
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 8f23847859..29f7dd4428 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -3779,6 +3779,10 @@ This section lists supported pattern items and their
> attributes, if any.
>
> - ``affinity {value}``: aggregated port (starts from 1).
>
> +- ``tx_queue``: match tx queue of send packet.
> +
> + - ``tx_queue {value}``: send queue value (starts from 0).
> +
> - ``send_to_kernel``: send packets to kernel.
>
>
> diff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c
> index 69e6e749f7..f0d7f868fa 100644
> --- a/lib/ethdev/rte_flow.c
> +++ b/lib/ethdev/rte_flow.c
> @@ -164,6 +164,7 @@ static const struct rte_flow_desc_data
> rte_flow_desc_item[] = {
> MK_FLOW_ITEM(IPV6_ROUTING_EXT, sizeof(struct
> rte_flow_item_ipv6_routing_ext)),
> MK_FLOW_ITEM(QUOTA, sizeof(struct rte_flow_item_quota)),
> MK_FLOW_ITEM(AGGR_AFFINITY, sizeof(struct rte_flow_item_aggr_affinity)),
> + MK_FLOW_ITEM(TX_QUEUE, sizeof(struct rte_flow_item_tx_queue)),
> };
>
> /** Generate flow_action[] entry. */
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h
> index 713ba8b65c..e75876c371 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -672,8 +672,34 @@ enum rte_flow_item_type {
> * @see struct rte_flow_item_aggr_affinity.
> */
> RTE_FLOW_ITEM_TYPE_AGGR_AFFINITY,
> + /**
> + * Match Send Queue number.
> + * This is valid only for egress rules.
> + *
> + * @see struct rte_flow_item_tx_queue
> + */
> + RTE_FLOW_ITEM_TYPE_TX_QUEUE,
> };
>
> +/**
> + * RTE_FLOW_ITEM_TYPE_TX_QUEUE
> + *
> + * Send queue number
> + *
> + * @see struct rte_flow_item_tx_queue
> + */
> +struct rte_flow_item_tx_queue {
> + /** Send queue number that packet is being transmitted */
> + uint16_t tx_queue;
> +};
> +
> +/** Default mask for RTE_FLOW_ITEM_TX_QUEUE. */
> +#ifndef __cplusplus
> +static const struct rte_flow_item_tx_queue rte_flow_item_tx_queue_mask = {
> + .tx_queue = RTE_BE16(0xffff),
> +};
> +#endif
> +
> /**
> * @warning
> * @b EXPERIMENTAL: this API may change without prior notice.
