> -----Original Message-----
> From: Suanming Mou <suanmi...@mellanox.com>
> Sent: Monday, December 16, 2019 5:42 AM
> To: Adrien Mazarguil <adrien.mazarg...@6wind.com>; Wenzhuo Lu
> <wenzhuo...@intel.com>; Jingjing Wu <jingjing...@intel.com>; Bernard
> Iremonger <bernard.iremon...@intel.com>; John McNamara
> <john.mcnam...@intel.com>; Marko Kovacevic
> <marko.kovace...@intel.com>; Thomas Monjalon <tho...@monjalon.net>;
> Ferruh Yigit <ferruh.yi...@intel.com>; Andrew Rybchenko
> <arybche...@solarflare.com>
> Cc: dev@dpdk.org; Shahaf Shuler <shah...@mellanox.com>; Ori Kam
> <or...@mellanox.com>; Matan Azrad <ma...@mellanox.com>; Slava
> Ovsiienko <viachesl...@mellanox.com>
> Subject: [RFC v3 1/2] ethdev: add IPv4/IPv6 DSCP rewrite action
>
> For some overlay network, such as VXLAN, the DSCP field in the new outer
> IP header after VXLAN decapsulation may need to be updated accordingly.
>
> This commit introduce the DSCP modify action for IPv4 and IPv6.
>
> Signed-off-by: Suanming Mou <suanmi...@mellanox.com>
> Acked-by: Andrew Rybchenko <arybche...@solarflare.com>
> ---
>
> v3:
> * Add testpmd code.
> * Add one more commit support action in mlx5 pmd code.
>
> v2:
> * Add space to IPv4/6 DSCP.
> * Fix typo.
>
> ---
Acked-by: Ori Kam <or...@mellanox.com>
Best,
Ori
> app/test-pmd/cmdline_flow.c | 50
> +++++++++++++++++++++++++++++
> doc/guides/prog_guide/rte_flow.rst | 40 +++++++++++++++++++++++
> doc/guides/testpmd_app_ug/testpmd_funcs.rst | 8 +++++
> lib/librte_ethdev/rte_flow.c | 2 ++
> lib/librte_ethdev/rte_flow.h | 31 ++++++++++++++++++
> 5 files changed, 131 insertions(+)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 99dade7..af94dbe 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -326,6 +326,10 @@ enum index {
> ACTION_SET_META,
> ACTION_SET_META_DATA,
> ACTION_SET_META_MASK,
> + ACTION_SET_IPV4_DSCP,
> + ACTION_SET_IPV4_DSCP_VALUE,
> + ACTION_SET_IPV6_DSCP,
> + ACTION_SET_IPV6_DSCP_VALUE,
> };
>
> /** Maximum size for pattern in struct rte_flow_item_raw. */
> @@ -1087,6 +1091,8 @@ struct parse_action_priv {
> ACTION_RAW_DECAP,
> ACTION_SET_TAG,
> ACTION_SET_META,
> + ACTION_SET_IPV4_DSCP,
> + ACTION_SET_IPV6_DSCP,
> ZERO,
> };
>
> @@ -1300,6 +1306,18 @@ struct parse_action_priv {
> ZERO,
> };
>
> +static const enum index action_set_ipv4_dscp[] = {
> + ACTION_SET_IPV4_DSCP_VALUE,
> + ACTION_NEXT,
> + ZERO,
> +};
> +
> +static const enum index action_set_ipv6_dscp[] = {
> + ACTION_SET_IPV6_DSCP_VALUE,
> + ACTION_NEXT,
> + ZERO,
> +};
> +
> static int parse_set_raw_encap_decap(struct context *, const struct token
> *,
> const char *, unsigned int,
> void *, unsigned int);
> @@ -3493,6 +3511,38 @@ static int comp_set_raw_index(struct context *,
> const struct token *,
> (struct rte_flow_action_set_meta, mask)),
> .call = parse_vc_conf,
> },
> + [ACTION_SET_IPV4_DSCP] = {
> + .name = "set_ipv4_dscp",
> + .help = "set dscp value",
> + .priv = PRIV_ACTION(SET_IPV4_DSCP,
> + sizeof(struct rte_flow_action_set_dscp)),
> + .next = NEXT(action_set_ipv4_dscp),
> + .call = parse_vc,
> + },
> + [ACTION_SET_IPV4_DSCP_VALUE] = {
> + .name = "dscp_value",
> + .help = "new IPv4 DSCP value to set",
> + .next = NEXT(action_set_ipv4_dscp,
> NEXT_ENTRY(UNSIGNED)),
> + .args = ARGS(ARGS_ENTRY
> + (struct rte_flow_action_set_dscp, dscp)),
> + .call = parse_vc_conf,
> + },
> + [ACTION_SET_IPV6_DSCP] = {
> + .name = "set_ipv6_dscp",
> + .help = "set DSCP value",
> + .priv = PRIV_ACTION(SET_IPV6_DSCP,
> + sizeof(struct rte_flow_action_set_dscp)),
> + .next = NEXT(action_set_ipv6_dscp),
> + .call = parse_vc,
> + },
> + [ACTION_SET_IPV6_DSCP_VALUE] = {
> + .name = "dscp_value",
> + .help = "new IPv6 DSCP value to set",
> + .next = NEXT(action_set_ipv6_dscp,
> NEXT_ENTRY(UNSIGNED)),
> + .args = ARGS(ARGS_ENTRY
> + (struct rte_flow_action_set_dscp, dscp)),
> + .call = parse_vc_conf,
> + },
> };
>
> /** Remove and return last entry from argument stack. */
> diff --git a/doc/guides/prog_guide/rte_flow.rst
> b/doc/guides/prog_guide/rte_flow.rst
> index a254c81..2f21309 100644
> --- a/doc/guides/prog_guide/rte_flow.rst
> +++ b/doc/guides/prog_guide/rte_flow.rst
> @@ -2558,6 +2558,46 @@ the other path depending on HW capability.
> | ``mask`` | bit-mask applies to "data" |
> +----------+----------------------------+
>
> +Action: ``SET_IPV4_DSCP``
> +^^^^^^^^^^^^^^^^^^^^^^^^^
> +
> +Set IPv4 DSCP.
> +
> +Modify DSCP in IPv4 header.
> +
> +It must be used with RTE_FLOW_ITEM_TYPE_IPV4 in pattern.
> +Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
> +
> +.. _table_rte_flow_action_set_ipv4_dscp:
> +
> +.. table:: SET_IPV4_DSCP
> +
> + +-----------+---------------------------------+
> + | Field | Value |
> + +===========+=================================+
> + | ``dscp`` | DSCP in low 6 bits, rest ignore |
> + +-----------+---------------------------------+
> +
> +Action: ``SET_IPV6_DSCP``
> +^^^^^^^^^^^^^^^^^^^^^^^^^
> +
> +Set IPv6 DSCP.
> +
> +Modify DSCP in IPv6 header.
> +
> +It must be used with RTE_FLOW_ITEM_TYPE_IPV6 in pattern.
> +Otherwise, RTE_FLOW_ERROR_TYPE_ACTION error will be returned.
> +
> +.. _table_rte_flow_action_set_ipv6_dscp:
> +
> +.. table:: SET_IPV6_DSCP
> +
> + +-----------+---------------------------------+
> + | Field | Value |
> + +===========+=================================+
> + | ``dscp`` | DSCP in low 6 bits, rest ignore |
> + +-----------+---------------------------------+
> +
> Negative types
> ~~~~~~~~~~~~~~
>
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index 10aabf5..3baaacb 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -4228,6 +4228,14 @@ This section lists supported actions and their
> attributes, if any.
>
> - ``value {unsigned}``: Value to decrease TCP acknowledgment number by.
>
> +- ``set_ipv4_dscp``: Set IPv4 DSCP value with specified value
> +
> + - ``dscp_value {unsigned}``: The new DSCP value to be set
> +
> +- ``set_ipv6_dscp``: Set IPv6 DSCP value with specified value
> +
> + - ``dscp_value {unsigned}``: The new DSCP value to be set
> +
> Destroying flow rules
> ~~~~~~~~~~~~~~~~~~~~~
>
> diff --git a/lib/librte_ethdev/rte_flow.c b/lib/librte_ethdev/rte_flow.c
> index 87a3e8c..b86aee3 100644
> --- a/lib/librte_ethdev/rte_flow.c
> +++ b/lib/librte_ethdev/rte_flow.c
> @@ -168,6 +168,8 @@ struct rte_flow_desc_data {
> MK_FLOW_ACTION(DEC_TCP_ACK, sizeof(rte_be32_t)),
> MK_FLOW_ACTION(SET_TAG, sizeof(struct
> rte_flow_action_set_tag)),
> MK_FLOW_ACTION(SET_META, sizeof(struct
> rte_flow_action_set_meta)),
> + MK_FLOW_ACTION(SET_IPV4_DSCP, sizeof(struct
> rte_flow_action_set_dscp)),
> + MK_FLOW_ACTION(SET_IPV6_DSCP, sizeof(struct
> rte_flow_action_set_dscp)),
> };
>
> int
> diff --git a/lib/librte_ethdev/rte_flow.h b/lib/librte_ethdev/rte_flow.h
> index 452d359..76bf080 100644
> --- a/lib/librte_ethdev/rte_flow.h
> +++ b/lib/librte_ethdev/rte_flow.h
> @@ -2004,6 +2004,26 @@ enum rte_flow_action_type {
> * See struct rte_flow_action_set_meta.
> */
> RTE_FLOW_ACTION_TYPE_SET_META,
> +
> + /**
> + * Modify IPv4 DSCP in the outermost IP header.
> + *
> + * If flow pattern does not define a valid
> RTE_FLOW_ITEM_TYPE_IPV4,
> + * then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION
> error.
> + *
> + * See struct rte_flow_action_set_dscp.
> + */
> + RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP,
> +
> + /**
> + * Modify IPv6 DSCP in the outermost IP header.
> + *
> + * If flow pattern does not define a valid
> RTE_FLOW_ITEM_TYPE_IPV6,
> + * then the PMD should return a RTE_FLOW_ERROR_TYPE_ACTION
> error.
> + *
> + * See struct rte_flow_action_set_dscp.
> + */
> + RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP,
> };
>
> /**
> @@ -2530,6 +2550,17 @@ struct rte_flow_action_set_meta {
> uint32_t mask;
> };
>
> +/**
> + * RTE_FLOW_ACTION_TYPE_SET_IPV4_DSCP
> + * RTE_FLOW_ACTION_TYPE_SET_IPV6_DSCP
> + *
> + * Set the DSCP value for IPv4/IPv6 header.
> + * DSCP in low 6 bits, rest ignored.
> + */
> +struct rte_flow_action_set_dscp {
> + uint8_t dscp;
> +};
> +
> /* Mbuf dynamic field offset for metadata. */
> extern int rte_flow_dynf_metadata_offs;
>
> --
> 1.8.3.1
