From: Yuval Avnery <yuva...@mellanox.com>
Will look for a free SQ to send the job on.
doorbell will be given when sq is full, or no more jobs on the burst.
Signed-off-by: Yuval Avnery <yuva...@mellanox.com>
Acked-by: Ori Kam <or...@mellanox.com>
---
drivers/regex/mlx5/mlx5_regex.c | 1 +
drivers/regex/mlx5/mlx5_regex.h | 6 ++
drivers/regex/mlx5/mlx5_regex_control.c | 2 +
drivers/regex/mlx5/mlx5_regex_fastpath.c | 125 +++++++++++++++++++++++++++++++
4 files changed, 134 insertions(+)
diff --git a/drivers/regex/mlx5/mlx5_regex.c b/drivers/regex/mlx5/mlx5_regex.c
index 0f20cde..503bdf8 100644
--- a/drivers/regex/mlx5/mlx5_regex.c
+++ b/drivers/regex/mlx5/mlx5_regex.c
@@ -179,6 +179,7 @@
goto error;
}
priv->regexdev->dev_ops = &mlx5_regexdev_ops;
+ priv->regexdev->enqueue = mlx5_regexdev_enqueue;
priv->regexdev->device = (struct rte_device *)pci_dev;
priv->regexdev->data->dev_private = priv;
priv->regexdev->state = RTE_REGEXDEV_READY;
diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 3a63e33..e28c7d3 100644
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -25,6 +25,9 @@ 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. */
+ size_t pi, db_pi;
+ size_t ci;
+ uint32_t sqn;
uint32_t *dbr;
};
@@ -49,6 +52,7 @@ struct mlx5_regex_qp {
struct ibv_mr *metadata;
struct ibv_mr *inputs;
struct ibv_mr *outputs;
+ size_t ci, pi;
};
struct mlx5_regex_db {
@@ -90,4 +94,6 @@ int mlx5_regex_rules_db_import(struct rte_regexdev *dev,
/* mlx5_regex_fastpath.c */
int mlx5_regexdev_setup_fastpath(struct mlx5_regex_priv *priv, uint32_t qp_id);
+uint16_t mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
+ struct rte_regex_ops **ops, uint16_t nb_ops);
#endif /* MLX5_REGEX_H */
diff --git a/drivers/regex/mlx5/mlx5_regex_control.c
b/drivers/regex/mlx5/mlx5_regex_control.c
index f054184..c0ed0b5 100644
--- a/drivers/regex/mlx5/mlx5_regex_control.c
+++ b/drivers/regex/mlx5/mlx5_regex_control.c
@@ -220,6 +220,8 @@
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;
diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c
b/drivers/regex/mlx5/mlx5_regex_fastpath.c
index 7f82e1e..072bc57 100644
--- a/drivers/regex/mlx5/mlx5_regex_fastpath.c
+++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c
@@ -59,6 +59,131 @@ struct mlx5_regex_job {
static MLX5DV_ALWAYS_INLINE
+void mlx5_regex_set_ctrl_seg(void *seg,
+ uint8_t le, uint16_t subset_id0,
+ uint16_t subset_id1, uint16_t subset_id2,
+ uint16_t subset_id3, uint8_t ctrl)
+{
+ DEVX_SET(regexp_mmo_control, seg, le, le);
+ DEVX_SET(regexp_mmo_control, seg, ctrl, ctrl);
+ DEVX_SET(regexp_mmo_control, seg, subset_id_0, subset_id0);
+ DEVX_SET(regexp_mmo_control, seg, subset_id_1, subset_id1);
+ DEVX_SET(regexp_mmo_control, seg, subset_id_2, subset_id2);
+ DEVX_SET(regexp_mmo_control, seg, subset_id_3, subset_id3);
+}
+
+static inline void
+prep_one(struct mlx5_regex_sq *sq, struct rte_regex_ops *op,
+ struct mlx5_regex_job *job)
+{
+ memcpy(job->input,
+ rte_pktmbuf_mtod(op->mbuf, void *),
+ rte_pktmbuf_data_len(op->mbuf));
+
+ size_t wqe_offset = (sq->pi % sq_size_get(sq)) * MLX5_SEND_WQE_BB;
+ uint8_t *wqe = (uint8_t *)sq->wqe + wqe_offset;
+ int ds = 4; /* ctrl + meta + input + output */
+
+ mlx5dv_set_ctrl_seg((struct mlx5_wqe_ctrl_seg *)wqe, sq->pi,
+ MLX5_OPCODE_MMO,
+ MLX5_OPC_MOD_MMO_REGEX, sq->obj->id,
+ 0, ds, 0, 0);
+
+ mlx5_regex_set_ctrl_seg(wqe+12, 0, op->group_id0, op->group_id1,
+ op->group_id2,
+ op->group_id3, 0);
+
+ struct mlx5_wqe_data_seg *input_seg =
+ (struct mlx5_wqe_data_seg *)(wqe+32);
+ input_seg->byte_count = htobe32(rte_pktmbuf_data_len(op->mbuf));
+
+ job->user_id = op->user_id;
+ sq->db_pi = sq->pi;
+ sq->pi = (sq->pi+1)%MAX_WQE_INDEX;
+}
+
+static inline void
+send_doorbell(struct mlx5dv_devx_uar *uar, struct mlx5_regex_sq *sq)
+{
+ size_t wqe_offset = (sq->db_pi % sq_size_get(sq)) * MLX5_SEND_WQE_BB;
+ uint8_t *wqe = (uint8_t *)sq->wqe + wqe_offset;
+ ((struct mlx5_wqe_ctrl_seg *)wqe)->fm_ce_se = MLX5_WQE_CTRL_CQ_UPDATE;
+ uint64_t *doorbell_addr =
+ (uint64_t *)((uint8_t *)uar->base_addr + 0x800);
+ rte_cio_wmb();
+ sq->dbr[MLX5_SND_DBR] = htobe32(sq->db_pi);
+ rte_wmb();
+ *doorbell_addr = *(volatile uint64_t *)wqe;
+ rte_wmb();
+}
+
+static inline int
+can_send(struct mlx5_regex_sq *sq) {
+ return unlikely(sq->ci > sq->pi) ?
+ MAX_WQE_INDEX + sq->pi - sq->ci < sq_size_get(sq) :
+ sq->pi - sq->ci < sq_size_get(sq);
+}
+
+static inline uint32_t
+job_id_get(uint32_t qid, size_t sq_size, size_t index) {
+ return qid*sq_size + index%sq_size;
+}
+
+/**
+ * DPDK callback for enqueue.
+ *
+ * @param dev
+ * Pointer to the regex dev structure.
+ * @param qp_id
+ * The queue to enqueue the traffic to.
+ * @param ops
+ * List of regex ops to enqueue.
+ * @param nb_ops
+ * Number of ops in ops parameter.
+ *
+ * @return
+ * Number of packets successfully enqueued (<= pkts_n).
+ */
+uint16_t
+mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
+ struct rte_regex_ops **ops, uint16_t nb_ops)
+{
+ struct mlx5_regex_priv *priv = dev->data->dev_private;
+ struct mlx5_regex_qp *queue = &priv->qps[qp_id];
+ struct mlx5_regex_sq *sq;
+ size_t sqid, job_id, i = 0;
+
+ while ((sqid = ffs(queue->free_sqs))) {
+ sqid--; /* ffs returns 1 for bit 0 */
+ sq = &queue->sqs[sqid];
+ while (can_send(sq)) {
+ job_id = job_id_get(sqid, sq_size_get(sq), sq->pi);
+ if (unlikely(rte_pktmbuf_data_len(ops[i]->mbuf) >
+ MLX5_REGEX_MAX_INPUT)) {
+ DRV_LOG(ERR, "Warning, Job input "
+ "size %d exceed %d bytes",
+ rte_pktmbuf_data_len(ops[i]->mbuf),
+ MLX5_REGEX_MAX_INPUT);
+ return 0;
+ }
+ prep_one(sq, ops[i], &queue->jobs[job_id]);
+ i++;
+ if (unlikely(i == nb_ops)) {
+ send_doorbell(priv->uar, sq);
+ goto out;
+ }
+ }
+ queue->free_sqs &= ~(1 << sqid);
+ send_doorbell(priv->uar, sq);
+ }
+
+out:
+ queue->pi += i;
+ return i;
+}
+
+
+static MLX5DV_ALWAYS_INLINE
void mlx5dv_set_metadata_seg(struct mlx5_wqe_metadata_seg *seg,
uint32_t mmo_control_31_0, uint32_t lkey,
uintptr_t address)
--
1.8.3.1
