* [dpdk-stable] [PATCH 1/4] regex/mlx5: fix memory rule alignment [not found] <20201217085158.28367-1-orika@nvidia.com> @ 2020-12-17 8:51 ` Ori Kam 2020-12-17 8:51 ` [dpdk-stable] [PATCH 3/4] regex/mlx5: fix support for group id Ori Kam [not found] ` <20210107165711.1782-1-orika@nvidia.com> 2 siblings, 0 replies; 5+ messages in thread From: Ori Kam @ 2020-12-17 8:51 UTC (permalink / raw) To: thomas; +Cc: orika, dev, stable Due to Kernel requirement the memory allocated must be aligned to 2M. Fixes: b34d816363b5 ("regex/mlx5: support rules import") Cc: stable@dpdk.org Signed-off-by: Ori Kam <orika@nvidia.com> --- drivers/regex/mlx5/mlx5_rxp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index fcbc766441..bd721f0b11 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -892,7 +892,7 @@ rxp_db_setup(struct mlx5_regex_priv *priv) /* Setup database memories for both RXP engines + reprogram memory. */ for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) { - priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 0); + priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 1 << 21); if (!priv->db[i].ptr) { DRV_LOG(ERR, "Failed to alloc db memory!"); ret = ENODEV; -- 2.25.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-stable] [PATCH 3/4] regex/mlx5: fix support for group id [not found] <20201217085158.28367-1-orika@nvidia.com> 2020-12-17 8:51 ` [dpdk-stable] [PATCH 1/4] regex/mlx5: fix memory rule alignment Ori Kam @ 2020-12-17 8:51 ` Ori Kam [not found] ` <20210107165711.1782-1-orika@nvidia.com> 2 siblings, 0 replies; 5+ messages in thread From: Ori Kam @ 2020-12-17 8:51 UTC (permalink / raw) To: thomas; +Cc: orika, dev, stable In order to know which groups in the RegEx engine should be used there is a need to check the req_flags. This commit adds the missing check. Cc: stable@dpdk.org Fixes: 4d4e245ad637 ("regex/mlx5: support enqueue") Signed-off-by: Ori Kam <orika@nvidia.com> --- drivers/regex/mlx5/mlx5_regex_fastpath.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c b/drivers/regex/mlx5/mlx5_regex_fastpath.c index 5857617282..8d134ac98e 100644 --- a/drivers/regex/mlx5/mlx5_regex_fastpath.c +++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c @@ -105,7 +105,21 @@ prep_one(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp, { size_t wqe_offset = (sq->pi & (sq_size_get(sq) - 1)) * MLX5_SEND_WQE_BB; uint32_t lkey; - + uint16_t group0 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID0_VALID_F ? + op->group_id0 : 0; + uint16_t group1 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F ? + op->group_id1 : 0; + uint16_t group2 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F ? + op->group_id2 : 0; + uint16_t group3 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F ? + op->group_id3 : 0; + + /* For backward compatibility. */ + if (!(op->req_flags & (RTE_REGEX_OPS_REQ_GROUP_ID0_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F))) + group0 = op->group_id0; lkey = mlx5_mr_addr2mr_bh(priv->pd, 0, &priv->mr_scache, &qp->mr_ctrl, rte_pktmbuf_mtod(op->mbuf, uintptr_t), @@ -116,9 +130,8 @@ prep_one(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp, set_wqe_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); - set_regex_ctrl_seg(wqe + 12, 0, op->group_id0, op->group_id1, - op->group_id2, - op->group_id3, 0); + set_regex_ctrl_seg(wqe + 12, 0, group0, group1, group2, group3, + 0); struct mlx5_wqe_data_seg *input_seg = (struct mlx5_wqe_data_seg *)(wqe + MLX5_REGEX_WQE_GATHER_OFFSET); -- 2.25.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <20210107165711.1782-1-orika@nvidia.com>]
* [dpdk-stable] [PATCH v2 1/5] regex/mlx5: fix memory rule alignment [not found] ` <20210107165711.1782-1-orika@nvidia.com> @ 2021-01-07 16:57 ` Ori Kam 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 3/5] regex/mlx5: fix support for group id Ori Kam 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 5/5] regex/mlx5: fix num of supported queues Ori Kam 2 siblings, 0 replies; 5+ messages in thread From: Ori Kam @ 2021-01-07 16:57 UTC (permalink / raw) To: thomas; +Cc: orika, dev, stable Due to Kernel requirement the memory allocated must be aligned to 2M. Fixes: b34d816363b5 ("regex/mlx5: support rules import") Cc: stable@dpdk.org Signed-off-by: Ori Kam <orika@nvidia.com> --- drivers/regex/mlx5/mlx5_rxp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index fcbc766441..bd721f0b11 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -892,7 +892,7 @@ rxp_db_setup(struct mlx5_regex_priv *priv) /* Setup database memories for both RXP engines + reprogram memory. */ for (i = 0; i < (priv->nb_engines + MLX5_RXP_EM_COUNT); i++) { - priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 0); + priv->db[i].ptr = rte_malloc("", MLX5_MAX_DB_SIZE, 1 << 21); if (!priv->db[i].ptr) { DRV_LOG(ERR, "Failed to alloc db memory!"); ret = ENODEV; -- 2.25.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-stable] [PATCH v2 3/5] regex/mlx5: fix support for group id [not found] ` <20210107165711.1782-1-orika@nvidia.com> 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 1/5] regex/mlx5: fix memory rule alignment Ori Kam @ 2021-01-07 16:57 ` Ori Kam 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 5/5] regex/mlx5: fix num of supported queues Ori Kam 2 siblings, 0 replies; 5+ messages in thread From: Ori Kam @ 2021-01-07 16:57 UTC (permalink / raw) To: thomas; +Cc: orika, dev, stable In order to know which groups in the RegEx engine should be used there is a need to check the req_flags. This commit adds the missing check. Cc: stable@dpdk.org Fixes: 4d4e245ad637 ("regex/mlx5: support enqueue") Signed-off-by: Ori Kam <orika@nvidia.com> --- drivers/regex/mlx5/mlx5_regex_fastpath.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c b/drivers/regex/mlx5/mlx5_regex_fastpath.c index 5857617282..8d134ac98e 100644 --- a/drivers/regex/mlx5/mlx5_regex_fastpath.c +++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c @@ -105,7 +105,21 @@ prep_one(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp, { size_t wqe_offset = (sq->pi & (sq_size_get(sq) - 1)) * MLX5_SEND_WQE_BB; uint32_t lkey; - + uint16_t group0 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID0_VALID_F ? + op->group_id0 : 0; + uint16_t group1 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F ? + op->group_id1 : 0; + uint16_t group2 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F ? + op->group_id2 : 0; + uint16_t group3 = op->req_flags & RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F ? + op->group_id3 : 0; + + /* For backward compatibility. */ + if (!(op->req_flags & (RTE_REGEX_OPS_REQ_GROUP_ID0_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID1_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID2_VALID_F | + RTE_REGEX_OPS_REQ_GROUP_ID3_VALID_F))) + group0 = op->group_id0; lkey = mlx5_mr_addr2mr_bh(priv->pd, 0, &priv->mr_scache, &qp->mr_ctrl, rte_pktmbuf_mtod(op->mbuf, uintptr_t), @@ -116,9 +130,8 @@ prep_one(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *qp, set_wqe_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); - set_regex_ctrl_seg(wqe + 12, 0, op->group_id0, op->group_id1, - op->group_id2, - op->group_id3, 0); + set_regex_ctrl_seg(wqe + 12, 0, group0, group1, group2, group3, + 0); struct mlx5_wqe_data_seg *input_seg = (struct mlx5_wqe_data_seg *)(wqe + MLX5_REGEX_WQE_GATHER_OFFSET); -- 2.25.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [dpdk-stable] [PATCH v2 5/5] regex/mlx5: fix num of supported queues [not found] ` <20210107165711.1782-1-orika@nvidia.com> 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 1/5] regex/mlx5: fix memory rule alignment Ori Kam 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 3/5] regex/mlx5: fix support for group id Ori Kam @ 2021-01-07 16:57 ` Ori Kam 2 siblings, 0 replies; 5+ messages in thread From: Ori Kam @ 2021-01-07 16:57 UTC (permalink / raw) To: thomas; +Cc: orika, dev, stable The RegEx engine as no limitation on number of queues. This commits modifies the max supported queues reported to the application. Fixes: fbc8c7003b93 ("regex/mlx5: add completion queue creation") Cc: stable@dpdk.org Signed-off-by: Ori Kam <orika@nvidia.com> --- drivers/regex/mlx5/mlx5_rxp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c index 66cbc1f481..e5d9b9245a 100644 --- a/drivers/regex/mlx5/mlx5_rxp.c +++ b/drivers/regex/mlx5/mlx5_rxp.c @@ -103,11 +103,10 @@ mlx5_regex_info_get(struct rte_regexdev *dev __rte_unused, info->max_payload_size = MLX5_REGEX_MAX_PAYLOAD_SIZE; info->max_rules_per_group = MLX5_REGEX_MAX_RULES_PER_GROUP; info->max_groups = MLX5_REGEX_MAX_GROUPS; - info->max_queue_pairs = 1; info->regexdev_capa = RTE_REGEXDEV_SUPP_PCRE_GREEDY_F | RTE_REGEXDEV_CAPA_QUEUE_PAIR_OOS_F; info->rule_flags = 0; - info->max_queue_pairs = 10; + info->max_queue_pairs = UINT16_MAX; return 0; } -- 2.25.1 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-07 16:57 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20201217085158.28367-1-orika@nvidia.com> 2020-12-17 8:51 ` [dpdk-stable] [PATCH 1/4] regex/mlx5: fix memory rule alignment Ori Kam 2020-12-17 8:51 ` [dpdk-stable] [PATCH 3/4] regex/mlx5: fix support for group id Ori Kam [not found] ` <20210107165711.1782-1-orika@nvidia.com> 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 1/5] regex/mlx5: fix memory rule alignment Ori Kam 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 3/5] regex/mlx5: fix support for group id Ori Kam 2021-01-07 16:57 ` [dpdk-stable] [PATCH v2 5/5] regex/mlx5: fix num of supported queues Ori Kam
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).