From: Alexander Kozyrev <akozy...@nvidia.com>
Add ability to create an indirect action handle for METER_MARK.
It allows to share one Meter between several different actions.
Signed-off-by: Alexander Kozyrev <akozy...@nvidia.com>
---
doc/guides/nics/mlx5.rst | 1 +
drivers/net/mlx5/mlx5.c | 4 +-
drivers/net/mlx5/mlx5.h | 33 ++-
drivers/net/mlx5/mlx5_flow.c | 6 +
drivers/net/mlx5/mlx5_flow.h | 20 +-
drivers/net/mlx5/mlx5_flow_aso.c | 141 ++++++++--
drivers/net/mlx5/mlx5_flow_dv.c | 145 +++++++++-
drivers/net/mlx5/mlx5_flow_hw.c | 437 +++++++++++++++++++++++++----
drivers/net/mlx5/mlx5_flow_meter.c | 92 +++++-
9 files changed, 774 insertions(+), 105 deletions(-)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index 0c7bd042a4..fc823111c6 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -105,6 +105,7 @@ Features
- Sub-Function representors.
- Sub-Function.
- Matching on represented port.
+- Meter color.
Limitations
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 6490ac636c..64a0e6f31d 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -442,7 +442,7 @@ mlx5_flow_aso_age_mng_init(struct mlx5_dev_ctx_shared *sh)
rte_errno = ENOMEM;
return -ENOMEM;
}
- err = mlx5_aso_queue_init(sh, ASO_OPC_MOD_FLOW_HIT);
+ err = mlx5_aso_queue_init(sh, ASO_OPC_MOD_FLOW_HIT, 1);
if (err) {
mlx5_free(sh->aso_age_mng);
return -1;
@@ -763,7 +763,7 @@ mlx5_flow_aso_ct_mng_init(struct mlx5_dev_ctx_shared *sh)
rte_errno = ENOMEM;
return -rte_errno;
}
- err = mlx5_aso_queue_init(sh, ASO_OPC_MOD_CONNECTION_TRACKING);
+ err = mlx5_aso_queue_init(sh, ASO_OPC_MOD_CONNECTION_TRACKING,
MLX5_ASO_CT_SQ_NUM);
if (err) {
mlx5_free(sh->ct_mng);
/* rte_errno should be extracted from the failure. */
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index e78ed958c8..d3267fafda 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -976,12 +976,16 @@ enum mlx5_aso_mtr_type {
/* Generic aso_flow_meter information. */
struct mlx5_aso_mtr {
- LIST_ENTRY(mlx5_aso_mtr) next;
+ union {
+ LIST_ENTRY(mlx5_aso_mtr) next;
+ struct mlx5_aso_mtr_pool *pool;
+ };
enum mlx5_aso_mtr_type type;
struct mlx5_flow_meter_info fm;
/**< Pointer to the next aso flow meter structure. */
uint8_t state; /**< ASO flow meter state. */
uint32_t offset;
+ enum rte_color init_color;
};
/* Generic aso_flow_meter pool structure. */
@@ -990,7 +994,11 @@ struct mlx5_aso_mtr_pool {
/*Must be the first in pool*/
struct mlx5_devx_obj *devx_obj;
/* The devx object of the minimum aso flow meter ID. */
+ struct mlx5dr_action *action; /* HWS action. */
+ struct mlx5_indexed_pool *idx_pool; /* HWS index pool. */
uint32_t index; /* Pool index in management structure. */
+ uint32_t nb_sq; /* Number of ASO SQ. */
+ struct mlx5_aso_sq *sq; /* ASO SQs. */
};
LIST_HEAD(aso_meter_list, mlx5_aso_mtr);
@@ -1685,6 +1693,7 @@ struct mlx5_priv {
struct mlx5_aso_ct_pools_mng *ct_mng;
/* Management data for ASO connection tracking. */
struct mlx5_aso_ct_pool *hws_ctpool; /* HW steering's CT pool. */
+ struct mlx5_aso_mtr_pool *hws_mpool; /* HW steering's Meter pool. */
#endif
};
@@ -2005,7 +2014,8 @@ void mlx5_pmd_socket_uninit(void);
int mlx5_flow_meter_init(struct rte_eth_dev *dev,
uint32_t nb_meters,
uint32_t nb_meter_profiles,
- uint32_t nb_meter_policies);
+ uint32_t nb_meter_policies,
+ uint32_t nb_queues);
void mlx5_flow_meter_uninit(struct rte_eth_dev *dev);
int mlx5_flow_meter_ops_get(struct rte_eth_dev *dev, void *arg);
struct mlx5_flow_meter_info *mlx5_flow_meter_find(struct mlx5_priv *priv,
@@ -2074,15 +2084,24 @@ eth_tx_burst_t mlx5_select_tx_function(struct
rte_eth_dev *dev);
/* mlx5_flow_aso.c */
+int mlx5_aso_mtr_queue_init(struct mlx5_dev_ctx_shared *sh,
+ struct mlx5_aso_mtr_pool *hws_pool,
+ struct mlx5_aso_mtr_pools_mng *pool_mng,
+ uint32_t nb_queues);
+void mlx5_aso_mtr_queue_uninit(struct mlx5_dev_ctx_shared *sh,
+ struct mlx5_aso_mtr_pool *hws_pool,
+ struct mlx5_aso_mtr_pools_mng *pool_mng);
int mlx5_aso_queue_init(struct mlx5_dev_ctx_shared *sh,
- enum mlx5_access_aso_opc_mod aso_opc_mod);
+ enum mlx5_access_aso_opc_mod aso_opc_mode,
+ uint32_t nb_queues);
int mlx5_aso_flow_hit_queue_poll_start(struct mlx5_dev_ctx_shared *sh);
int mlx5_aso_flow_hit_queue_poll_stop(struct mlx5_dev_ctx_shared *sh);
void mlx5_aso_queue_uninit(struct mlx5_dev_ctx_shared *sh,
- enum mlx5_access_aso_opc_mod aso_opc_mod);
-int mlx5_aso_meter_update_by_wqe(struct mlx5_dev_ctx_shared *sh,
- struct mlx5_aso_mtr *mtr, struct mlx5_mtr_bulk *bulk);
-int mlx5_aso_mtr_wait(struct mlx5_dev_ctx_shared *sh,
+ enum mlx5_access_aso_opc_mod aso_opc_mod);
+int mlx5_aso_meter_update_by_wqe(struct mlx5_dev_ctx_shared *sh, uint32_t
queue,
+ struct mlx5_aso_mtr *mtr,
+ struct mlx5_mtr_bulk *bulk);
+int mlx5_aso_mtr_wait(struct mlx5_dev_ctx_shared *sh, uint32_t queue,
struct mlx5_aso_mtr *mtr);
int mlx5_aso_ct_update_by_wqe(struct mlx5_dev_ctx_shared *sh, uint32_t queue,
struct mlx5_aso_ct_action *ct,
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 7c3295609d..e3485352db 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4223,6 +4223,12 @@ flow_action_handles_translate(struct rte_eth_dev *dev,
MLX5_RTE_FLOW_ACTION_TYPE_COUNT;
translated[handle->index].conf = (void *)(uintptr_t)idx;
break;
+ case MLX5_INDIRECT_ACTION_TYPE_METER_MARK:
+ translated[handle->index].type =
+ (enum rte_flow_action_type)
+
MLX5_RTE_FLOW_ACTION_TYPE_METER_MARK;
+ translated[handle->index].conf = (void *)(uintptr_t)idx;
+ break;
case MLX5_INDIRECT_ACTION_TYPE_AGE:
if (priv->sh->flow_hit_aso_en) {
translated[handle->index].type =
diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index b8124f6f79..96198d7d17 100644
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -46,6 +46,7 @@ enum mlx5_rte_flow_action_type {
MLX5_RTE_FLOW_ACTION_TYPE_COUNT,
MLX5_RTE_FLOW_ACTION_TYPE_JUMP,
MLX5_RTE_FLOW_ACTION_TYPE_RSS,
+ MLX5_RTE_FLOW_ACTION_TYPE_METER_MARK,
};
/* Private (internal) Field IDs for MODIFY_FIELD action. */
@@ -54,22 +55,23 @@ enum mlx5_rte_flow_field_id {
MLX5_RTE_FLOW_FIELD_META_REG,
};
-#define MLX5_INDIRECT_ACTION_TYPE_OFFSET 30
+#define MLX5_INDIRECT_ACTION_TYPE_OFFSET 29
enum {
MLX5_INDIRECT_ACTION_TYPE_RSS,
MLX5_INDIRECT_ACTION_TYPE_AGE,
MLX5_INDIRECT_ACTION_TYPE_COUNT,
MLX5_INDIRECT_ACTION_TYPE_CT,
+ MLX5_INDIRECT_ACTION_TYPE_METER_MARK,
};
-/* Now, the maximal ports will be supported is 256, action number is 4M. */
-#define MLX5_INDIRECT_ACT_CT_MAX_PORT 0x100
+/* Now, the maximal ports will be supported is 16, action number is 32M. */
+#define MLX5_INDIRECT_ACT_CT_MAX_PORT 0x10
#define MLX5_INDIRECT_ACT_CT_OWNER_SHIFT 22
#define MLX5_INDIRECT_ACT_CT_OWNER_MASK (MLX5_INDIRECT_ACT_CT_MAX_PORT - 1)
-/* 30-31: type, 22-29: owner port, 0-21: index. */
+/* 29-31: type, 25-28: owner port, 0-24: index */
#define MLX5_INDIRECT_ACT_CT_GEN_IDX(owner, index) \
((MLX5_INDIRECT_ACTION_TYPE_CT << MLX5_INDIRECT_ACTION_TYPE_OFFSET) | \
(((owner) & MLX5_INDIRECT_ACT_CT_OWNER_MASK) << \
@@ -1114,6 +1116,7 @@ struct rte_flow_hw {
};
struct rte_flow_template_table *table; /* The table flow allcated from.
*/
uint32_t cnt_id;
+ uint32_t mtr_id;
uint8_t rule[0]; /* HWS layer data struct. */
} __rte_packed;
@@ -1165,6 +1168,9 @@ struct mlx5_action_construct_data {
struct {
uint32_t id;
} shared_counter;
+ struct {
+ uint32_t id;
+ } shared_meter;
};
};
@@ -1248,6 +1254,7 @@ struct mlx5_hw_actions {
uint16_t encap_decap_pos; /* Encap/Decap action position. */
uint32_t mark:1; /* Indicate the mark action. */
uint32_t cnt_id; /* Counter id. */
+ uint32_t mtr_id; /* Meter id. */
/* Translated DR action array from action template. */
struct mlx5dr_rule_action rule_acts[MLX5_HW_MAX_ACTS];
};
@@ -1537,6 +1544,7 @@ flow_hw_get_reg_id(enum rte_flow_item_type type, uint32_t
id)
*/
return REG_A;
case RTE_FLOW_ITEM_TYPE_CONNTRACK:
+ case RTE_FLOW_ITEM_TYPE_METER_COLOR:
return mlx5_flow_hw_aso_tag;
case RTE_FLOW_ITEM_TYPE_TAG:
MLX5_ASSERT(id < MLX5_FLOW_HW_TAGS_MAX);
@@ -1922,10 +1930,10 @@ mlx5_aso_meter_by_idx(struct mlx5_priv *priv, uint32_t
idx)
struct mlx5_aso_mtr_pools_mng *pools_mng =
&priv->sh->mtrmng->pools_mng;
- /* Decrease to original index. */
- idx--;
if (priv->mtr_bulk.aso)
return priv->mtr_bulk.aso + idx;
+ /* Decrease to original index. */
+ idx--;
MLX5_ASSERT(idx / MLX5_ASO_MTRS_PER_POOL < pools_mng->n);
rte_rwlock_read_lock(&pools_mng->resize_mtrwl);
pool = pools_mng->pools[idx / MLX5_ASO_MTRS_PER_POOL];
diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c
index c00c07b891..a5f58301eb 100644
--- a/drivers/net/mlx5/mlx5_flow_aso.c
+++ b/drivers/net/mlx5/mlx5_flow_aso.c
@@ -275,6 +275,65 @@ mlx5_aso_sq_create(struct mlx5_common_device *cdev, struct
mlx5_aso_sq *sq,
return -1;
}
+void
+mlx5_aso_mtr_queue_uninit(struct mlx5_dev_ctx_shared *sh __rte_unused,
+ struct mlx5_aso_mtr_pool *hws_pool,
+ struct mlx5_aso_mtr_pools_mng *pool_mng)
+{
+ uint32_t i;
+
+ if (hws_pool) {
+ for (i = 0; i < hws_pool->nb_sq; i++)
+ mlx5_aso_destroy_sq(hws_pool->sq + i);
+ mlx5_free(hws_pool->sq);
+ return;
+ }
+ if (pool_mng)
+ mlx5_aso_destroy_sq(&pool_mng->sq);
+}
+
+int
+mlx5_aso_mtr_queue_init(struct mlx5_dev_ctx_shared *sh,
+ struct mlx5_aso_mtr_pool *hws_pool,
+ struct mlx5_aso_mtr_pools_mng *pool_mng,
+ uint32_t nb_queues)
+{
+ struct mlx5_common_device *cdev = sh->cdev;
+ struct mlx5_aso_sq *sq;
+ uint32_t i;
+
+ if (hws_pool) {
+ sq = mlx5_malloc(MLX5_MEM_ZERO,
+ sizeof(struct mlx5_aso_sq) * nb_queues,
+ RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ if (!sq)
+ return -1;
+ hws_pool->sq = sq;
+ for (i = 0; i < nb_queues; i++) {
+ if (mlx5_aso_sq_create(cdev, hws_pool->sq + i,
+ sh->tx_uar.obj,
+ MLX5_ASO_QUEUE_LOG_DESC))
+ goto error;
+ mlx5_aso_mtr_init_sq(hws_pool->sq + i);
+ }
+ hws_pool->nb_sq = nb_queues;
+ }
+ if (pool_mng) {
+ if (mlx5_aso_sq_create(cdev, &pool_mng->sq,
+ sh->tx_uar.obj,
+ MLX5_ASO_QUEUE_LOG_DESC))
+ return -1;
+ mlx5_aso_mtr_init_sq(&pool_mng->sq);
+ }
+ return 0;
+error:
+ do {
+ if (&hws_pool->sq[i])
+ mlx5_aso_destroy_sq(hws_pool->sq + i);
+ } while (i--);
+ return -1;
+}
+
/**
* API to create and initialize Send Queue used for ASO access.
*
@@ -282,13 +341,16 @@ mlx5_aso_sq_create(struct mlx5_common_device *cdev,
struct mlx5_aso_sq *sq,
* Pointer to shared device context.
* @param[in] aso_opc_mod
* Mode of ASO feature.
+ * @param[in] nb_queues
+ * Number of Send Queues to create.
*
* @return
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
int
mlx5_aso_queue_init(struct mlx5_dev_ctx_shared *sh,
- enum mlx5_access_aso_opc_mod aso_opc_mod)
+ enum mlx5_access_aso_opc_mod aso_opc_mod,
+ uint32_t nb_queues)
{
uint32_t sq_desc_n = 1 << MLX5_ASO_QUEUE_LOG_DESC;
struct mlx5_common_device *cdev = sh->cdev;
@@ -307,10 +369,9 @@ mlx5_aso_queue_init(struct mlx5_dev_ctx_shared *sh,
mlx5_aso_age_init_sq(&sh->aso_age_mng->aso_sq);
break;
case ASO_OPC_MOD_POLICER:
- if (mlx5_aso_sq_create(cdev, &sh->mtrmng->pools_mng.sq,
- sh->tx_uar.obj, MLX5_ASO_QUEUE_LOG_DESC))
+ if (mlx5_aso_mtr_queue_init(sh, NULL,
+ &sh->mtrmng->pools_mng, nb_queues))
return -1;
- mlx5_aso_mtr_init_sq(&sh->mtrmng->pools_mng.sq);
break;
case ASO_OPC_MOD_CONNECTION_TRACKING:
if (mlx5_aso_ct_queue_init(sh, sh->ct_mng, MLX5_ASO_CT_SQ_NUM))
@@ -343,7 +404,7 @@ mlx5_aso_queue_uninit(struct mlx5_dev_ctx_shared *sh,
sq = &sh->aso_age_mng->aso_sq;
break;
case ASO_OPC_MOD_POLICER:
- sq = &sh->mtrmng->pools_mng.sq;
+ mlx5_aso_mtr_queue_uninit(sh, NULL, &sh->mtrmng->pools_mng);
break;
case ASO_OPC_MOD_CONNECTION_TRACKING:
mlx5_aso_ct_queue_uninit(sh, sh->ct_mng);
@@ -666,7 +727,8 @@ static uint16_t
mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared *sh,
struct mlx5_aso_sq *sq,
struct mlx5_aso_mtr *aso_mtr,
- struct mlx5_mtr_bulk *bulk)
+ struct mlx5_mtr_bulk *bulk,
+ bool need_lock)
{
volatile struct mlx5_aso_wqe *wqe = NULL;
struct mlx5_flow_meter_info *fm = NULL;
@@ -679,11 +741,13 @@ mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared
*sh,
uint32_t param_le;
int id;
- rte_spinlock_lock(&sq->sqsl);
+ if (need_lock)
+ rte_spinlock_lock(&sq->sqsl);
res = size - (uint16_t)(sq->head - sq->tail);
if (unlikely(!res)) {
DRV_LOG(ERR, "Fail: SQ is full and no free WQE to send");
- rte_spinlock_unlock(&sq->sqsl);
+ if (need_lock)
+ rte_spinlock_unlock(&sq->sqsl);
return 0;
}
wqe = &sq->sq_obj.aso_wqes[sq->head & mask];
@@ -692,8 +756,11 @@ mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared
*sh,
fm = &aso_mtr->fm;
sq->elts[sq->head & mask].mtr = aso_mtr;
if (aso_mtr->type == ASO_METER_INDIRECT) {
- pool = container_of(aso_mtr, struct mlx5_aso_mtr_pool,
- mtrs[aso_mtr->offset]);
+ if (likely(sh->config.dv_flow_en == 2))
+ pool = aso_mtr->pool;
+ else
+ pool = container_of(aso_mtr, struct mlx5_aso_mtr_pool,
+ mtrs[aso_mtr->offset]);
id = pool->devx_obj->id;
} else {
id = bulk->devx_obj->id;
@@ -756,7 +823,8 @@ mlx5_aso_mtr_sq_enqueue_single(struct mlx5_dev_ctx_shared
*sh,
mlx5_doorbell_ring(&sh->tx_uar.bf_db, *(volatile uint64_t *)wqe,
sq->pi, &sq->sq_obj.db_rec[MLX5_SND_DBR],
!sh->tx_uar.dbnc);
- rte_spinlock_unlock(&sq->sqsl);
+ if (need_lock)
+ rte_spinlock_unlock(&sq->sqsl);
return 1;
}
@@ -779,7 +847,7 @@ mlx5_aso_mtrs_status_update(struct mlx5_aso_sq *sq,
uint16_t aso_mtrs_nums)
}
static void
-mlx5_aso_mtr_completion_handle(struct mlx5_aso_sq *sq)
+mlx5_aso_mtr_completion_handle(struct mlx5_aso_sq *sq, bool need_lock)
{
struct mlx5_aso_cq *cq = &sq->cq;
volatile struct mlx5_cqe *restrict cqe;
@@ -791,7 +859,8 @@ mlx5_aso_mtr_completion_handle(struct mlx5_aso_sq *sq)
uint16_t n = 0;
int ret;
- rte_spinlock_lock(&sq->sqsl);
+ if (need_lock)
+ rte_spinlock_lock(&sq->sqsl);
max = (uint16_t)(sq->head - sq->tail);
if (unlikely(!max)) {
rte_spinlock_unlock(&sq->sqsl);
@@ -823,7 +892,8 @@ mlx5_aso_mtr_completion_handle(struct mlx5_aso_sq *sq)
rte_io_wmb();
cq->cq_obj.db_rec[0] = rte_cpu_to_be_32(cq->cq_ci);
}
- rte_spinlock_unlock(&sq->sqsl);
+ if (need_lock)
+ rte_spinlock_unlock(&sq->sqsl);
}
/**
@@ -840,16 +910,31 @@ mlx5_aso_mtr_completion_handle(struct mlx5_aso_sq *sq)
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
int
-mlx5_aso_meter_update_by_wqe(struct mlx5_dev_ctx_shared *sh,
+mlx5_aso_meter_update_by_wqe(struct mlx5_dev_ctx_shared *sh, uint32_t queue,
struct mlx5_aso_mtr *mtr,
struct mlx5_mtr_bulk *bulk)
{
- struct mlx5_aso_sq *sq = &sh->mtrmng->pools_mng.sq;
+ struct mlx5_aso_sq *sq;
uint32_t poll_wqe_times = MLX5_MTR_POLL_WQE_CQE_TIMES;
+ bool need_lock;
+ if (likely(sh->config.dv_flow_en == 2) &&
+ mtr->type == ASO_METER_INDIRECT) {
+ if (queue == MLX5_HW_INV_QUEUE) {
+ sq = &mtr->pool->sq[mtr->pool->nb_sq - 1];
+ need_lock = true;
+ } else {
+ sq = &mtr->pool->sq[queue];
+ need_lock = false;
+ }
+ } else {
+ sq = &sh->mtrmng->pools_mng.sq;
+ need_lock = true;
+ }
do {
- mlx5_aso_mtr_completion_handle(sq);
- if (mlx5_aso_mtr_sq_enqueue_single(sh, sq, mtr, bulk))
+ mlx5_aso_mtr_completion_handle(sq, need_lock);
+ if (mlx5_aso_mtr_sq_enqueue_single(sh, sq, mtr,
+ bulk, need_lock))
return 0;
/* Waiting for wqe resource. */
rte_delay_us_sleep(MLX5_ASO_WQE_CQE_RESPONSE_DELAY);
@@ -873,17 +958,31 @@ mlx5_aso_meter_update_by_wqe(struct mlx5_dev_ctx_shared
*sh,
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
int
-mlx5_aso_mtr_wait(struct mlx5_dev_ctx_shared *sh,
+mlx5_aso_mtr_wait(struct mlx5_dev_ctx_shared *sh, uint32_t queue,
struct mlx5_aso_mtr *mtr)
{
- struct mlx5_aso_sq *sq = &sh->mtrmng->pools_mng.sq;
+ struct mlx5_aso_sq *sq;
uint32_t poll_cqe_times = MLX5_MTR_POLL_WQE_CQE_TIMES;
+ bool need_lock;
+ if (likely(sh->config.dv_flow_en == 2) &&
+ mtr->type == ASO_METER_INDIRECT) {
+ if (queue == MLX5_HW_INV_QUEUE) {
+ sq = &mtr->pool->sq[mtr->pool->nb_sq - 1];
+ need_lock = true;
+ } else {
+ sq = &mtr->pool->sq[queue];
+ need_lock = false;
+ }
+ } else {
+ sq = &sh->mtrmng->pools_mng.sq;
+ need_lock = true;
+ }
if (__atomic_load_n(&mtr->state, __ATOMIC_RELAXED) ==
ASO_METER_READY)
return 0;
do {
- mlx5_aso_mtr_completion_handle(sq);
+ mlx5_aso_mtr_completion_handle(sq, need_lock);
if (__atomic_load_n(&mtr->state, __ATOMIC_RELAXED) ==
ASO_METER_READY)
return 0;
diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 7efc936ddd..868fa6e1a5 100644
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -1387,6 +1387,7 @@ mlx5_flow_item_field_width(struct rte_eth_dev *dev,
return inherit < 0 ? 0 : inherit;
case RTE_FLOW_FIELD_IPV4_ECN:
case RTE_FLOW_FIELD_IPV6_ECN:
+ case RTE_FLOW_FIELD_METER_COLOR:
return 2;
default:
MLX5_ASSERT(false);
@@ -1856,6 +1857,31 @@ mlx5_flow_field_id_to_modify_info
info[idx].offset = data->offset;
}
break;
+ case RTE_FLOW_FIELD_METER_COLOR:
+ {
+ const uint32_t color_mask =
+ (UINT32_C(1) << MLX5_MTR_COLOR_BITS) - 1;
+ int reg;
+
+ if (priv->sh->config.dv_flow_en == 2)
+ reg = flow_hw_get_reg_id
+ (RTE_FLOW_ITEM_TYPE_METER_COLOR, 0);
+ else
+ reg = mlx5_flow_get_reg_id(dev, MLX5_MTR_COLOR,
+ 0, error);
+ if (reg < 0)
+ return;
+ MLX5_ASSERT(reg != REG_NON);
+ MLX5_ASSERT((unsigned int)reg < RTE_DIM(reg_to_field));
+ info[idx] = (struct field_modify_info){4, 0,
+ reg_to_field[reg]};
+ if (mask)
+ mask[idx] = flow_modify_info_mask_32_masked
+ (width, data->offset, color_mask);
+ else
+ info[idx].offset = data->offset;
+ }
+ break;
case RTE_FLOW_FIELD_POINTER:
case RTE_FLOW_FIELD_VALUE:
default:
@@ -1913,7 +1939,9 @@ flow_dv_convert_action_modify_field
item.spec = conf->src.field == RTE_FLOW_FIELD_POINTER ?
(void *)(uintptr_t)conf->src.pvalue :
(void *)(uintptr_t)&conf->src.value;
- if (conf->dst.field == RTE_FLOW_FIELD_META) {
+ if (conf->dst.field == RTE_FLOW_FIELD_META ||
+ conf->dst.field == RTE_FLOW_FIELD_TAG ||
+ conf->dst.field == RTE_FLOW_FIELD_METER_COLOR) {
meta = *(const unaligned_uint32_t *)item.spec;
meta = rte_cpu_to_be_32(meta);
item.spec = &meta;
@@ -3687,6 +3715,69 @@ flow_dv_validate_action_aso_ct(struct rte_eth_dev *dev,
return 0;
}
+/**
+ * Validate METER_COLOR item.
+ *
+ * @param[in] dev
+ * Pointer to the rte_eth_dev structure.
+ * @param[in] item
+ * Item specification.
+ * @param[in] attr
+ * Attributes of flow that includes this item.
+ * @param[out] error
+ * Pointer to error structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+flow_dv_validate_item_meter_color(struct rte_eth_dev *dev,
+ const struct rte_flow_item *item,
+ const struct rte_flow_attr *attr __rte_unused,
+ struct rte_flow_error *error)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ const struct rte_flow_item_meter_color *spec = item->spec;
+ const struct rte_flow_item_meter_color *mask = item->mask;
+ struct rte_flow_item_meter_color nic_mask = {
+ .color = RTE_COLORS
+ };
+ int ret;
+
+ if (priv->mtr_color_reg == REG_NON)
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ITEM, item,
+ "meter color register"
+ " isn't available");
+ ret = mlx5_flow_get_reg_id(dev, MLX5_MTR_COLOR, 0, error);
+ if (ret < 0)
+ return ret;
+ if (!spec)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM_SPEC,
+ item->spec,
+ "data cannot be empty");
+ if (spec->color > RTE_COLORS)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF,
+ &spec->color,
+ "meter color is invalid");
+ if (!mask)
+ mask = &rte_flow_item_meter_color_mask;
+ if (!mask->color)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM_SPEC, NULL,
+ "mask cannot be zero");
+
+ ret = mlx5_flow_item_acceptable(item, (const uint8_t *)mask,
+ (const uint8_t *)&nic_mask,
+ sizeof(struct rte_flow_item_meter_color),
+ MLX5_ITEM_RANGE_NOT_ACCEPTED, error);
+ if (ret < 0)
+ return ret;
+ return 0;
+}
+
int
flow_dv_encap_decap_match_cb(void *tool_ctx __rte_unused,
struct mlx5_list_entry *entry, void *cb_ctx)
@@ -6519,7 +6610,7 @@ flow_dv_mtr_container_resize(struct rte_eth_dev *dev)
return -ENOMEM;
}
if (!pools_mng->n)
- if (mlx5_aso_queue_init(priv->sh, ASO_OPC_MOD_POLICER)) {
+ if (mlx5_aso_queue_init(priv->sh, ASO_OPC_MOD_POLICER, 1)) {
mlx5_free(pools);
return -ENOMEM;
}
@@ -7421,6 +7512,13 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct
rte_flow_attr *attr,
if (ret < 0)
return ret;
break;
+ case RTE_FLOW_ITEM_TYPE_METER_COLOR:
+ ret = flow_dv_validate_item_meter_color(dev, items,
+ attr, error);
+ if (ret < 0)
+ return ret;
+ last_item = MLX5_FLOW_ITEM_METER_COLOR;
+ break;
default:
return rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ITEM,
@@ -10508,6 +10606,45 @@ flow_dv_translate_item_flex(struct rte_eth_dev *dev,
void *matcher, void *key,
mlx5_flex_flow_translate_item(dev, matcher, key, item, is_inner);
}
+/**
+ * Add METER_COLOR item to matcher
+ *
+ * @param[in] dev
+ * The device to configure through.
+ * @param[in, out] key
+ * Flow matcher value.
+ * @param[in] item
+ * Flow pattern to translate.
+ * @param[in] key_type
+ * Set flow matcher mask or value.
+ */
+static void
+flow_dv_translate_item_meter_color(struct rte_eth_dev *dev, void *key,
+ const struct rte_flow_item *item,
+ uint32_t key_type)
+{
+ const struct rte_flow_item_meter_color *color_m = item->mask;
+ const struct rte_flow_item_meter_color *color_v = item->spec;
+ uint32_t value, mask;
+ int reg = REG_NON;
+
+ MLX5_ASSERT(color_v);
+ if (MLX5_ITEM_VALID(item, key_type))
+ return;
+ MLX5_ITEM_UPDATE(item, key_type, color_v, color_m,
+ &rte_flow_item_meter_color_mask);
+ value = rte_col_2_mlx5_col(color_v->color);
+ mask = color_m ?
+ color_m->color : (UINT32_C(1) << MLX5_MTR_COLOR_BITS) - 1;
+ if (!!(key_type & MLX5_SET_MATCHER_SW))
+ reg = mlx5_flow_get_reg_id(dev, MLX5_MTR_COLOR, 0, NULL);
+ else
+ reg = flow_hw_get_reg_id(RTE_FLOW_ITEM_TYPE_METER_COLOR, 0);
+ if (reg == REG_NON)
+ return;
+ flow_dv_match_meta_reg(key, (enum modify_reg)reg, value, mask);
+}
+
static uint32_t matcher_zero[MLX5_ST_SZ_DW(fte_match_param)] = { 0 };
#define HEADER_IS_ZERO(match_criteria, headers)
\
@@ -13260,6 +13397,10 @@ flow_dv_translate_items(struct rte_eth_dev *dev,
/* No other protocol should follow eCPRI layer. */
last_item = MLX5_FLOW_LAYER_ECPRI;
break;
+ case RTE_FLOW_ITEM_TYPE_METER_COLOR:
+ flow_dv_translate_item_meter_color(dev, key, items, key_type);
+ last_item = MLX5_FLOW_ITEM_METER_COLOR;
+ break;
default:
break;
}
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 0c110819e6..52125c861e 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -412,6 +412,10 @@ __flow_hw_action_template_destroy(struct rte_eth_dev *dev,
mlx5_hws_cnt_shared_put(priv->hws_cpool, &acts->cnt_id);
acts->cnt_id = 0;
}
+ if (acts->mtr_id) {
+ mlx5_ipool_free(priv->hws_mpool->idx_pool, acts->mtr_id);
+ acts->mtr_id = 0;
+ }
}
/**
@@ -628,6 +632,42 @@ __flow_hw_act_data_shared_cnt_append(struct mlx5_priv
*priv,
return 0;
}
+/**
+ * Append shared meter_mark action to the dynamic action list.
+ *
+ * @param[in] priv
+ * Pointer to the port private data structure.
+ * @param[in] acts
+ * Pointer to the template HW steering DR actions.
+ * @param[in] type
+ * Action type.
+ * @param[in] action_src
+ * Offset of source rte flow action.
+ * @param[in] action_dst
+ * Offset of destination DR action.
+ * @param[in] mtr_id
+ * Shared meter id.
+ *
+ * @return
+ * 0 on success, negative value otherwise and rte_errno is set.
+ */
+static __rte_always_inline int
+__flow_hw_act_data_shared_mtr_append(struct mlx5_priv *priv,
+ struct mlx5_hw_actions *acts,
+ enum rte_flow_action_type type,
+ uint16_t action_src,
+ uint16_t action_dst,
+ cnt_id_t mtr_id)
+{ struct mlx5_action_construct_data *act_data;
+
+ act_data = __flow_hw_act_data_alloc(priv, type, action_src, action_dst);
+ if (!act_data)
+ return -1;
+ act_data->type = type;
+ act_data->shared_meter.id = mtr_id;
+ LIST_INSERT_HEAD(&acts->act_list, act_data, next);
+ return 0;
+}
/**
* Translate shared indirect action.
@@ -682,6 +722,13 @@ flow_hw_shared_action_translate(struct rte_eth_dev *dev,
idx, &acts->rule_acts[action_dst]))
return -1;
break;
+ case MLX5_INDIRECT_ACTION_TYPE_METER_MARK:
+ if (__flow_hw_act_data_shared_mtr_append(priv, acts,
+ (enum rte_flow_action_type)
+ MLX5_RTE_FLOW_ACTION_TYPE_METER_MARK,
+ action_src, action_dst, idx))
+ return -1;
+ break;
default:
DRV_LOG(WARNING, "Unsupported shared action type:%d", type);
break;
@@ -888,6 +935,7 @@ flow_hw_modify_field_compile(struct rte_eth_dev *dev,
(void *)(uintptr_t)&conf->src.value;
if (conf->dst.field == RTE_FLOW_FIELD_META ||
conf->dst.field == RTE_FLOW_FIELD_TAG ||
+ conf->dst.field == RTE_FLOW_FIELD_METER_COLOR ||
conf->dst.field == (enum
rte_flow_field_id)MLX5_RTE_FLOW_FIELD_META_REG) {
value = *(const unaligned_uint32_t *)item.spec;
value = rte_cpu_to_be_32(value);
@@ -1047,7 +1095,7 @@ flow_hw_meter_compile(struct rte_eth_dev *dev,
acts->rule_acts[jump_pos].action = (!!group) ?
acts->jump->hws_action :
acts->jump->root_action;
- if (mlx5_aso_mtr_wait(priv->sh, aso_mtr))
+ if (mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr))
return -ENOMEM;
return 0;
}
@@ -1121,6 +1169,74 @@ static rte_be32_t vlan_hdr_to_be32(const struct
rte_flow_action *actions)
#endif
}
+static __rte_always_inline struct mlx5_aso_mtr *
+flow_hw_meter_mark_alloc(struct rte_eth_dev *dev,
+ const struct rte_flow_action *action,
+ uint32_t queue)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
+ const struct rte_flow_action_meter_mark *meter_mark = action->conf;
+ struct mlx5_aso_mtr *aso_mtr;
+ struct mlx5_flow_meter_info *fm;
+ uint32_t mtr_id;
+
+ aso_mtr = mlx5_ipool_malloc(priv->hws_mpool->idx_pool, &mtr_id);
+ if (!aso_mtr)
+ return NULL;
+ /* Fill the flow meter parameters. */
+ aso_mtr->type = ASO_METER_INDIRECT;
+ fm = &aso_mtr->fm;
+ fm->meter_id = mtr_id;
+ fm->profile = (struct mlx5_flow_meter_profile *)(meter_mark->profile);
+ fm->is_enable = meter_mark->state;
+ fm->color_aware = meter_mark->color_mode;
+ aso_mtr->pool = pool;
+ aso_mtr->state = ASO_METER_WAIT;
+ aso_mtr->offset = mtr_id - 1;
+ aso_mtr->init_color = (meter_mark->color_mode) ?
+ meter_mark->init_color : RTE_COLOR_GREEN;
+ /* Update ASO flow meter by wqe. */
+ if (mlx5_aso_meter_update_by_wqe(priv->sh, queue, aso_mtr,
+ &priv->mtr_bulk)) {
+ mlx5_ipool_free(pool->idx_pool, mtr_id);
+ return NULL;
+ }
+ /* Wait for ASO object completion. */
+ if (queue == MLX5_HW_INV_QUEUE &&
+ mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) {
+ mlx5_ipool_free(pool->idx_pool, mtr_id);
+ return NULL;
+ }
+ return aso_mtr;
+}
+
+static __rte_always_inline int
+flow_hw_meter_mark_compile(struct rte_eth_dev *dev,
+ uint16_t aso_mtr_pos,
+ const struct rte_flow_action *action,
+ struct mlx5dr_rule_action *acts,
+ uint32_t *index,
+ uint32_t queue)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
+ struct mlx5_aso_mtr *aso_mtr;
+
+ aso_mtr = flow_hw_meter_mark_alloc(dev, action, queue);
+ if (!aso_mtr)
+ return -1;
+
+ /* Compile METER_MARK action */
+ acts[aso_mtr_pos].action = pool->action;
+ acts[aso_mtr_pos].aso_meter.offset = aso_mtr->offset;
+ acts[aso_mtr_pos].aso_meter.init_color =
+ (enum mlx5dr_action_aso_meter_color)
+ rte_col_2_mlx5_col(aso_mtr->init_color);
+ *index = aso_mtr->fm.meter_id;
+ return 0;
+}
+
/**
* Translate rte_flow actions to DR action.
*
@@ -1428,6 +1544,24 @@ __flow_hw_actions_translate(struct rte_eth_dev *dev,
goto err;
}
break;
+ case RTE_FLOW_ACTION_TYPE_METER_MARK:
+ action_pos = at->actions_off[actions - at->actions];
+ if (actions->conf && masks->conf &&
+ ((const struct rte_flow_action_meter_mark *)
+ masks->conf)->profile) {
+ err = flow_hw_meter_mark_compile(dev,
+ action_pos, actions,
+ acts->rule_acts,
+ &acts->mtr_id,
+ MLX5_HW_INV_QUEUE);
+ if (err)
+ goto err;
+ } else if (__flow_hw_act_data_general_append(priv, acts,
+ actions->type,
+ actions - action_start,
+ action_pos))
+ goto err;
+ break;
case RTE_FLOW_ACTION_TYPE_END:
actions_end = true;
break;
@@ -1624,8 +1758,10 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev,
uint32_t queue,
struct mlx5dr_rule_action *rule_act)
{
struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
struct mlx5_action_construct_data act_data;
struct mlx5_shared_action_rss *shared_rss;
+ struct mlx5_aso_mtr *aso_mtr;
uint32_t act_idx = (uint32_t)(uintptr_t)action->conf;
uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
uint32_t idx = act_idx &
@@ -1661,6 +1797,17 @@ flow_hw_shared_action_construct(struct rte_eth_dev *dev,
uint32_t queue,
if (flow_hw_ct_compile(dev, queue, idx, rule_act))
return -1;
break;
+ case MLX5_INDIRECT_ACTION_TYPE_METER_MARK:
+ /* Find ASO object. */
+ aso_mtr = mlx5_ipool_get(pool->idx_pool, idx);
+ if (!aso_mtr)
+ return -1;
+ rule_act->action = pool->action;
+ rule_act->aso_meter.offset = aso_mtr->offset;
+ rule_act->aso_meter.init_color =
+ (enum mlx5dr_action_aso_meter_color)
+ rte_col_2_mlx5_col(aso_mtr->init_color);
+ break;
default:
DRV_LOG(WARNING, "Unsupported shared action type:%d", type);
break;
@@ -1730,6 +1877,7 @@ flow_hw_modify_field_construct(struct mlx5_hw_q_job *job,
rte_memcpy(values, mhdr_action->src.pvalue, sizeof(values));
if (mhdr_action->dst.field == RTE_FLOW_FIELD_META ||
mhdr_action->dst.field == RTE_FLOW_FIELD_TAG ||
+ mhdr_action->dst.field == RTE_FLOW_FIELD_METER_COLOR ||
mhdr_action->dst.field == (enum
rte_flow_field_id)MLX5_RTE_FLOW_FIELD_META_REG) {
value_p = (unaligned_uint32_t *)values;
*value_p = rte_cpu_to_be_32(*value_p);
@@ -1807,6 +1955,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
uint32_t queue)
{
struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
struct rte_flow_template_table *table = job->flow->table;
struct mlx5_action_construct_data *act_data;
const struct rte_flow_actions_template *at = hw_at->action_template;
@@ -1823,8 +1972,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
uint32_t ft_flag;
size_t encap_len = 0;
int ret;
- struct mlx5_aso_mtr *mtr;
- uint32_t mtr_id;
+ struct mlx5_aso_mtr *aso_mtr;
rte_memcpy(rule_acts, hw_acts->rule_acts, sizeof(*rule_acts) *
at->dr_actions_num);
attr.group = table->grp->group_id;
@@ -1858,6 +2006,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
struct mlx5_hrxq *hrxq;
uint32_t ct_idx;
cnt_id_t cnt_id;
+ uint32_t mtr_id;
action = &actions[act_data->action_src];
/*
@@ -1964,13 +2113,13 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
case RTE_FLOW_ACTION_TYPE_METER:
meter = action->conf;
mtr_id = meter->mtr_id;
- mtr = mlx5_aso_meter_by_idx(priv, mtr_id);
+ aso_mtr = mlx5_aso_meter_by_idx(priv, mtr_id);
rule_acts[act_data->action_dst].action =
priv->mtr_bulk.action;
rule_acts[act_data->action_dst].aso_meter.offset =
- mtr->offset;
+ aso_mtr->offset;
jump = flow_hw_jump_action_register
- (dev, &table->cfg, mtr->fm.group, NULL);
+ (dev, &table->cfg, aso_mtr->fm.group, NULL);
if (!jump)
return -1;
MLX5_ASSERT
@@ -1980,7 +2129,7 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
jump->root_action;
job->flow->jump = jump;
job->flow->fate_type = MLX5_FLOW_FATE_JUMP;
- if (mlx5_aso_mtr_wait(priv->sh, mtr))
+ if (mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE,
aso_mtr))
return -1;
break;
case RTE_FLOW_ACTION_TYPE_COUNT:
@@ -2016,6 +2165,28 @@ flow_hw_actions_construct(struct rte_eth_dev *dev,
&rule_acts[act_data->action_dst]))
return -1;
break;
+ case MLX5_RTE_FLOW_ACTION_TYPE_METER_MARK:
+ mtr_id = act_data->shared_meter.id &
+ ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);
+ /* Find ASO object. */
+ aso_mtr = mlx5_ipool_get(pool->idx_pool, mtr_id);
+ if (!aso_mtr)
+ return -1;
+ rule_acts[act_data->action_dst].action =
+ pool->action;
+ rule_acts[act_data->action_dst].aso_meter.offset =
+ aso_mtr->offset;
+ rule_acts[act_data->action_dst].aso_meter.init_color =
+ (enum mlx5dr_action_aso_meter_color)
+ rte_col_2_mlx5_col(aso_mtr->init_color);
+ break;
+ case RTE_FLOW_ACTION_TYPE_METER_MARK:
+ ret = flow_hw_meter_mark_compile(dev,
+ act_data->action_dst, action,
+ rule_acts, &job->flow->mtr_id, queue);
+ if (ret != 0)
+ return ret;
+ break;
default:
break;
}
@@ -2283,6 +2454,7 @@ flow_hw_pull(struct rte_eth_dev *dev,
struct rte_flow_error *error)
{
struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
struct mlx5_hw_q_job *job;
int ret, i;
@@ -2307,6 +2479,10 @@ flow_hw_pull(struct rte_eth_dev *dev,
&job->flow->cnt_id);
job->flow->cnt_id = 0;
}
+ if (job->flow->mtr_id) {
+ mlx5_ipool_free(pool->idx_pool,
job->flow->mtr_id);
+ job->flow->mtr_id = 0;
+ }
mlx5_ipool_free(job->flow->table->flow, job->flow->idx);
}
priv->hw_q[queue].job[priv->hw_q[queue].job_idx++] = job;
@@ -3189,6 +3365,9 @@ flow_hw_actions_validate(struct rte_eth_dev *dev,
case RTE_FLOW_ACTION_TYPE_METER:
/* TODO: Validation logic */
break;
+ case RTE_FLOW_ACTION_TYPE_METER_MARK:
+ /* TODO: Validation logic */
+ break;
case RTE_FLOW_ACTION_TYPE_MODIFY_FIELD:
ret = flow_hw_validate_action_modify_field(action,
mask,
@@ -3282,6 +3461,11 @@ flow_hw_dr_actions_template_handle_shared(const struct
rte_flow_action *mask,
action_types[*curr_off] = MLX5DR_ACTION_TYP_ASO_CT;
*curr_off = *curr_off + 1;
break;
+ case RTE_FLOW_ACTION_TYPE_METER_MARK:
+ at->actions_off[action_src] = *curr_off;
+ action_types[*curr_off] = MLX5DR_ACTION_TYP_ASO_METER;
+ *curr_off = *curr_off + 1;
+ break;
default:
DRV_LOG(WARNING, "Unsupported shared action type: %d", type);
return -EINVAL;
@@ -3373,6 +3557,12 @@ flow_hw_dr_actions_template_create(struct
rte_flow_actions_template *at)
MLX5_HW_VLAN_PUSH_PCP_IDX :
MLX5_HW_VLAN_PUSH_VID_IDX;
break;
+ case RTE_FLOW_ACTION_TYPE_METER_MARK:
+ at->actions_off[i] = curr_off;
+ action_types[curr_off++] = MLX5DR_ACTION_TYP_ASO_METER;
+ if (curr_off >= MLX5_HW_MAX_ACTS)
+ goto err_actions_num;
+ break;
default:
type = mlx5_hw_dr_action_types[at->actions[i].type];
at->actions_off[i] = curr_off;
@@ -3848,6 +4038,16 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev,
" attribute");
}
break;
+ case RTE_FLOW_ITEM_TYPE_METER_COLOR:
+ {
+ int reg =
flow_hw_get_reg_id(RTE_FLOW_ITEM_TYPE_METER_COLOR, 0);
+ if (reg == REG_NON)
+ return rte_flow_error_set(error, EINVAL,
+
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL,
+ "Unsupported meter
color register");
+ break;
+ }
case RTE_FLOW_ITEM_TYPE_VOID:
case RTE_FLOW_ITEM_TYPE_ETH:
case RTE_FLOW_ITEM_TYPE_VLAN:
@@ -5357,7 +5557,7 @@ flow_hw_configure(struct rte_eth_dev *dev,
LIST_INIT(&priv->hw_ctrl_flows);
/* Initialize meter library*/
if (port_attr->nb_meters)
- if (mlx5_flow_meter_init(dev, port_attr->nb_meters, 1, 1))
+ if (mlx5_flow_meter_init(dev, port_attr->nb_meters, 1, 1,
nb_q_updated))
goto err;
/* Add global actions. */
for (i = 0; i < MLX5_HW_ACTION_FLAG_MAX; i++) {
@@ -5861,7 +6061,9 @@ flow_hw_action_handle_create(struct rte_eth_dev *dev,
uint32_t queue,
{
struct rte_flow_action_handle *handle = NULL;
struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr *aso_mtr;
cnt_id_t cnt_id;
+ uint32_t mtr_id;
RTE_SET_USED(queue);
RTE_SET_USED(attr);
@@ -5880,6 +6082,14 @@ flow_hw_action_handle_create(struct rte_eth_dev *dev,
uint32_t queue,
case RTE_FLOW_ACTION_TYPE_CONNTRACK:
handle = flow_hw_conntrack_create(dev, queue, action->conf,
error);
break;
+ case RTE_FLOW_ACTION_TYPE_METER_MARK:
+ aso_mtr = flow_hw_meter_mark_alloc(dev, action, queue);
+ if (!aso_mtr)
+ break;
+ mtr_id = (MLX5_INDIRECT_ACTION_TYPE_METER_MARK <<
+ MLX5_INDIRECT_ACTION_TYPE_OFFSET) |
(aso_mtr->fm.meter_id);
+ handle = (struct rte_flow_action_handle *)(uintptr_t)mtr_id;
+ break;
default:
handle = flow_dv_action_create(dev, conf, action, error);
}
@@ -5915,18 +6125,59 @@ flow_hw_action_handle_update(struct rte_eth_dev *dev,
uint32_t queue,
void *user_data,
struct rte_flow_error *error)
{
- uint32_t act_idx = (uint32_t)(uintptr_t)handle;
- uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
-
RTE_SET_USED(queue);
RTE_SET_USED(attr);
RTE_SET_USED(user_data);
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
+ const struct rte_flow_update_meter_mark *upd_meter_mark =
+ (const struct rte_flow_update_meter_mark *)update;
+ const struct rte_flow_action_meter_mark *meter_mark;
+ struct mlx5_aso_mtr *aso_mtr;
+ struct mlx5_flow_meter_info *fm;
+ uint32_t act_idx = (uint32_t)(uintptr_t)handle;
+ uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
+ uint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);
+
switch (type) {
case MLX5_INDIRECT_ACTION_TYPE_CT:
return flow_hw_conntrack_update(dev, queue, update, act_idx,
error);
+ case MLX5_INDIRECT_ACTION_TYPE_METER_MARK:
+ meter_mark = &upd_meter_mark->meter_mark;
+ /* Find ASO object. */
+ aso_mtr = mlx5_ipool_get(pool->idx_pool, idx);
+ if (!aso_mtr)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Invalid meter_mark update index");
+ fm = &aso_mtr->fm;
+ if (upd_meter_mark->profile_valid)
+ fm->profile = (struct mlx5_flow_meter_profile *)
+ (meter_mark->profile);
+ if (upd_meter_mark->color_mode_valid)
+ fm->color_aware = meter_mark->color_mode;
+ if (upd_meter_mark->init_color_valid)
+ aso_mtr->init_color = (meter_mark->color_mode) ?
+ meter_mark->init_color : RTE_COLOR_GREEN;
+ if (upd_meter_mark->state_valid)
+ fm->is_enable = meter_mark->state;
+ /* Update ASO flow meter by wqe. */
+ if (mlx5_aso_meter_update_by_wqe(priv->sh, queue,
+ aso_mtr, &priv->mtr_bulk))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Unable to update ASO meter WQE");
+ /* Wait for ASO object completion. */
+ if (queue == MLX5_HW_INV_QUEUE &&
+ mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Unable to wait for ASO meter CQE");
+ return 0;
default:
- return flow_dv_action_update(dev, handle, update, error);
+ break;
}
+ return flow_dv_action_update(dev, handle, update, error);
}
/**
@@ -5957,7 +6208,11 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev,
uint32_t queue,
{
uint32_t act_idx = (uint32_t)(uintptr_t)handle;
uint32_t type = act_idx >> MLX5_INDIRECT_ACTION_TYPE_OFFSET;
+ uint32_t idx = act_idx & ((1u << MLX5_INDIRECT_ACTION_TYPE_OFFSET) - 1);
struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_aso_mtr_pool *pool = priv->hws_mpool;
+ struct mlx5_aso_mtr *aso_mtr;
+ struct mlx5_flow_meter_info *fm;
RTE_SET_USED(queue);
RTE_SET_USED(attr);
@@ -5967,6 +6222,28 @@ flow_hw_action_handle_destroy(struct rte_eth_dev *dev,
uint32_t queue,
return mlx5_hws_cnt_shared_put(priv->hws_cpool, &act_idx);
case MLX5_INDIRECT_ACTION_TYPE_CT:
return flow_hw_conntrack_destroy(dev, act_idx, error);
+ case MLX5_INDIRECT_ACTION_TYPE_METER_MARK:
+ aso_mtr = mlx5_ipool_get(pool->idx_pool, idx);
+ if (!aso_mtr)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Invalid meter_mark destroy index");
+ fm = &aso_mtr->fm;
+ fm->is_enable = 0;
+ /* Update ASO flow meter by wqe. */
+ if (mlx5_aso_meter_update_by_wqe(priv->sh, queue, aso_mtr,
+ &priv->mtr_bulk))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Unable to update ASO meter WQE");
+ /* Wait for ASO object completion. */
+ if (queue == MLX5_HW_INV_QUEUE &&
+ mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Unable to wait for ASO meter CQE");
+ mlx5_ipool_free(pool->idx_pool, idx);
+ return 0;
default:
return flow_dv_action_destroy(dev, handle, error);
}
@@ -6050,8 +6327,8 @@ flow_hw_action_create(struct rte_eth_dev *dev,
const struct rte_flow_action *action,
struct rte_flow_error *err)
{
- return flow_hw_action_handle_create(dev, UINT32_MAX, NULL, conf, action,
- NULL, err);
+ return flow_hw_action_handle_create(dev, MLX5_HW_INV_QUEUE,
+ NULL, conf, action, NULL, err);
}
/**
@@ -6076,8 +6353,8 @@ flow_hw_action_destroy(struct rte_eth_dev *dev,
struct rte_flow_action_handle *handle,
struct rte_flow_error *error)
{
- return flow_hw_action_handle_destroy(dev, UINT32_MAX, NULL, handle,
- NULL, error);
+ return flow_hw_action_handle_destroy(dev, MLX5_HW_INV_QUEUE,
+ NULL, handle, NULL, error);
}
/**
@@ -6105,8 +6382,8 @@ flow_hw_action_update(struct rte_eth_dev *dev,
const void *update,
struct rte_flow_error *err)
{
- return flow_hw_action_handle_update(dev, UINT32_MAX, NULL, handle,
- update, NULL, err);
+ return flow_hw_action_handle_update(dev, MLX5_HW_INV_QUEUE,
+ NULL, handle, update, NULL, err);
}
static int
@@ -6636,6 +6913,12 @@ mlx5_flow_meter_uninit(struct rte_eth_dev *dev)
mlx5_free(priv->mtr_profile_arr);
priv->mtr_profile_arr = NULL;
}
+ if (priv->hws_mpool) {
+ mlx5_aso_mtr_queue_uninit(priv->sh, priv->hws_mpool, NULL);
+ mlx5_ipool_destroy(priv->hws_mpool->idx_pool);
+ mlx5_free(priv->hws_mpool);
+ priv->hws_mpool = NULL;
+ }
if (priv->mtr_bulk.aso) {
mlx5_free(priv->mtr_bulk.aso);
priv->mtr_bulk.aso = NULL;
@@ -6656,7 +6939,8 @@ int
mlx5_flow_meter_init(struct rte_eth_dev *dev,
uint32_t nb_meters,
uint32_t nb_meter_profiles,
- uint32_t nb_meter_policies)
+ uint32_t nb_meter_policies,
+ uint32_t nb_queues)
{
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_devx_obj *dcs = NULL;
@@ -6666,29 +6950,35 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
struct mlx5_aso_mtr *aso;
uint32_t i;
struct rte_flow_error error;
+ uint32_t flags;
+ uint32_t nb_mtrs = rte_align32pow2(nb_meters);
+ struct mlx5_indexed_pool_config cfg = {
+ .size = sizeof(struct mlx5_aso_mtr),
+ .trunk_size = 1 << 12,
+ .per_core_cache = 1 << 13,
+ .need_lock = 1,
+ .release_mem_en = !!priv->sh->config.reclaim_mode,
+ .malloc = mlx5_malloc,
+ .max_idx = nb_meters,
+ .free = mlx5_free,
+ .type = "mlx5_hw_mtr_mark_action",
+ };
if (!nb_meters || !nb_meter_profiles || !nb_meter_policies) {
ret = ENOTSUP;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter configuration is
invalid.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter configuration is invalid.");
goto err;
}
if (!priv->mtr_en || !priv->sh->meter_aso_en) {
ret = ENOTSUP;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter ASO is not supported.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter ASO is not supported.");
goto err;
}
priv->mtr_config.nb_meters = nb_meters;
- if (mlx5_aso_queue_init(priv->sh, ASO_OPC_MOD_POLICER)) {
- ret = ENOMEM;
- rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter ASO queue allocation
failed.");
- goto err;
- }
log_obj_size = rte_log2_u32(nb_meters >> 1);
dcs = mlx5_devx_cmd_create_flow_meter_aso_obj
(priv->sh->cdev->ctx, priv->sh->cdev->pdn,
@@ -6696,8 +6986,8 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
if (!dcs) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter ASO object allocation
failed.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter ASO object allocation failed.");
goto err;
}
priv->mtr_bulk.devx_obj = dcs;
@@ -6705,31 +6995,33 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
if (reg_id < 0) {
ret = ENOTSUP;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter register is not
available.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter register is not available.");
goto err;
}
+ flags = MLX5DR_ACTION_FLAG_HWS_RX | MLX5DR_ACTION_FLAG_HWS_TX;
+ if (priv->sh->config.dv_esw_en && priv->master)
+ flags |= MLX5DR_ACTION_FLAG_HWS_FDB;
priv->mtr_bulk.action = mlx5dr_action_create_aso_meter
(priv->dr_ctx, (struct mlx5dr_devx_obj *)dcs,
- reg_id - REG_C_0, MLX5DR_ACTION_FLAG_HWS_RX |
- MLX5DR_ACTION_FLAG_HWS_TX |
- MLX5DR_ACTION_FLAG_HWS_FDB);
+ reg_id - REG_C_0, flags);
if (!priv->mtr_bulk.action) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter action creation failed.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter action creation failed.");
goto err;
}
priv->mtr_bulk.aso = mlx5_malloc(MLX5_MEM_ZERO,
- sizeof(struct mlx5_aso_mtr) *
nb_meters,
- RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ sizeof(struct mlx5_aso_mtr) *
+ nb_meters,
+ RTE_CACHE_LINE_SIZE,
+ SOCKET_ID_ANY);
if (!priv->mtr_bulk.aso) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter bulk ASO allocation
failed.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter bulk ASO allocation failed.");
goto err;
}
priv->mtr_bulk.size = nb_meters;
@@ -6740,32 +7032,65 @@ mlx5_flow_meter_init(struct rte_eth_dev *dev,
aso->offset = i;
aso++;
}
+ priv->hws_mpool = mlx5_malloc(MLX5_MEM_ZERO,
+ sizeof(struct mlx5_aso_mtr_pool),
+ RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ if (!priv->hws_mpool) {
+ ret = ENOMEM;
+ rte_flow_error_set(&error, ENOMEM,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter ipool allocation failed.");
+ goto err;
+ }
+ priv->hws_mpool->devx_obj = priv->mtr_bulk.devx_obj;
+ priv->hws_mpool->action = priv->mtr_bulk.action;
+ priv->hws_mpool->nb_sq = nb_queues;
+ if (mlx5_aso_mtr_queue_init(priv->sh, priv->hws_mpool,
+ &priv->sh->mtrmng->pools_mng, nb_queues)) {
+ ret = ENOMEM;
+ rte_flow_error_set(&error, ENOMEM,
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter ASO queue allocation failed.");
+ goto err;
+ }
+ /*
+ * No need for local cache if Meter number is a small number.
+ * Since flow insertion rate will be very limited in that case.
+ * Here let's set the number to less than default trunk size 4K.
+ */
+ if (nb_mtrs <= cfg.trunk_size) {
+ cfg.per_core_cache = 0;
+ cfg.trunk_size = nb_mtrs;
+ } else if (nb_mtrs <= MLX5_HW_IPOOL_SIZE_THRESHOLD) {
+ cfg.per_core_cache = MLX5_HW_IPOOL_CACHE_MIN;
+ }
+ priv->hws_mpool->idx_pool = mlx5_ipool_create(&cfg);
priv->mtr_config.nb_meter_profiles = nb_meter_profiles;
priv->mtr_profile_arr =
mlx5_malloc(MLX5_MEM_ZERO,
- sizeof(struct mlx5_flow_meter_profile) *
- nb_meter_profiles,
- RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ sizeof(struct mlx5_flow_meter_profile) *
+ nb_meter_profiles,
+ RTE_CACHE_LINE_SIZE,
+ SOCKET_ID_ANY);
if (!priv->mtr_profile_arr) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter profile allocation
failed.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter profile allocation failed.");
goto err;
}
priv->mtr_config.nb_meter_policies = nb_meter_policies;
priv->mtr_policy_arr =
mlx5_malloc(MLX5_MEM_ZERO,
- sizeof(struct mlx5_flow_meter_policy) *
- nb_meter_policies,
- RTE_CACHE_LINE_SIZE,
- SOCKET_ID_ANY);
+ sizeof(struct mlx5_flow_meter_policy) *
+ nb_meter_policies,
+ RTE_CACHE_LINE_SIZE,
+ SOCKET_ID_ANY);
if (!priv->mtr_policy_arr) {
ret = ENOMEM;
rte_flow_error_set(&error, ENOMEM,
- RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
- NULL, "Meter policy allocation
failed.");
+ RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
+ NULL, "Meter policy allocation failed.");
goto err;
}
return 0;
diff --git a/drivers/net/mlx5/mlx5_flow_meter.c
b/drivers/net/mlx5/mlx5_flow_meter.c
index 8cf24d1f7a..ed2306283d 100644
--- a/drivers/net/mlx5/mlx5_flow_meter.c
+++ b/drivers/net/mlx5/mlx5_flow_meter.c
@@ -588,6 +588,36 @@ mlx5_flow_meter_profile_delete(struct rte_eth_dev *dev,
return 0;
}
+/**
+ * Callback to get MTR profile.
+ *
+ * @param[in] dev
+ * Pointer to Ethernet device.
+ * @param[in] meter_profile_id
+ * Meter profile id.
+ * @param[out] error
+ * Pointer to the error structure.
+ *
+ * @return
+ * A valid handle in case of success, NULL otherwise.
+ */
+static struct rte_flow_meter_profile *
+mlx5_flow_meter_profile_get(struct rte_eth_dev *dev,
+ uint32_t meter_profile_id,
+ struct rte_mtr_error *error)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+
+ if (!priv->mtr_en) {
+ rte_mtr_error_set(error, ENOTSUP,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Meter is not supported");
+ return NULL;
+ }
+ return (void *)(uintptr_t)mlx5_flow_meter_profile_find(priv,
+ meter_profile_id);
+}
+
/**
* Callback to add MTR profile with HWS.
*
@@ -1150,6 +1180,37 @@ mlx5_flow_meter_policy_delete(struct rte_eth_dev *dev,
return 0;
}
+/**
+ * Callback to get MTR policy.
+ *
+ * @param[in] dev
+ * Pointer to Ethernet device.
+ * @param[in] policy_id
+ * Meter policy id.
+ * @param[out] error
+ * Pointer to the error structure.
+ *
+ * @return
+ * A valid handle in case of success, NULL otherwise.
+ */
+static struct rte_flow_meter_policy *
+mlx5_flow_meter_policy_get(struct rte_eth_dev *dev,
+ uint32_t policy_id,
+ struct rte_mtr_error *error)
+{
+ struct mlx5_priv *priv = dev->data->dev_private;
+ uint32_t policy_idx;
+
+ if (!priv->mtr_en) {
+ rte_mtr_error_set(error, ENOTSUP,
+ RTE_MTR_ERROR_TYPE_UNSPECIFIED, NULL,
+ "Meter is not supported");
+ return NULL;
+ }
+ return (void *)(uintptr_t)mlx5_flow_meter_policy_find(dev, policy_id,
+ &policy_idx);
+}
+
/**
* Callback to delete MTR policy for HWS.
*
@@ -1310,9 +1371,9 @@ mlx5_flow_meter_policy_hws_add(struct rte_eth_dev *dev,
RTE_MTR_ERROR_TYPE_METER_POLICY_ID,
NULL, "Meter policy already exists.");
if (!policy ||
- !policy->actions[RTE_COLOR_RED] ||
- !policy->actions[RTE_COLOR_YELLOW] ||
- !policy->actions[RTE_COLOR_GREEN])
+ (!policy->actions[RTE_COLOR_RED] &&
+ !policy->actions[RTE_COLOR_YELLOW] &&
+ !policy->actions[RTE_COLOR_GREEN]))
return -rte_mtr_error_set(error, EINVAL,
RTE_MTR_ERROR_TYPE_METER_POLICY,
NULL, "Meter policy actions are not
valid.");
@@ -1372,6 +1433,11 @@ mlx5_flow_meter_policy_hws_add(struct rte_eth_dev *dev,
act++;
}
}
+ if (priv->sh->config.dv_esw_en)
+ domain_color &= ~(MLX5_MTR_DOMAIN_EGRESS_BIT |
+ MLX5_MTR_DOMAIN_TRANSFER_BIT);
+ else
+ domain_color &= ~MLX5_MTR_DOMAIN_TRANSFER_BIT;
if (!domain_color)
return -rte_mtr_error_set(error, ENOTSUP,
RTE_MTR_ERROR_TYPE_METER_POLICY_ID,
@@ -1565,11 +1631,11 @@ mlx5_flow_meter_action_modify(struct mlx5_priv *priv,
if (priv->sh->meter_aso_en) {
fm->is_enable = !!is_enable;
aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
- ret = mlx5_aso_meter_update_by_wqe(priv->sh, aso_mtr,
- &priv->mtr_bulk);
+ ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,
+ aso_mtr, &priv->mtr_bulk);
if (ret)
return ret;
- ret = mlx5_aso_mtr_wait(priv->sh, aso_mtr);
+ ret = mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr);
if (ret)
return ret;
} else {
@@ -1815,8 +1881,8 @@ mlx5_flow_meter_create(struct rte_eth_dev *dev, uint32_t
meter_id,
/* If ASO meter supported, update ASO flow meter by wqe. */
if (priv->sh->meter_aso_en) {
aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
- ret = mlx5_aso_meter_update_by_wqe(priv->sh, aso_mtr,
- &priv->mtr_bulk);
+ ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE,
+ aso_mtr, &priv->mtr_bulk);
if (ret)
goto error;
if (!priv->mtr_idx_tbl) {
@@ -1921,7 +1987,7 @@ mlx5_flow_meter_hws_create(struct rte_eth_dev *dev,
uint32_t meter_id,
fm->shared = !!shared;
fm->initialized = 1;
/* Update ASO flow meter by wqe. */
- ret = mlx5_aso_meter_update_by_wqe(priv->sh, aso_mtr,
+ ret = mlx5_aso_meter_update_by_wqe(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr,
&priv->mtr_bulk);
if (ret)
return -rte_mtr_error_set(error, ENOTSUP,
@@ -2401,9 +2467,11 @@ static const struct rte_mtr_ops mlx5_flow_mtr_ops = {
.capabilities_get = mlx5_flow_mtr_cap_get,
.meter_profile_add = mlx5_flow_meter_profile_add,
.meter_profile_delete = mlx5_flow_meter_profile_delete,
+ .meter_profile_get = mlx5_flow_meter_profile_get,
.meter_policy_validate = mlx5_flow_meter_policy_validate,
.meter_policy_add = mlx5_flow_meter_policy_add,
.meter_policy_delete = mlx5_flow_meter_policy_delete,
+ .meter_policy_get = mlx5_flow_meter_policy_get,
.create = mlx5_flow_meter_create,
.destroy = mlx5_flow_meter_destroy,
.meter_enable = mlx5_flow_meter_enable,
@@ -2418,9 +2486,11 @@ static const struct rte_mtr_ops mlx5_flow_mtr_hws_ops = {
.capabilities_get = mlx5_flow_mtr_cap_get,
.meter_profile_add = mlx5_flow_meter_profile_hws_add,
.meter_profile_delete = mlx5_flow_meter_profile_hws_delete,
+ .meter_profile_get = mlx5_flow_meter_profile_get,
.meter_policy_validate = mlx5_flow_meter_policy_hws_validate,
.meter_policy_add = mlx5_flow_meter_policy_hws_add,
.meter_policy_delete = mlx5_flow_meter_policy_hws_delete,
+ .meter_policy_get = mlx5_flow_meter_policy_get,
.create = mlx5_flow_meter_hws_create,
.destroy = mlx5_flow_meter_hws_destroy,
.meter_enable = mlx5_flow_meter_enable,
@@ -2566,7 +2636,7 @@ mlx5_flow_meter_attach(struct mlx5_priv *priv,
struct mlx5_aso_mtr *aso_mtr;
aso_mtr = container_of(fm, struct mlx5_aso_mtr, fm);
- if (mlx5_aso_mtr_wait(priv->sh, aso_mtr)) {
+ if (mlx5_aso_mtr_wait(priv->sh, MLX5_HW_INV_QUEUE, aso_mtr)) {
return rte_flow_error_set(error, ENOENT,
RTE_FLOW_ERROR_TYPE_UNSPECIFIED,
NULL,
@@ -2865,7 +2935,7 @@ mlx5_flow_meter_flush(struct rte_eth_dev *dev, struct
rte_mtr_error *error)
}
}
if (priv->mtr_bulk.aso) {
- for (i = 1; i <= priv->mtr_config.nb_meter_profiles; i++) {
+ for (i = 0; i < priv->mtr_config.nb_meters; i++) {
aso_mtr = mlx5_aso_meter_by_idx(priv, i);
fm = &aso_mtr->fm;
if (fm->initialized)
--
2.25.1
