[v3,3/3] net/mlx5: rewrite TTL by E-Switch
Checks
Commit Message
Offload following modify TTL actions to E-Switch via
TC-Flower driver
- RTE_FLOW_ACTION_TYPE_SET_TTL
- RTE_FLOW_ACTION_TYPE_DEC_TTL
The corresponding IP protocol rte_flow_item_ipv[4|6]
must be present in rte_flow pattern otherwith PMD
return error
The example testpmd commands are:
flow create 0 transfer ingress
pattern eth / ipv4 / udp dst is 7000 / end
actions dec_ttl /
port_id id 1 / end
flow create 0 transfer ingress
pattern eth / ipv4 / udp dst is 7001 / end
actions set_ttl ttl_value 10 /
port_id id 1 / end
Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
---
drivers/net/mlx5/mlx5_flow.h | 2 +
drivers/net/mlx5/mlx5_flow_tcf.c | 84 +++++++++++++++++++++++++++++++-
2 files changed, 84 insertions(+), 2 deletions(-)
Comments
On Wed, Oct 10, 2018 at 06:06:00AM -0700, Jack Min wrote:
> Offload following modify TTL actions to E-Switch via
> TC-Flower driver
>
> - RTE_FLOW_ACTION_TYPE_SET_TTL
> - RTE_FLOW_ACTION_TYPE_DEC_TTL
>
> The corresponding IP protocol rte_flow_item_ipv[4|6]
> must be present in rte_flow pattern otherwith PMD
> return error
>
> The example testpmd commands are:
>
> flow create 0 transfer ingress
> pattern eth / ipv4 / udp dst is 7000 / end
> actions dec_ttl /
> port_id id 1 / end
>
> flow create 0 transfer ingress
> pattern eth / ipv4 / udp dst is 7001 / end
> actions set_ttl ttl_value 10 /
> port_id id 1 / end
>
> Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
> ---
Acked-by: Yongseok Koh <yskoh@mellanox.com>
But you should rebase it on your patch -
net/mlx5: rewrite IP address UDP/TCP port by E-Switch
Thanks
> drivers/net/mlx5/mlx5_flow.h | 2 +
> drivers/net/mlx5/mlx5_flow_tcf.c | 84 +++++++++++++++++++++++++++++++-
> 2 files changed, 84 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
> index cbb8c56c8..0ad8c12ea 100644
> --- a/drivers/net/mlx5/mlx5_flow.h
> +++ b/drivers/net/mlx5/mlx5_flow.h
> @@ -84,6 +84,8 @@
> #define MLX5_FLOW_ACTION_SET_IPV6_DST (1u << 14)
> #define MLX5_FLOW_ACTION_SET_TP_SRC (1u << 15)
> #define MLX5_FLOW_ACTION_SET_TP_DST (1u << 16)
> +#define MLX5_FLOW_ACTION_SET_TTL (1u << 17)
> +#define MLX5_FLOW_ACTION_DEC_TTL (1u << 18)
>
> #define MLX5_FLOW_FATE_ACTIONS \
> (MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)
> diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
> index 65e8a4b3f..af8a68529 100644
> --- a/drivers/net/mlx5/mlx5_flow_tcf.c
> +++ b/drivers/net/mlx5/mlx5_flow_tcf.c
> @@ -217,6 +217,10 @@ struct tc_pedit_sel {
> #define TP_PORT_LEN 2 /* Transport Port (UDP/TCP) Length */
> #endif
>
> +#ifndef TTL_LEN
> +#define TTL_LEN 1
> +#endif
> +
> /** Empty masks for known item types. */
> static const union {
> struct rte_flow_item_port_id port_id;
> @@ -299,13 +303,16 @@ struct flow_tcf_ptoi {
> MLX5_FLOW_ACTION_SET_IPV6_SRC | \
> MLX5_FLOW_ACTION_SET_IPV6_DST | \
> MLX5_FLOW_ACTION_SET_TP_SRC | \
> - MLX5_FLOW_ACTION_SET_TP_DST)
> + MLX5_FLOW_ACTION_SET_TP_DST | \
> + MLX5_FLOW_ACTION_SET_TTL | \
> + MLX5_FLOW_ACTION_DEC_TTL)
>
> #define MLX5_TCF_CONFIG_ACTIONS (MLX5_FLOW_ACTION_PORT_ID | \
> MLX5_FLOW_ACTION_OF_PUSH_VLAN | \
> MLX5_FLOW_ACTION_OF_SET_VLAN_VID | \
> MLX5_FLOW_ACTION_OF_SET_VLAN_PCP | \
> - MLX5_TCF_PEDIT_ACTIONS)
> + (MLX5_TCF_PEDIT_ACTIONS & \
> + ~MLX5_FLOW_ACTION_DEC_TTL))
>
> #define MAX_PEDIT_KEYS (128)
> #define SZ_PEDIT_KEY_VAL (4)
> @@ -338,6 +345,46 @@ flow_tcf_calc_pedit_keys(const uint64_t size)
> return keys;
> }
>
> +/**
> + * Set pedit key of decrease/set ttl
> + *
> + * @param[in] actions
> + * pointer to action specification
> + * @param[in,out] p_parser
> + * pointer to pedit_parser
> + * @param[in] item_flags
> + * flags of all items presented
> + */
> +static void
> +flow_tcf_pedit_key_set_dec_ttl(const struct rte_flow_action *actions,
> + struct pedit_parser *p_parser,
> + uint64_t item_flags)
> +{
> + int idx = p_parser->sel.nkeys;
> +
> + p_parser->keys[idx].mask = 0xFFFFFF00;
> + if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) {
> + p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP4;
> + p_parser->keys[idx].off =
> + offsetof(struct ipv4_hdr, time_to_live);
> + }
> + if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV6) {
> + p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP6;
> + p_parser->keys[idx].off =
> + offsetof(struct ipv6_hdr, hop_limits);
> + }
> + if (actions->type == RTE_FLOW_ACTION_TYPE_DEC_TTL) {
> + p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_ADD;
> + p_parser->keys[idx].val = 0x000000FF;
> + } else {
> + p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;
> + p_parser->keys[idx].val =
> + (__u32)((const struct rte_flow_action_set_ttl *)
> + actions->conf)->ttl_value;
> + }
> + p_parser->sel.nkeys = (++idx);
> +}
> +
> /**
> * Set pedit key of transport (TCP/UDP) port value
> *
> @@ -477,6 +524,11 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl,
> flow_tcf_pedit_key_set_tp_port(*actions,
> &p_parser, item_flags);
> break;
> + case RTE_FLOW_ACTION_TYPE_SET_TTL:
> + case RTE_FLOW_ACTION_TYPE_DEC_TTL:
> + flow_tcf_pedit_key_set_dec_ttl(*actions,
> + &p_parser, item_flags);
> + break;
> default:
> goto pedit_mnl_msg_done;
> }
> @@ -557,6 +609,14 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_action **actions,
> keys += flow_tcf_calc_pedit_keys(TP_PORT_LEN);
> flags |= MLX5_FLOW_ACTION_SET_TP_DST;
> break;
> + case RTE_FLOW_ACTION_TYPE_SET_TTL:
> + keys += flow_tcf_calc_pedit_keys(TTL_LEN);
> + flags |= MLX5_FLOW_ACTION_SET_TTL;
> + break;
> + case RTE_FLOW_ACTION_TYPE_DEC_TTL:
> + keys += flow_tcf_calc_pedit_keys(TTL_LEN);
> + flags |= MLX5_FLOW_ACTION_DEC_TTL;
> + break;
> default:
> goto get_pedit_action_size_done;
> }
> @@ -1075,6 +1135,12 @@ flow_tcf_validate(struct rte_eth_dev *dev,
> case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
> current_action_flag = MLX5_FLOW_ACTION_SET_TP_DST;
> break;
> + case RTE_FLOW_ACTION_TYPE_SET_TTL:
> + current_action_flag = MLX5_FLOW_ACTION_SET_TTL;
> + break;
> + case RTE_FLOW_ACTION_TYPE_DEC_TTL:
> + current_action_flag = MLX5_FLOW_ACTION_DEC_TTL;
> + break;
> default:
> return rte_flow_error_set(error, ENOTSUP,
> RTE_FLOW_ERROR_TYPE_ACTION,
> @@ -1169,6 +1235,16 @@ flow_tcf_validate(struct rte_eth_dev *dev,
> return rte_flow_error_set(error, EINVAL,
> RTE_FLOW_ERROR_TYPE_ACTION, actions,
> "no fate action is found");
> + if (action_flags &
> + (MLX5_FLOW_ACTION_SET_TTL | MLX5_FLOW_ACTION_DEC_TTL)) {
> + if (!(item_flags &
> + (MLX5_FLOW_LAYER_OUTER_L3_IPV4 |
> + MLX5_FLOW_LAYER_OUTER_L3_IPV6)))
> + return rte_flow_error_set(error, EINVAL,
> + RTE_FLOW_ERROR_TYPE_ACTION,
> + actions,
> + "no IP found in pattern");
> + }
> return 0;
> }
>
> @@ -1318,6 +1394,8 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[],
> case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST:
> case RTE_FLOW_ACTION_TYPE_SET_TP_SRC:
> case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
> + case RTE_FLOW_ACTION_TYPE_SET_TTL:
> + case RTE_FLOW_ACTION_TYPE_DEC_TTL:
> size += flow_tcf_get_pedit_actions_size(&actions,
> &flags);
> break;
> @@ -1862,6 +1940,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
> case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST:
> case RTE_FLOW_ACTION_TYPE_SET_TP_SRC:
> case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
> + case RTE_FLOW_ACTION_TYPE_SET_TTL:
> + case RTE_FLOW_ACTION_TYPE_DEC_TTL:
> na_act_index =
> mnl_attr_nest_start(nlh, na_act_index_cur++);
> flow_tcf_create_pedit_mnl_msg(nlh,
> --
> 2.17.1
>
@@ -84,6 +84,8 @@
#define MLX5_FLOW_ACTION_SET_IPV6_DST (1u << 14)
#define MLX5_FLOW_ACTION_SET_TP_SRC (1u << 15)
#define MLX5_FLOW_ACTION_SET_TP_DST (1u << 16)
+#define MLX5_FLOW_ACTION_SET_TTL (1u << 17)
+#define MLX5_FLOW_ACTION_DEC_TTL (1u << 18)
#define MLX5_FLOW_FATE_ACTIONS \
(MLX5_FLOW_ACTION_DROP | MLX5_FLOW_ACTION_QUEUE | MLX5_FLOW_ACTION_RSS)
@@ -217,6 +217,10 @@ struct tc_pedit_sel {
#define TP_PORT_LEN 2 /* Transport Port (UDP/TCP) Length */
#endif
+#ifndef TTL_LEN
+#define TTL_LEN 1
+#endif
+
/** Empty masks for known item types. */
static const union {
struct rte_flow_item_port_id port_id;
@@ -299,13 +303,16 @@ struct flow_tcf_ptoi {
MLX5_FLOW_ACTION_SET_IPV6_SRC | \
MLX5_FLOW_ACTION_SET_IPV6_DST | \
MLX5_FLOW_ACTION_SET_TP_SRC | \
- MLX5_FLOW_ACTION_SET_TP_DST)
+ MLX5_FLOW_ACTION_SET_TP_DST | \
+ MLX5_FLOW_ACTION_SET_TTL | \
+ MLX5_FLOW_ACTION_DEC_TTL)
#define MLX5_TCF_CONFIG_ACTIONS (MLX5_FLOW_ACTION_PORT_ID | \
MLX5_FLOW_ACTION_OF_PUSH_VLAN | \
MLX5_FLOW_ACTION_OF_SET_VLAN_VID | \
MLX5_FLOW_ACTION_OF_SET_VLAN_PCP | \
- MLX5_TCF_PEDIT_ACTIONS)
+ (MLX5_TCF_PEDIT_ACTIONS & \
+ ~MLX5_FLOW_ACTION_DEC_TTL))
#define MAX_PEDIT_KEYS (128)
#define SZ_PEDIT_KEY_VAL (4)
@@ -338,6 +345,46 @@ flow_tcf_calc_pedit_keys(const uint64_t size)
return keys;
}
+/**
+ * Set pedit key of decrease/set ttl
+ *
+ * @param[in] actions
+ * pointer to action specification
+ * @param[in,out] p_parser
+ * pointer to pedit_parser
+ * @param[in] item_flags
+ * flags of all items presented
+ */
+static void
+flow_tcf_pedit_key_set_dec_ttl(const struct rte_flow_action *actions,
+ struct pedit_parser *p_parser,
+ uint64_t item_flags)
+{
+ int idx = p_parser->sel.nkeys;
+
+ p_parser->keys[idx].mask = 0xFFFFFF00;
+ if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV4) {
+ p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP4;
+ p_parser->keys[idx].off =
+ offsetof(struct ipv4_hdr, time_to_live);
+ }
+ if (item_flags & MLX5_FLOW_LAYER_OUTER_L3_IPV6) {
+ p_parser->keys_ex[idx].htype = TCA_PEDIT_KEY_EX_HDR_TYPE_IP6;
+ p_parser->keys[idx].off =
+ offsetof(struct ipv6_hdr, hop_limits);
+ }
+ if (actions->type == RTE_FLOW_ACTION_TYPE_DEC_TTL) {
+ p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_ADD;
+ p_parser->keys[idx].val = 0x000000FF;
+ } else {
+ p_parser->keys_ex[idx].cmd = TCA_PEDIT_KEY_EX_CMD_SET;
+ p_parser->keys[idx].val =
+ (__u32)((const struct rte_flow_action_set_ttl *)
+ actions->conf)->ttl_value;
+ }
+ p_parser->sel.nkeys = (++idx);
+}
+
/**
* Set pedit key of transport (TCP/UDP) port value
*
@@ -477,6 +524,11 @@ flow_tcf_create_pedit_mnl_msg(struct nlmsghdr *nl,
flow_tcf_pedit_key_set_tp_port(*actions,
&p_parser, item_flags);
break;
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ case RTE_FLOW_ACTION_TYPE_DEC_TTL:
+ flow_tcf_pedit_key_set_dec_ttl(*actions,
+ &p_parser, item_flags);
+ break;
default:
goto pedit_mnl_msg_done;
}
@@ -557,6 +609,14 @@ flow_tcf_get_pedit_actions_size(const struct rte_flow_action **actions,
keys += flow_tcf_calc_pedit_keys(TP_PORT_LEN);
flags |= MLX5_FLOW_ACTION_SET_TP_DST;
break;
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ keys += flow_tcf_calc_pedit_keys(TTL_LEN);
+ flags |= MLX5_FLOW_ACTION_SET_TTL;
+ break;
+ case RTE_FLOW_ACTION_TYPE_DEC_TTL:
+ keys += flow_tcf_calc_pedit_keys(TTL_LEN);
+ flags |= MLX5_FLOW_ACTION_DEC_TTL;
+ break;
default:
goto get_pedit_action_size_done;
}
@@ -1075,6 +1135,12 @@ flow_tcf_validate(struct rte_eth_dev *dev,
case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
current_action_flag = MLX5_FLOW_ACTION_SET_TP_DST;
break;
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ current_action_flag = MLX5_FLOW_ACTION_SET_TTL;
+ break;
+ case RTE_FLOW_ACTION_TYPE_DEC_TTL:
+ current_action_flag = MLX5_FLOW_ACTION_DEC_TTL;
+ break;
default:
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION,
@@ -1169,6 +1235,16 @@ flow_tcf_validate(struct rte_eth_dev *dev,
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION, actions,
"no fate action is found");
+ if (action_flags &
+ (MLX5_FLOW_ACTION_SET_TTL | MLX5_FLOW_ACTION_DEC_TTL)) {
+ if (!(item_flags &
+ (MLX5_FLOW_LAYER_OUTER_L3_IPV4 |
+ MLX5_FLOW_LAYER_OUTER_L3_IPV6)))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ actions,
+ "no IP found in pattern");
+ }
return 0;
}
@@ -1318,6 +1394,8 @@ flow_tcf_get_actions_and_size(const struct rte_flow_action actions[],
case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST:
case RTE_FLOW_ACTION_TYPE_SET_TP_SRC:
case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ case RTE_FLOW_ACTION_TYPE_DEC_TTL:
size += flow_tcf_get_pedit_actions_size(&actions,
&flags);
break;
@@ -1862,6 +1940,8 @@ flow_tcf_translate(struct rte_eth_dev *dev, struct mlx5_flow *dev_flow,
case RTE_FLOW_ACTION_TYPE_SET_IPV6_DST:
case RTE_FLOW_ACTION_TYPE_SET_TP_SRC:
case RTE_FLOW_ACTION_TYPE_SET_TP_DST:
+ case RTE_FLOW_ACTION_TYPE_SET_TTL:
+ case RTE_FLOW_ACTION_TYPE_DEC_TTL:
na_act_index =
mnl_attr_nest_start(nlh, na_act_index_cur++);
flow_tcf_create_pedit_mnl_msg(nlh,