ASO meter feature may require to locate the flow
context tag action after the ASO action.
The register used for the meter tag is also used for
the meter color:
Bits[0-7] A meter color value set by the HW.
Bits[8-31] A flow meter context set by SW.
Currently the tag action for meter writes all the bits
of the meter register, so it will potentially overwrite
meter color when ASO meter action is before the tag action.
Set only 24-MSB-bits of meter register in the meter tag action.
Signed-off-by: Li Zhang <lizh@nvidia.com>
---
drivers/net/mlx5/mlx5_flow.c | 22 ++++++++++++++++------
drivers/net/mlx5/mlx5_flow.h | 2 ++
drivers/net/mlx5/mlx5_flow_dv.c | 2 ++
3 files changed, 20 insertions(+), 6 deletions(-)
@@ -4161,9 +4161,11 @@ flow_hairpin_split(struct rte_eth_dev *dev,
rte_memcpy(actions_rx, actions, sizeof(struct rte_flow_action));
actions_rx++;
set_tag = (void *)actions_rx;
- set_tag->id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_RX, 0, NULL);
+ *set_tag = (struct mlx5_rte_flow_action_set_tag) {
+ .id = mlx5_flow_get_reg_id(dev, MLX5_HAIRPIN_RX, 0, NULL),
+ .data = flow_id,
+ };
MLX5_ASSERT(set_tag->id > REG_NON);
- set_tag->data = flow_id;
tag_action->conf = set_tag;
/* Create Tx item list. */
rte_memcpy(actions_tx, actions, sizeof(struct rte_flow_action));
@@ -4296,6 +4298,7 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
struct mlx5_rte_flow_item_tag *tag_spec;
struct mlx5_rte_flow_item_tag *tag_mask;
uint32_t tag_id = 0;
+ uint32_t reg_id = 0;
bool copy_vlan = false;
/* Prepare the actions for prefix and suffix flow. */
@@ -4343,7 +4346,7 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
actions_pre++;
/* Set the tag. */
set_tag = (void *)actions_pre;
- set_tag->id = mlx5_flow_get_reg_id(dev, MLX5_MTR_SFX, 0, &error);
+ reg_id = mlx5_flow_get_reg_id(dev, MLX5_MTR_SFX, 0, &error);
mlx5_ipool_malloc(priv->sh->ipool[MLX5_IPOOL_RSS_EXPANTION_FLOW_ID],
&tag_id);
if (tag_id >= (1 << (sizeof(tag_id) * 8 - MLX5_MTR_COLOR_BITS))) {
@@ -4355,7 +4358,12 @@ flow_meter_split_prep(struct rte_eth_dev *dev,
} else if (!tag_id) {
return 0;
}
- set_tag->data = tag_id << MLX5_MTR_COLOR_BITS;
+ *set_tag = (struct mlx5_rte_flow_action_set_tag) {
+ .id = reg_id,
+ .offset = MLX5_MTR_COLOR_BITS,
+ .length = sizeof(tag_id) * 8 - MLX5_MTR_COLOR_BITS,
+ .data = tag_id,
+ };
assert(tag_action);
tag_action->conf = set_tag;
/* Prepare the suffix subflow items. */
@@ -4773,10 +4781,12 @@ flow_sample_split_prep(struct rte_eth_dev *dev,
ret = mlx5_flow_get_reg_id(dev, MLX5_APP_TAG, 0, error);
if (ret < 0)
return ret;
- set_tag->id = ret;
mlx5_ipool_malloc(priv->sh->ipool
[MLX5_IPOOL_RSS_EXPANTION_FLOW_ID], &tag_id);
- set_tag->data = tag_id;
+ *set_tag = (struct mlx5_rte_flow_action_set_tag) {
+ .id = ret,
+ .data = tag_id,
+ };
/* Prepare the suffix subflow items. */
tag_spec = (void *)(sfx_items + SAMPLE_SUFFIX_ITEM);
tag_spec->data = tag_id;
@@ -55,6 +55,8 @@ struct mlx5_rte_flow_item_tag {
/* Modify selected register. */
struct mlx5_rte_flow_action_set_tag {
enum modify_reg id;
+ uint8_t offset;
+ uint8_t length;
uint32_t data;
};
@@ -1015,6 +1015,8 @@ flow_dv_convert_action_set_reg
actions[i] = (struct mlx5_modification_cmd) {
.action_type = MLX5_MODIFICATION_TYPE_SET,
.field = reg_to_field[conf->id],
+ .offset = conf->offset,
+ .length = conf->length,
};
actions[i].data0 = rte_cpu_to_be_32(actions[i].data0);
actions[i].data1 = rte_cpu_to_be_32(conf->data);