d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/mlx5: fix source port checking in sample flow rule

Browse Source 
The metadata register C value was lost in FDB egress while doing the
flow sampler on ConnectX-5. The FDB direction checking was decided by
the source port in the flow creation. If there's additional port item
was added in the flow match, then the actual source port was changed.

This patch adds the checking for the port id item:
RTE_FLOW_ITEM_TYPE_PORT_ID, RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT,
and RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR,
then updates FDB egress checking and the source vport metadata
from the port item, also updates the PUSH VLAN, POP VLAN and
flow sampler action validation.

Fixes: 04c0d3f20f ("net/mlx5: fix port matching in sample flow rule")
Fixes: 255b8f86eb ("net/mlx5: fix E-Switch egress mirror flow validation")
Cc: stable@dpdk.org

Signed-off-by: Jiawei Wang <jiaweiw@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
This commit is contained in:
Jiawei Wang 2022-11-02 15:44:13 +02:00 committed by Raslan Darawsheh
parent e551740696
commit e9de8f33ca
3 changed files with 105 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/net/mlx5/mlx5_flow.c
View File

@ -5932,7 +5932,8 @@ flow_check_match_action(const struct rte_flow_action actions[],
ratio = sample->ratio; ratio = sample->ratio;
sub_type = ((const struct rte_flow_action *) sub_type = ((const struct rte_flow_action *)
(sample->actions))->type; (sample->actions))->type;
if (ratio == 1 && attr->transfer) if (ratio == 1 && attr->transfer &&
sub_type != RTE_FLOW_ACTION_TYPE_END)
fdb_mirror = 1; fdb_mirror = 1;
break; break;
case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC: case RTE_FLOW_ACTION_TYPE_SET_MAC_SRC:
@ -6104,9 +6105,11 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
break; break;
case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN: case RTE_FLOW_ACTION_TYPE_OF_PUSH_VLAN:
case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID: case RTE_FLOW_ACTION_TYPE_OF_SET_VLAN_VID:
push_vlan_idx = action_idx; if (action_idx < sample_action_pos &&
if (push_vlan_idx < sample_action_pos) push_vlan_idx == -1) {
set_tag_idx = action_idx; set_tag_idx = action_idx;
push_vlan_idx = action_idx;
}
break; break;
default: default:
break; break;
@ -6169,18 +6172,20 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
.data = tag_id, .data = tag_id,
}; };
/* Prepare the suffix subflow items. */ /* Prepare the suffix subflow items. */
for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
if (items->type == RTE_FLOW_ITEM_TYPE_PORT_ID ||
items->type == RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR) {
memcpy(sfx_items, items, sizeof(*sfx_items));
sfx_items++;
}
}
tag_spec = (void *)(sfx_items + SAMPLE_SUFFIX_ITEM); tag_spec = (void *)(sfx_items + SAMPLE_SUFFIX_ITEM);
tag_spec->data = tag_id; tag_spec->data = tag_id;
tag_spec->id = set_tag->id; tag_spec->id = set_tag->id;
tag_mask = tag_spec + 1; tag_mask = tag_spec + 1;
tag_mask->data = UINT32_MAX; tag_mask->data = UINT32_MAX;
for (; items->type != RTE_FLOW_ITEM_TYPE_END; items++) {
if (items->type == RTE_FLOW_ITEM_TYPE_PORT_ID ||
items->type == RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR ||
items->type == RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT) {
memcpy(sfx_items, items, sizeof(*sfx_items));
sfx_items++;
break;
}
}
sfx_items[0] = (struct rte_flow_item){ sfx_items[0] = (struct rte_flow_item){
.type = (enum rte_flow_item_type) .type = (enum rte_flow_item_type)
MLX5_RTE_FLOW_ITEM_TYPE_TAG, MLX5_RTE_FLOW_ITEM_TYPE_TAG,
@ -6755,6 +6760,8 @@ flow_create_split_sample(struct rte_eth_dev *dev,
uint16_t jump_table = 0; uint16_t jump_table = 0;
const uint32_t next_ft_step = 1; const uint32_t next_ft_step = 1;
int ret = 0; int ret = 0;
struct mlx5_priv *item_port_priv = NULL;
const struct rte_flow_item *item;
if (priv->sampler_en) if (priv->sampler_en)
actions_n = flow_check_match_action(actions, attr, actions_n = flow_check_match_action(actions, attr,
@ -6774,8 +6781,36 @@ flow_create_split_sample(struct rte_eth_dev *dev,
RTE_FLOW_ERROR_TYPE_ACTION, RTE_FLOW_ERROR_TYPE_ACTION,
NULL, "no memory to split " NULL, "no memory to split "
"sample flow"); "sample flow");
for (item = items; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
if (item->type == RTE_FLOW_ITEM_TYPE_PORT_ID) {
const struct rte_flow_item_port_id *spec;
spec = (const struct rte_flow_item_port_id *)item->spec;
if (spec)
item_port_priv =
mlx5_port_to_eswitch_info(spec->id, true);
break;
} else if (item->type == RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT) {
const struct rte_flow_item_ethdev *spec;
spec = (const struct rte_flow_item_ethdev *)item->spec;
if (spec)
item_port_priv =
mlx5_port_to_eswitch_info(spec->port_id, true);
break;
} else if (item->type == RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR) {
const struct rte_flow_item_ethdev *spec;
spec = (const struct rte_flow_item_ethdev *)item->spec;
if (spec)
item_port_priv =
mlx5_port_to_eswitch_info(spec->port_id, true);
break;
}
}
/* The representor_id is UINT16_MAX for uplink. */ /* The representor_id is UINT16_MAX for uplink. */
fdb_tx = (attr->transfer && priv->representor_id != UINT16_MAX); fdb_tx = (attr->transfer &&
flow_source_vport_representor(priv, item_port_priv));
/* /*
* When reg_c_preserve is set, metadata registers Cx preserve * When reg_c_preserve is set, metadata registers Cx preserve
* their value even through packet duplication. * their value even through packet duplication.

19
drivers/net/mlx5/mlx5_flow.h
View File

@ -2118,6 +2118,25 @@ rte_col_2_mlx5_col(enum rte_color rcol)
return MLX5_FLOW_COLOR_UNDEFINED; return MLX5_FLOW_COLOR_UNDEFINED;
} }
/**
* Indicates whether flow source vport is representor port.
*
* @param[in] priv
* Pointer to device private context structure.
* @param[in] act_priv
* Pointer to actual device private context structure if have.
*
* @return
* True when the flow source vport is representor port, false otherwise.
*/
static inline bool
flow_source_vport_representor(struct mlx5_priv *priv, struct mlx5_priv *act_priv)
{
MLX5_ASSERT(priv);
return (!act_priv ? (priv->representor_id != UINT16_MAX) :
(act_priv->representor_id != UINT16_MAX));
}
/* All types of Ethernet patterns used in control flow rules. */ /* All types of Ethernet patterns used in control flow rules. */
enum mlx5_flow_ctrl_rx_eth_pattern_type { enum mlx5_flow_ctrl_rx_eth_pattern_type {
MLX5_FLOW_HW_CTRL_RX_ETH_PATTERN_ALL = 0, MLX5_FLOW_HW_CTRL_RX_ETH_PATTERN_ALL = 0,

63
drivers/net/mlx5/mlx5_flow_dv.c
View File

@ -2208,6 +2208,7 @@ flow_dv_validate_item_port_id(struct rte_eth_dev *dev,
const struct rte_flow_item *item, const struct rte_flow_item *item,
const struct rte_flow_attr *attr, const struct rte_flow_attr *attr,
uint64_t item_flags, uint64_t item_flags,
struct mlx5_priv **act_priv,
struct rte_flow_error *error) struct rte_flow_error *error)
{ {
const struct rte_flow_item_port_id *spec = item->spec; const struct rte_flow_item_port_id *spec = item->spec;
@ -2266,6 +2267,7 @@ flow_dv_validate_item_port_id(struct rte_eth_dev *dev,
RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec, RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec,
"cannot match on a port from a" "cannot match on a port from a"
" different E-Switch"); " different E-Switch");
*act_priv = esw_priv;
return 0; return 0;
} }
@ -2291,6 +2293,7 @@ flow_dv_validate_item_represented_port(struct rte_eth_dev *dev,
const struct rte_flow_item *item, const struct rte_flow_item *item,
const struct rte_flow_attr *attr, const struct rte_flow_attr *attr,
uint64_t item_flags, uint64_t item_flags,
struct mlx5_priv **act_priv,
struct rte_flow_error *error) struct rte_flow_error *error)
{ {
const struct rte_flow_item_ethdev *spec = item->spec; const struct rte_flow_item_ethdev *spec = item->spec;
@ -2340,6 +2343,7 @@ flow_dv_validate_item_represented_port(struct rte_eth_dev *dev,
return rte_flow_error_set(error, EINVAL, return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec, RTE_FLOW_ERROR_TYPE_ITEM_SPEC, spec,
"cannot match on a port from a different E-Switch"); "cannot match on a port from a different E-Switch");
*act_priv = esw_priv;
return 0; return 0;
} }
@ -2860,30 +2864,12 @@ flow_dv_validate_action_pop_vlan(struct rte_eth_dev *dev,
struct rte_flow_error *error) struct rte_flow_error *error)
{ {
const struct mlx5_priv *priv = dev->data->dev_private; const struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_dev_ctx_shared *sh = priv->sh;
bool direction_error = false;
if (!priv->sh->pop_vlan_action) if (!priv->sh->pop_vlan_action)
return rte_flow_error_set(error, ENOTSUP, return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED, RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL, NULL,
"pop vlan action is not supported"); "pop vlan action is not supported");
/* Pop VLAN is not supported in egress except for CX6 FDB mode. */
if (attr->transfer) {
bool fdb_tx = priv->representor_id != UINT16_MAX;
bool is_cx5 = sh->steering_format_version ==
MLX5_STEERING_LOGIC_FORMAT_CONNECTX_5;
if (fdb_tx && is_cx5)
direction_error = true;
} else if (attr->egress) {
direction_error = true;
}
if (direction_error)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
NULL,
"pop vlan action not supported for egress");
if (action_flags & MLX5_FLOW_VLAN_ACTIONS) if (action_flags & MLX5_FLOW_VLAN_ACTIONS)
return rte_flow_error_set(error, ENOTSUP, return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION, action, RTE_FLOW_ERROR_TYPE_ACTION, action,
@ -5794,6 +5780,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
const struct rte_flow_action_count **count, const struct rte_flow_action_count **count,
int *fdb_mirror_limit, int *fdb_mirror_limit,
bool root, bool root,
struct mlx5_priv *act_priv,
struct rte_flow_error *error) struct rte_flow_error *error)
{ {
struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_priv *priv = dev->data->dev_private;
@ -5982,7 +5969,7 @@ flow_dv_validate_action_sample(uint64_t *action_flags,
"E-Switch must has a dest " "E-Switch must has a dest "
"port for mirroring"); "port for mirroring");
if (!priv->sh->cdev->config.hca_attr.reg_c_preserve && if (!priv->sh->cdev->config.hca_attr.reg_c_preserve &&
priv->representor_id != UINT16_MAX) flow_source_vport_representor(priv, act_priv))
*fdb_mirror_limit = 1; *fdb_mirror_limit = 1;
} }
/* Continue validation for Xcap actions.*/ /* Continue validation for Xcap actions.*/
@ -7099,6 +7086,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
uint32_t tag_id = 0; uint32_t tag_id = 0;
const struct rte_flow_action_age *non_shared_age = NULL; const struct rte_flow_action_age *non_shared_age = NULL;
const struct rte_flow_action_count *count = NULL; const struct rte_flow_action_count *count = NULL;
struct mlx5_priv *act_priv = NULL;
if (items == NULL) if (items == NULL)
return -1; return -1;
@ -7148,7 +7136,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
break; break;
case RTE_FLOW_ITEM_TYPE_PORT_ID: case RTE_FLOW_ITEM_TYPE_PORT_ID:
ret = flow_dv_validate_item_port_id ret = flow_dv_validate_item_port_id
(dev, items, attr, item_flags, error); (dev, items, attr, item_flags, &act_priv, error);
if (ret < 0) if (ret < 0)
return ret; return ret;
last_item = MLX5_FLOW_ITEM_PORT_ID; last_item = MLX5_FLOW_ITEM_PORT_ID;
@ -7157,7 +7145,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
case RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT: case RTE_FLOW_ITEM_TYPE_REPRESENTED_PORT:
case RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR: case RTE_FLOW_ITEM_TYPE_PORT_REPRESENTOR:
ret = flow_dv_validate_item_represented_port ret = flow_dv_validate_item_represented_port
(dev, items, attr, item_flags, error); (dev, items, attr, item_flags, &act_priv, error);
if (ret < 0) if (ret < 0)
return ret; return ret;
last_item = MLX5_FLOW_ITEM_REPRESENTED_PORT; last_item = MLX5_FLOW_ITEM_REPRESENTED_PORT;
@ -8035,6 +8023,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
&sample_count, &sample_count,
&fdb_mirror_limit, &fdb_mirror_limit,
is_root, is_root,
act_priv,
error); error);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -8211,7 +8200,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
bool direction_error = false; bool direction_error = false;
if (attr->transfer) { if (attr->transfer) {
bool fdb_tx = priv->representor_id != UINT16_MAX; bool fdb_tx = flow_source_vport_representor(priv, act_priv);
bool is_cx5 = sh->steering_format_version == bool is_cx5 = sh->steering_format_version ==
MLX5_STEERING_LOGIC_FORMAT_CONNECTX_5; MLX5_STEERING_LOGIC_FORMAT_CONNECTX_5;
@ -8243,6 +8232,27 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
"multiple VLAN actions"); "multiple VLAN actions");
} }
} }
/* Pop VLAN is not supported in egress except for NICs newer than CX5. */
if (action_flags & MLX5_FLOW_ACTION_OF_POP_VLAN) {
struct mlx5_dev_ctx_shared *sh = priv->sh;
bool direction_error = false;
if (attr->transfer) {
bool fdb_tx = flow_source_vport_representor(priv, act_priv);
bool is_cx5 = sh->steering_format_version ==
MLX5_STEERING_LOGIC_FORMAT_CONNECTX_5;
if (fdb_tx && is_cx5)
direction_error = true;
} else if (attr->egress) {
direction_error = true;
}
if (direction_error)
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
NULL,
"pop vlan action not supported for egress");
}
if (action_flags & MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY) { if (action_flags & MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY) {
if ((action_flags & (MLX5_FLOW_FATE_ACTIONS & if ((action_flags & (MLX5_FLOW_FATE_ACTIONS &
~MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)) && ~MLX5_FLOW_ACTION_METER_WITH_TERMINATED_POLICY)) &&
@ -8361,6 +8371,7 @@ flow_dv_prepare(struct rte_eth_dev *dev,
wks->skip_matcher_reg = 0; wks->skip_matcher_reg = 0;
wks->policy = NULL; wks->policy = NULL;
wks->final_policy = NULL; wks->final_policy = NULL;
wks->vport_meta_tag = 0;
/* In case of corrupting the memory. */ /* In case of corrupting the memory. */
if (wks->flow_idx >= MLX5_NUM_MAX_DEV_FLOWS) { if (wks->flow_idx >= MLX5_NUM_MAX_DEV_FLOWS) {
rte_flow_error_set(error, ENOSPC, rte_flow_error_set(error, ENOSPC,
@ -10046,10 +10057,12 @@ flow_dv_translate_item_port_id(struct rte_eth_dev *dev, void *key,
{ {
const struct rte_flow_item_port_id *pid_m = item ? item->mask : NULL; const struct rte_flow_item_port_id *pid_m = item ? item->mask : NULL;
const struct rte_flow_item_port_id *pid_v = item ? item->spec : NULL; const struct rte_flow_item_port_id *pid_v = item ? item->spec : NULL;
struct mlx5_flow_workspace *wks = mlx5_flow_get_thread_workspace();
struct mlx5_priv *priv; struct mlx5_priv *priv;
uint16_t mask, id; uint16_t mask, id;
uint32_t vport_meta; uint32_t vport_meta;
MLX5_ASSERT(wks);
if (pid_v && pid_v->id == MLX5_PORT_ESW_MGR) { if (pid_v && pid_v->id == MLX5_PORT_ESW_MGR) {
flow_dv_translate_item_source_vport(key, flow_dv_translate_item_source_vport(key,
key_type & MLX5_SET_MATCHER_V ? key_type & MLX5_SET_MATCHER_V ?
@ -10067,6 +10080,7 @@ flow_dv_translate_item_port_id(struct rte_eth_dev *dev, void *key,
} else { } else {
id = priv->vport_id; id = priv->vport_id;
vport_meta = priv->vport_meta_tag; vport_meta = priv->vport_meta_tag;
wks->vport_meta_tag = vport_meta;
} }
/* /*
* Translate to vport field or to metadata, depending on mode. * Translate to vport field or to metadata, depending on mode.
@ -12238,6 +12252,9 @@ flow_dv_translate_action_sample(struct rte_eth_dev *dev,
uint32_t action_in[MLX5_ST_SZ_DW(set_action_in)]; uint32_t action_in[MLX5_ST_SZ_DW(set_action_in)];
uint64_t set_action; uint64_t set_action;
} action_ctx = { .set_action = 0 }; } action_ctx = { .set_action = 0 };
uint32_t vport_meta_tag = wks->vport_meta_tag ?
wks->vport_meta_tag :
priv->vport_meta_tag;
res->ft_type = MLX5DV_FLOW_TABLE_TYPE_FDB; res->ft_type = MLX5DV_FLOW_TABLE_TYPE_FDB;
MLX5_SET(set_action_in, action_ctx.action_in, action_type, MLX5_SET(set_action_in, action_ctx.action_in, action_type,
@ -12245,7 +12262,7 @@ flow_dv_translate_action_sample(struct rte_eth_dev *dev,
MLX5_SET(set_action_in, action_ctx.action_in, field, MLX5_SET(set_action_in, action_ctx.action_in, field,
MLX5_MODI_META_REG_C_0); MLX5_MODI_META_REG_C_0);
MLX5_SET(set_action_in, action_ctx.action_in, data, MLX5_SET(set_action_in, action_ctx.action_in, data,
priv->vport_meta_tag); vport_meta_tag);
res->set_action = action_ctx.set_action; res->set_action = action_ctx.set_action;
} else if (attr->ingress) { } else if (attr->ingress) {
res->ft_type = MLX5DV_FLOW_TABLE_TYPE_NIC_RX; res->ft_type = MLX5DV_FLOW_TABLE_TYPE_NIC_RX;