From: Rongwei Liu <rongweil@nvidia.com>
To: Rongwei Liu <rongweil@nvidia.com>, Matan Azrad <matan@nvidia.com>,
Slava Ovsiienko <viacheslavo@nvidia.com>,
Ori Kam <orika@nvidia.com>,
"NBU-Contact-Thomas Monjalon (EXTERNAL)" <thomas@monjalon.net>,
Aman Singh <aman.deep.singh@intel.com>,
Yuying Zhang <yuying.zhang@intel.com>,
Ferruh Yigit <ferruh.yigit@amd.com>,
Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Cc: "dev@dpdk.org" <dev@dpdk.org>, Raslan Darawsheh <rasland@nvidia.com>
Subject: RE: [PATCH v3 01/11] ethdev: add flex item modify field support
Date: Thu, 2 Feb 2023 02:59:24 +0000 [thread overview]
Message-ID: <BN9PR12MB527395431AE674FC06BFE052ABD69@BN9PR12MB5273.namprd12.prod.outlook.com> (raw)
In-Reply-To: <20230130132000.1715473-2-rongweil@nvidia.com>
Hi Andrew,
Can you share some comments on the modified version v3?
BR
Rongwei
> -----Original Message-----
> From: Rongwei Liu <rongweil@nvidia.com>
> Sent: Monday, January 30, 2023 21:20
> To: Matan Azrad <matan@nvidia.com>; Slava Ovsiienko
> <viacheslavo@nvidia.com>; Ori Kam <orika@nvidia.com>; NBU-Contact-
> Thomas Monjalon (EXTERNAL) <thomas@monjalon.net>; Aman Singh
> <aman.deep.singh@intel.com>; Yuying Zhang <yuying.zhang@intel.com>;
> Ferruh Yigit <ferruh.yigit@amd.com>; Andrew Rybchenko
> <andrew.rybchenko@oktetlabs.ru>
> Cc: dev@dpdk.org; Raslan Darawsheh <rasland@nvidia.com>
> Subject: [PATCH v3 01/11] ethdev: add flex item modify field support
>
> External email: Use caution opening links or attachments
>
>
> Add flex item as modify field destination.
> Add "struct rte_flow_item_flex_handle *flex_handle" into "struct
> rte_flow_action_modify_data" as union with existed "level" member. This new
> member is dedicated for modifying flex item.
>
> Add flex item modify field cmdline support. Now user can use testpmd cli to
> specify which flex item to be modified, either source or destination.
>
> Syntax is as below:
> modify_field op set dst_type flex_item dst_level 0 dst_offset 16 src_type value
> src_value 0x123456781020 width 8
>
> Signed-off-by: Rongwei Liu <rongweil@nvidia.com>
> Acked-by: Ori Kam <orika@nvidia.com>
> ---
> app/test-pmd/cmdline_flow.c | 89 ++++++++++++++++++++++++--
> doc/guides/prog_guide/rte_flow.rst | 41 +++++++-----
> doc/guides/rel_notes/release_23_03.rst | 4 ++
> lib/ethdev/rte_flow.h | 8 ++-
> 4 files changed, 116 insertions(+), 26 deletions(-)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 88108498e0..7c12d63cbc 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -601,10 +601,12 @@ enum index {
> ACTION_MODIFY_FIELD_DST_TYPE,
> ACTION_MODIFY_FIELD_DST_TYPE_VALUE,
> ACTION_MODIFY_FIELD_DST_LEVEL,
> + ACTION_MODIFY_FIELD_DST_LEVEL_VALUE,
> ACTION_MODIFY_FIELD_DST_OFFSET,
> ACTION_MODIFY_FIELD_SRC_TYPE,
> ACTION_MODIFY_FIELD_SRC_TYPE_VALUE,
> ACTION_MODIFY_FIELD_SRC_LEVEL,
> + ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE,
> ACTION_MODIFY_FIELD_SRC_OFFSET,
> ACTION_MODIFY_FIELD_SRC_VALUE,
> ACTION_MODIFY_FIELD_SRC_POINTER, @@ -807,7 +809,8 @@ static
> const char *const modify_field_ids[] = {
> "udp_port_src", "udp_port_dst",
> "vxlan_vni", "geneve_vni", "gtp_teid",
> "tag", "mark", "meta", "pointer", "value",
> - "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color", NULL
> + "ipv4_ecn", "ipv6_ecn", "gtp_psc_qfi", "meter_color",
> + "flex_item", NULL
> };
>
> static const char *const meter_colors[] = { @@ -2282,6 +2285,10 @@
> parse_vc_modify_field_id(struct context *ctx, const struct token *token,
> const char *str, unsigned int len, void *buf,
> unsigned int size); static int
> +parse_vc_modify_field_level(struct context *ctx, const struct token *token,
> + const char *str, unsigned int len, void *buf,
> + unsigned int size); static int
> parse_vc_action_conntrack_update(struct context *ctx, const struct token
> *token,
> const char *str, unsigned int len, void *buf,
> unsigned int size); @@ -5976,11 +5983,15 @@ static const
> struct token token_list[] = {
> .name = "dst_level",
> .help = "destination field level",
> .next = NEXT(action_modify_field_dst,
> - NEXT_ENTRY(COMMON_UNSIGNED)),
> - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
> - dst.level)),
> +
> + NEXT_ENTRY(ACTION_MODIFY_FIELD_DST_LEVEL_VALUE)),
> .call = parse_vc_conf,
> },
> + [ACTION_MODIFY_FIELD_DST_LEVEL_VALUE] = {
> + .name = "{dst_level}",
> + .help = "destination field level value",
> + .call = parse_vc_modify_field_level,
> + .comp = comp_none,
> + },
> [ACTION_MODIFY_FIELD_DST_OFFSET] = {
> .name = "dst_offset",
> .help = "destination field bit offset", @@ -6007,11 +6018,15 @@
> static const struct token token_list[] = {
> .name = "src_level",
> .help = "source field level",
> .next = NEXT(action_modify_field_src,
> - NEXT_ENTRY(COMMON_UNSIGNED)),
> - .args = ARGS(ARGS_ENTRY(struct rte_flow_action_modify_field,
> - src.level)),
> +
> + NEXT_ENTRY(ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE)),
> .call = parse_vc_conf,
> },
> + [ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE] = {
> + .name = "{src_level}",
> + .help = "source field level value",
> + .call = parse_vc_modify_field_level,
> + .comp = comp_none,
> + },
> [ACTION_MODIFY_FIELD_SRC_OFFSET] = {
> .name = "src_offset",
> .help = "source field bit offset", @@ -8477,6 +8492,66 @@
> parse_vc_modify_field_id(struct context *ctx, const struct token *token,
> return len;
> }
>
> +/** Parse level for modify_field command. */ static int
> +parse_vc_modify_field_level(struct context *ctx, const struct token *token,
> + const char *str, unsigned int len, void *buf,
> + unsigned int size) {
> + struct rte_flow_action_modify_field *action;
> + struct flex_item *fp;
> + uint32_t val;
> + struct buffer *out = buf;
> + char *end;
> +
> + (void)token;
> + (void)size;
> + if (ctx->curr != ACTION_MODIFY_FIELD_DST_LEVEL_VALUE &&
> + ctx->curr != ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE)
> + return -1;
> + if (!ctx->object)
> + return len;
> + action = ctx->object;
> + errno = 0;
> + val = strtoumax(str, &end, 0);
> + if (errno || (size_t)(end - str) != len)
> + return -1;
> + /* No need to validate action template mask value */
> + if (out->args.vc.masks) {
> + if (ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE)
> + action->dst.level = val;
> + else
> + action->src.level = val;
> + return len;
> + }
> + if ((ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE &&
> + action->dst.field == RTE_FLOW_FIELD_FLEX_ITEM) ||
> + (ctx->curr == ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE &&
> + action->src.field == RTE_FLOW_FIELD_FLEX_ITEM)) {
> + if (val >= FLEX_MAX_PARSERS_NUM) {
> + printf("Bad flex item handle\n");
> + return -1;
> + }
> + fp = flex_items[ctx->port][val];
> + if (!fp) {
> + printf("Bad flex item handle\n");
> + return -1;
> + }
> + }
> + if (ctx->curr == ACTION_MODIFY_FIELD_DST_LEVEL_VALUE) {
> + if (action->dst.field != RTE_FLOW_FIELD_FLEX_ITEM)
> + action->dst.level = val;
> + else
> + action->dst.flex_handle = fp->flex_handle;
> + } else if (ctx->curr == ACTION_MODIFY_FIELD_SRC_LEVEL_VALUE) {
> + if (action->src.field != RTE_FLOW_FIELD_FLEX_ITEM)
> + action->src.level = val;
> + else
> + action->src.flex_handle = fp->flex_handle;
> + }
> + return len;
> +}
> +
> /** Parse the conntrack update, not a rte_flow_action. */ static int
> parse_vc_action_conntrack_update(struct context *ctx, const struct token
> *token, diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index 3e6242803d..9ffd7baa7a 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -2905,6 +2905,9 @@ encapsulation level, from outermost to innermost
> (lower to higher values).
> For the tag array (in case of multiple tags are supported and present)
> ``level`` translates directly into the array index.
>
> +``flex_handle`` is used to specify the flex item pointer which is being
> +modified. ``flex_handle`` and ``level`` are mutually exclusive.
> +
> ``offset`` specifies the number of bits to skip from a field's start.
> That allows performing a partial copy of the needed part or to divide a big
> packet field into multiple smaller fields. Alternatively, ``offset`` allows @@ -
> 2952,23 +2955,27 @@ value as sequence of bytes {xxx, xxx, 0x85, xxx, xxx,
> xxx}.
>
> .. table:: destination/source field definition
>
> - +---------------+----------------------------------------------------------+
> - | Field | Value |
> -
> +===============+===============================================
> ===========+
> - | ``field`` | ID: packet field, mark, meta, tag, immediate, pointer |
> - +---------------+----------------------------------------------------------+
> - | ``level`` | encapsulation level of a packet field or tag array index |
> - +---------------+----------------------------------------------------------+
> - | ``offset`` | number of bits to skip at the beginning |
> - +---------------+----------------------------------------------------------+
> - | ``value`` | immediate value buffer (source field only, not |
> - | | applicable to destination) for RTE_FLOW_FIELD_VALUE |
> - | | field type |
> - +---------------+----------------------------------------------------------+
> - | ``pvalue`` | pointer to immediate value data (source field only, not |
> - | | applicable to destination) for RTE_FLOW_FIELD_POINTER |
> - | | field type |
> - +---------------+----------------------------------------------------------+
> + +-----------------+----------------------------------------------------------+
> + | Field | Value |
> +
> +=================+=============================================
> =============+
> + | ``field`` | ID: packet field, mark, meta, tag, immediate, pointer |
> + +-----------------+----------------------------------------------------------+
> + | ``level`` | encapsulation level of a packet field or tag array index |
> + +-----------------+----------------------------------------------------------+
> + | ``flex_handle`` | flex item handle of a packet field |
> + +-----------------+----------------------------------------------------------+
> + | ``offset`` | number of bits to skip at the beginning |
> + +-----------------+----------------------------------------------------------+
> + | ``value`` | immediate value buffer (source field only, not |
> + | | applicable to destination) for RTE_FLOW_FIELD_VALUE |
> + | | field type |
> + | | This field is only 16 bytes, maybe not big enough for |
> + | | all NICs' flex item |
> + +-----------------+----------------------------------------------------------+
> + | ``pvalue`` | pointer to immediate value data (source field only, not |
> + | | applicable to destination) for RTE_FLOW_FIELD_POINTER |
> + | | field type |
> +
> + +-----------------+---------------------------------------------------
> + -------+
>
> Action: ``CONNTRACK``
> ^^^^^^^^^^^^^^^^^^^^^
> diff --git a/doc/guides/rel_notes/release_23_03.rst
> b/doc/guides/rel_notes/release_23_03.rst
> index c15f6fbb9f..3fb6e738e2 100644
> --- a/doc/guides/rel_notes/release_23_03.rst
> +++ b/doc/guides/rel_notes/release_23_03.rst
> @@ -69,6 +69,10 @@ New Features
> ``rte_event_dev_config::nb_single_link_event_port_queues`` parameter
> required for eth_rx, eth_tx, crypto and timer eventdev adapters.
>
> +* ethdev: added a new field:
> +
> + - modify flex item: ``rte_flow_action_modify_data.flex_handle``.
> +
>
> Removed Items
> -------------
> diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index
> b60987db4b..ba9f3d50a3 100644
> --- a/lib/ethdev/rte_flow.h
> +++ b/lib/ethdev/rte_flow.h
> @@ -3528,6 +3528,7 @@ enum rte_flow_field_id {
> RTE_FLOW_FIELD_IPV6_ECN, /**< IPv6 ECN. */
> RTE_FLOW_FIELD_GTP_PSC_QFI, /**< GTP QFI. */
> RTE_FLOW_FIELD_METER_COLOR, /**< Meter color marker. */
> + RTE_FLOW_FIELD_FLEX_ITEM, /**< Flex item. */
> };
>
> /**
> @@ -3541,8 +3542,11 @@ struct rte_flow_action_modify_data {
> RTE_STD_C11
> union {
> struct {
> - /** Encapsulation level or tag index. */
> - uint32_t level;
> + /** Encapsulation level or tag index or flex item handle. */
> + union {
> + uint32_t level;
> + struct rte_flow_item_flex_handle *flex_handle;
> + };
> /** Number of bits to skip from a field. */
> uint32_t offset;
> };
> --
> 2.27.0
next prev parent reply other threads:[~2023-02-02 2:59 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-21 8:39 [RFC 0/9] support flex item matching and modify field Rongwei Liu
2022-12-21 8:39 ` [RFC 1/9] ethdev: add flex item modify field support Rongwei Liu
2023-01-11 16:34 ` Ori Kam
2023-01-19 4:58 ` [PATCH v2 00/11] add flex item support Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 01/11] ethdev: add flex item modify field support Rongwei Liu
2023-01-20 9:07 ` Andrew Rybchenko
2023-01-30 4:29 ` Rongwei Liu
2023-01-30 4:35 ` Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 00/11] add flex item support Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 01/11] ethdev: add flex item modify field support Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 02/11] app/testpmd: pass flex handle into matching mask Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 03/11] net/mlx5: enable hws flex item create Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 04/11] net/mlx5: add IPv6 protocol as flex item input Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 05/11] net/mlx5: adopt new flex item prm definition Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 06/11] net/mlx5/hws: add hws flex item matching support Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 07/11] net/mlx5: add flex item modify field implementation Rongwei Liu
2023-01-30 4:52 ` [PATCH v3 08/11] net/mlx5: return error for sws modify field Rongwei Liu
2023-01-30 4:53 ` [PATCH v3 09/11] app/testpmd: raw encap with flex item support Rongwei Liu
2023-01-30 4:53 ` [PATCH v3 10/11] doc/mlx5: update mlx5 doc Rongwei Liu
2023-01-30 4:53 ` [PATCH v3 11/11] app/testpmd: adjust cleanup sequence when quitting Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 00/11] add flex item support Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 01/11] ethdev: add flex item modify field support Rongwei Liu
2023-02-02 2:59 ` Rongwei Liu [this message]
2023-02-06 3:39 ` [PATCH v4 0/4] add flex item support Rongwei Liu
2023-02-06 3:39 ` [PATCH v4 1/4] ethdev: add flex item modify field support Rongwei Liu
2023-02-09 15:55 ` Ferruh Yigit
2023-02-06 3:39 ` [PATCH v4 2/4] app/testpmd: pass flex handle into matching mask Rongwei Liu
2023-02-06 3:39 ` [PATCH v4 3/4] app/testpmd: raw encap with flex item support Rongwei Liu
2023-02-06 3:39 ` [PATCH v4 4/4] app/testpmd: adjust cleanup sequence when quitting Rongwei Liu
2023-02-09 14:49 ` [PATCH v4 0/4] add flex item support Ferruh Yigit
2023-01-30 13:19 ` [PATCH v3 02/11] app/testpmd: pass flex handle into matching mask Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 03/11] net/mlx5: enable hws flex item create Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 04/11] net/mlx5: add IPv6 protocol as flex item input Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 05/11] net/mlx5: adopt new flex item prm definition Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 06/11] net/mlx5/hws: add hws flex item matching support Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 07/11] net/mlx5: add flex item modify field implementation Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 08/11] net/mlx5: return error for sws modify field Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 09/11] app/testpmd: raw encap with flex item support Rongwei Liu
2023-01-30 13:19 ` [PATCH v3 10/11] doc/mlx5: update mlx5 doc Rongwei Liu
2023-01-30 13:20 ` [PATCH v3 11/11] app/testpmd: adjust cleanup sequence when quitting Rongwei Liu
2023-02-03 11:00 ` Singh, Aman Deep
2023-01-19 4:58 ` [PATCH v2 02/11] app/testpmd: pass flex handle into matching mask Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 03/11] net/mlx5: enable hws flex item create Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 04/11] net/mlx5: add IPv6 protocol as flex item input Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 05/11] net/mlx5: adopt new flex item prm definition Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 06/11] net/mlx5/hws: add hws flex item matching support Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 07/11] net/mlx5: add flex item modify field implementation Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 08/11] net/mlx5: return error for sws modify field Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 09/11] app/testpmd: raw encap with flex item support Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 10/11] doc/mlx5: update mlx5 doc Rongwei Liu
2023-01-19 4:58 ` [PATCH v2 11/11] app/testpmd: adjust cleanup sequence when quitting Rongwei Liu
2022-12-21 8:39 ` [RFC 2/9] app/testpmd: add flex item modify field cmdline support Rongwei Liu
2022-12-21 8:39 ` [RFC 3/9] app/testpmd: pass flex handle into matching mask Rongwei Liu
2022-12-21 8:39 ` [RFC 4/9] net/mlx5: enable hws flex item create Rongwei Liu
2022-12-21 8:39 ` [RFC 5/9] net/mlx5: add IPv6 protocol as flex item input Rongwei Liu
2022-12-21 8:39 ` [RFC 6/9] net/mlx5/hws: add hws flex item matching support Rongwei Liu
2022-12-21 8:39 ` [RFC 7/9] net/mlx5/hws: add flex item modify field implementation Rongwei Liu
2022-12-21 8:39 ` [RFC 8/9] net/mlx5: return error for sws modify field Rongwei Liu
2022-12-21 8:40 ` [RFC 9/9] app/testpmd: raw encap with flex item support Rongwei Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=BN9PR12MB527395431AE674FC06BFE052ABD69@BN9PR12MB5273.namprd12.prod.outlook.com \
--to=rongweil@nvidia.com \
--cc=aman.deep.singh@intel.com \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@amd.com \
--cc=matan@nvidia.com \
--cc=orika@nvidia.com \
--cc=rasland@nvidia.com \
--cc=thomas@monjalon.net \
--cc=viacheslavo@nvidia.com \
--cc=yuying.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).