#include <rte_log.h>
#include <rte_errno.h>
+#include <rte_memory.h>
#include <rte_malloc.h>
#include <rte_regexdev.h>
#include <rte_regexdev_core.h>
#include <mlx5_devx_cmds.h>
#include <mlx5_prm.h>
#include <mlx5_common_os.h>
+#include <mlx5_common_devx.h>
#include "mlx5_regex.h"
#include "mlx5_regex_utils.h"
/**
* destroy CQ.
*
- * @param priv
- * Pointer to the priv object.
* @param cp
* Pointer to the CQ to be destroyed.
*
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
static int
-regex_ctrl_destroy_cq(struct mlx5_regex_priv *priv, struct mlx5_regex_cq *cq)
+regex_ctrl_destroy_cq(struct mlx5_regex_cq *cq)
{
- if (cq->cqe_umem) {
- mlx5_glue->devx_umem_dereg(cq->cqe_umem);
- cq->cqe_umem = NULL;
- }
- if (cq->cqe) {
- rte_free((void *)(uintptr_t)cq->cqe);
- cq->cqe = NULL;
- }
- if (cq->dbr_offset) {
- mlx5_release_dbr(&priv->dbrpgs, cq->dbr_umem, cq->dbr_offset);
- cq->dbr_offset = -1;
- }
- if (cq->obj) {
- mlx5_devx_cmd_destroy(cq->obj);
- cq->obj = NULL;
- }
+ mlx5_devx_cq_destroy(&cq->cq_obj);
+ memset(cq, 0, sizeof(*cq));
return 0;
}
regex_ctrl_create_cq(struct mlx5_regex_priv *priv, struct mlx5_regex_cq *cq)
{
struct mlx5_devx_cq_attr attr = {
- .q_umem_valid = 1,
- .db_umem_valid = 1,
- .eqn = priv->eqn,
+ .uar_page_id = priv->uar->page_id,
};
- struct mlx5_devx_dbr_page *dbr_page = NULL;
- void *buf = NULL;
- size_t pgsize = sysconf(_SC_PAGESIZE);
- uint32_t cq_size = 1 << cq->log_nb_desc;
- uint32_t i;
-
- cq->dbr_offset = mlx5_get_dbr(priv->ctx, &priv->dbrpgs, &dbr_page);
- if (cq->dbr_offset < 0) {
- DRV_LOG(ERR, "Can't allocate cq door bell record.");
- rte_errno = ENOMEM;
- goto error;
- }
- cq->dbr_umem = mlx5_os_get_umem_id(dbr_page->umem);
- cq->dbr = (uint32_t *)((uintptr_t)dbr_page->dbrs +
- (uintptr_t)cq->dbr_offset);
+ int ret;
- buf = rte_calloc(NULL, 1, sizeof(struct mlx5_cqe) * cq_size, 4096);
- if (!buf) {
- DRV_LOG(ERR, "Can't allocate cqe buffer.");
- rte_errno = ENOMEM;
- goto error;
- }
- cq->cqe = buf;
- for (i = 0; i < cq_size; i++)
- cq->cqe[i].op_own = 0xff;
- cq->cqe_umem = mlx5_glue->devx_umem_reg(priv->ctx, buf,
- sizeof(struct mlx5_cqe) *
- cq_size, 7);
cq->ci = 0;
- if (!cq->cqe_umem) {
- DRV_LOG(ERR, "Can't register cqe mem.");
- rte_errno = ENOMEM;
- goto error;
- }
- attr.db_umem_offset = cq->dbr_offset;
- attr.db_umem_id = cq->dbr_umem;
- attr.q_umem_id = mlx5_os_get_umem_id(cq->cqe_umem);
- attr.log_cq_size = cq->log_nb_desc;
- attr.uar_page_id = priv->uar->page_id;
- attr.log_page_size = rte_log2_u32(pgsize);
- cq->obj = mlx5_devx_cmd_create_cq(priv->ctx, &attr);
- if (!cq->obj) {
- DRV_LOG(ERR, "Can't create cq object.");
- rte_errno = ENOMEM;
- goto error;
+ ret = mlx5_devx_cq_create(priv->ctx, &cq->cq_obj, cq->log_nb_desc,
+ &attr, SOCKET_ID_ANY);
+ if (ret) {
+ DRV_LOG(ERR, "Can't create CQ object.");
+ memset(cq, 0, sizeof(*cq));
+ rte_errno = ENOMEM;
+ return -rte_errno;
}
return 0;
-error:
- if (cq->cqe_umem)
- mlx5_glue->devx_umem_dereg(cq->cqe_umem);
- if (buf)
- rte_free(buf);
- if (cq->dbr_offset)
- mlx5_release_dbr(&priv->dbrpgs, cq->dbr_umem, cq->dbr_offset);
- return -rte_errno;
}
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
}
#endif
+/**
+ * Destroy the SQ object.
+ *
+ * @param qp
+ * Pointer to the QP element
+ * @param q_ind
+ * The index of the queue.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+regex_ctrl_destroy_sq(struct mlx5_regex_qp *qp, uint16_t q_ind)
+{
+ struct mlx5_regex_sq *sq = &qp->sqs[q_ind];
+
+ mlx5_devx_sq_destroy(&sq->sq_obj);
+ memset(sq, 0, sizeof(*sq));
+ return 0;
+}
+
/**
* create the SQ object.
*
uint16_t q_ind, uint16_t log_nb_desc)
{
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
- struct mlx5_devx_create_sq_attr attr = { 0 };
- struct mlx5_devx_modify_sq_attr modify_attr = { 0 };
- struct mlx5_devx_wq_attr *wq_attr = &attr.wq_attr;
- struct mlx5_devx_dbr_page *dbr_page = NULL;
+ struct mlx5_devx_create_sq_attr attr = {
+ .user_index = q_ind,
+ .cqn = qp->cq.cq_obj.cq->id,
+ .wq_attr = (struct mlx5_devx_wq_attr){
+ .uar_page = priv->uar->page_id,
+ },
+ };
+ struct mlx5_devx_modify_sq_attr modify_attr = {
+ .state = MLX5_SQC_STATE_RDY,
+ };
struct mlx5_regex_sq *sq = &qp->sqs[q_ind];
- void *buf = NULL;
- uint32_t sq_size;
uint32_t pd_num = 0;
int ret;
sq->log_nb_desc = log_nb_desc;
- sq_size = 1 << sq->log_nb_desc;
- sq->dbr_offset = mlx5_get_dbr(priv->ctx, &priv->dbrpgs, &dbr_page);
- if (sq->dbr_offset < 0) {
- DRV_LOG(ERR, "Can't allocate sq door bell record.");
- rte_errno = ENOMEM;
- goto error;
- }
- sq->dbr_umem = mlx5_os_get_umem_id(dbr_page->umem);
- sq->dbr = (uint32_t *)((uintptr_t)dbr_page->dbrs +
- (uintptr_t)sq->dbr_offset);
-
- buf = rte_calloc(NULL, 1, 64 * sq_size, 4096);
- if (!buf) {
- DRV_LOG(ERR, "Can't allocate wqe buffer.");
- rte_errno = ENOMEM;
- goto error;
- }
- sq->wqe = buf;
- sq->wqe_umem = mlx5_glue->devx_umem_reg(priv->ctx, buf, 64 * sq_size,
- 7);
sq->ci = 0;
sq->pi = 0;
- if (!sq->wqe_umem) {
- DRV_LOG(ERR, "Can't register wqe mem.");
- rte_errno = ENOMEM;
- goto error;
- }
- attr.state = MLX5_SQC_STATE_RST;
- attr.tis_lst_sz = 0;
- attr.tis_num = 0;
- attr.user_index = q_ind;
- attr.cqn = qp->cq.obj->id;
- wq_attr->uar_page = priv->uar->page_id;
- regex_get_pdn(priv->pd, &pd_num);
- wq_attr->pd = pd_num;
- wq_attr->wq_type = MLX5_WQ_TYPE_CYCLIC;
- wq_attr->dbr_umem_id = sq->dbr_umem;
- wq_attr->dbr_addr = sq->dbr_offset;
- wq_attr->dbr_umem_valid = 1;
- wq_attr->wq_umem_id = mlx5_os_get_umem_id(sq->wqe_umem);
- wq_attr->wq_umem_offset = 0;
- wq_attr->wq_umem_valid = 1;
- wq_attr->log_wq_stride = 6;
- wq_attr->log_wq_sz = sq->log_nb_desc;
- sq->obj = mlx5_devx_cmd_create_sq(priv->ctx, &attr);
- if (!sq->obj) {
- DRV_LOG(ERR, "Can't create sq object.");
- rte_errno = ENOMEM;
- goto error;
+ ret = regex_get_pdn(priv->pd, &pd_num);
+ if (ret)
+ return ret;
+ attr.wq_attr.pd = pd_num;
+ ret = mlx5_devx_sq_create(priv->ctx, &sq->sq_obj, log_nb_desc, &attr,
+ SOCKET_ID_ANY);
+ if (ret) {
+ DRV_LOG(ERR, "Can't create SQ object.");
+ rte_errno = ENOMEM;
+ return -rte_errno;
}
- modify_attr.state = MLX5_SQC_STATE_RDY;
- ret = mlx5_devx_cmd_modify_sq(sq->obj, &modify_attr);
+ ret = mlx5_devx_cmd_modify_sq(sq->sq_obj.sq, &modify_attr);
if (ret) {
- DRV_LOG(ERR, "Can't change sq state to ready.");
- rte_errno = ENOMEM;
- goto error;
+ DRV_LOG(ERR, "Can't change SQ state to ready.");
+ regex_ctrl_destroy_sq(qp, q_ind);
+ rte_errno = ENOMEM;
+ return -rte_errno;
}
-
return 0;
-error:
- if (sq->wqe_umem)
- mlx5_glue->devx_umem_dereg(sq->wqe_umem);
- if (buf)
- rte_free(buf);
- if (sq->dbr_offset)
- mlx5_release_dbr(&priv->dbrpgs, sq->dbr_umem, sq->dbr_offset);
- return -rte_errno;
#else
(void)priv;
(void)qp;
#endif
}
-/**
- * Destroy the SQ object.
- *
- * @param priv
- * Pointer to the priv object.
- * @param qp
- * Pointer to the QP element
- * @param q_ind
- * The index of the queue.
- *
- * @return
- * 0 on success, a negative errno value otherwise and rte_errno is set.
- */
-static int
-regex_ctrl_destroy_sq(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp,
- uint16_t q_ind)
-{
- struct mlx5_regex_sq *sq = &qp->sqs[q_ind];
-
- if (sq->wqe_umem) {
- mlx5_glue->devx_umem_dereg(sq->wqe_umem);
- sq->wqe_umem = NULL;
- }
- if (sq->wqe) {
- rte_free((void *)(uintptr_t)sq->wqe);
- sq->wqe = NULL;
- }
- if (sq->dbr_offset) {
- mlx5_release_dbr(&priv->dbrpgs, sq->dbr_umem, sq->dbr_offset);
- sq->dbr_offset = -1;
- }
- if (sq->obj) {
- mlx5_devx_cmd_destroy(sq->obj);
- sq->obj = NULL;
- }
- return 0;
-}
-
/**
* Setup the qp.
*
mlx5_mr_btree_free(&qp->mr_ctrl.cache_bh);
err_btree:
for (i = 0; i < nb_sq_config; i++)
- regex_ctrl_destroy_sq(priv, qp, i);
- regex_ctrl_destroy_cq(priv, &qp->cq);
+ regex_ctrl_destroy_sq(qp, i);
+ regex_ctrl_destroy_cq(&qp->cq);
err_cq:
rte_free(qp->sqs);
return ret;
git.droids-corp.org / dpdk.git / blobdiff