From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 13531A053D;
Fri, 17 Jul 2020 13:13:04 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 6EE0B1C0CD;
Fri, 17 Jul 2020 13:11:56 +0200 (CEST)
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id C33101C113
for <dev@dpdk.org>; Fri, 17 Jul 2020 13:11:47 +0200 (CEST)
Received: from Internal Mail-Server by MTLPINE1 (envelope-from
orika@mellanox.com) with SMTP; 17 Jul 2020 14:11:46 +0300
Received: from pegasus04.mtr.labs.mlnx. (pegasus04.mtr.labs.mlnx
[10.210.16.126])
by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id 06HBB6L0025276;
Fri, 17 Jul 2020 14:11:46 +0300
From: Ori Kam <orika@mellanox.com>
To: jerinj@marvell.com, xiang.w.wang@intel.com, matan@mellanox.com,
viacheslavo@mellanox.com
Cc: guyk@marvell.com, dev@dpdk.org, pbhagavatula@marvell.com,
shahafs@mellanox.com, hemant.agrawal@nxp.com, opher@mellanox.com,
alexr@mellanox.com, dovrat@marvell.com, pkapoor@marvell.com,
nipun.gupta@nxp.com, bruce.richardson@intel.com, yang.a.hong@intel.com,
harry.chang@intel.com, gu.jian1@zte.com.cn, shanjiangh@chinatelecom.cn,
zhangy.yun@chinatelecom.cn, lixingfu@huachentel.com,
wushuai@inspur.com, yuyingxia@yxlink.com, fanchenggang@sunyainfo.com,
davidfgao@tencent.com, liuzhong1@chinaunicom.cn, zhaoyong11@huawei.com,
oc@yunify.com, jim@netgate.com, hongjun.ni@intel.com, deri@ntop.org,
fc@napatech.com, arthur.su@lionic.com, thomas@monjalon.net,
orika@mellanox.com, rasland@mellanox.com
Date: Fri, 17 Jul 2020 11:10:59 +0000
Message-Id: <1594984263-89741-10-git-send-email-orika@mellanox.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1594984263-89741-1-git-send-email-orika@mellanox.com>
References: <1593941027-86651-1-git-send-email-orika@mellanox.com>
<1594984263-89741-1-git-send-email-orika@mellanox.com>
Subject: [dpdk-dev] [PATCH v4 09/13] regex/mlx5: add send queue support
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
This commit introduce the SQ creation.
The SQ is used for enqueuing a job.
In order to support out of order matches, we create number
os SQ per one application QP.
Signed-off-by: Ori Kam <orika@mellanox.com>
---
drivers/regex/mlx5/mlx5_regex.h | 2 +
drivers/regex/mlx5/mlx5_regex_control.c | 168 ++++++++++++++++++++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 21770ca..bf285a1 100644
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -21,6 +21,7 @@ struct mlx5_regex_sq {
uint32_t dbr_umem; /* Door bell record umem id. */
uint8_t *wqe; /* The SQ ring buffer. */
struct mlx5dv_devx_umem *wqe_umem; /* SQ buffer umem. */
+ uint32_t *dbr;
};
struct mlx5_regex_cq {
@@ -30,6 +31,7 @@ struct mlx5_regex_cq {
uint32_t dbr_umem; /* Door bell record umem id. */
volatile struct mlx5_cqe *cqe; /* The CQ ring buffer. */
struct mlx5dv_devx_umem *cqe_umem; /* CQ buffer umem. */
+ uint32_t *dbr;
};
struct mlx5_regex_qp {
diff --git a/drivers/regex/mlx5/mlx5_regex_control.c b/drivers/regex/mlx5/mlx5_regex_control.c
index 577965f..d378f48 100644
--- a/drivers/regex/mlx5/mlx5_regex_control.c
+++ b/drivers/regex/mlx5/mlx5_regex_control.c
@@ -105,6 +105,9 @@
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);
+
buf = rte_calloc(NULL, 1, sizeof(struct mlx5_cqe) * cq_size, 4096);
if (!buf) {
DRV_LOG(ERR, "Can't allocate cqe buffer.");
@@ -145,6 +148,159 @@
return -rte_errno;
}
+static int
+regex_get_pdn(void *pd, uint32_t *pdn)
+{
+ struct mlx5dv_obj obj;
+ struct mlx5dv_pd pd_info;
+ int ret = 0;
+
+ obj.pd.in = pd;
+ obj.pd.out = &pd_info;
+ ret = mlx5_glue->dv_init_obj(&obj, MLX5DV_OBJ_PD);
+ if (ret) {
+ DRV_LOG(DEBUG, "Fail to get PD object info");
+ return ret;
+ }
+ *pdn = pd_info.pdn;
+ return 0;
+}
+
+/**
+ * create 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.
+ * @param log_nb_desc
+ * Log 2 of the number of descriptors to be used.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+regex_ctrl_create_sq(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp,
+ uint16_t q_ind, uint16_t log_nb_desc)
+{
+ 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_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);
+ 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;
+ }
+ modify_attr.state = MLX5_SQC_STATE_RDY;
+ ret = mlx5_devx_cmd_modify_sq(sq->obj, &modify_attr);
+ if (ret) {
+ DRV_LOG(ERR, "Can't change sq state to ready.");
+ rte_errno = ENOMEM;
+ goto error;
+ }
+
+ 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;
+}
+
+/**
+ * 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.
*
@@ -164,7 +320,9 @@
{
struct mlx5_regex_priv *priv = dev->data->dev_private;
struct mlx5_regex_qp *qp;
+ int i;
int ret;
+ uint16_t log_desc;
qp = &priv->qps[qp_ind];
qp->flags = cfg->qp_conf_flags;
@@ -181,15 +339,25 @@
rte_errno = ENOMEM;
return -rte_errno;
}
+ log_desc = rte_log2_u32(qp->nb_desc / qp->nb_obj);
ret = regex_ctrl_create_cq(priv, &qp->cq);
if (ret) {
DRV_LOG(ERR, "Can't create cq.");
goto error;
}
+ for (i = 0; i < qp->nb_obj; i++) {
+ ret = regex_ctrl_create_sq(priv, qp, i, log_desc);
+ if (ret) {
+ DRV_LOG(ERR, "Can't create sq.");
+ goto error;
+ }
+ }
return 0;
error:
regex_ctrl_destroy_cq(priv, &qp->cq);
+ for (i = 0; i < qp->nb_obj; i++)
+ ret = regex_ctrl_destroy_sq(priv, qp, i);
return -rte_errno;
}
--
1.8.3.1