net/mlx5: separate Rx queue state modification

Separate Rx state modification to the Verbs and DevX modules.

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c b/drivers/net/mlx5/linux/mlx5_verbs.c
index 6260b4e..b4a6b5e 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -4,7 +4,6 @@
 
 #include <stddef.h>
 #include <errno.h>
-#include <stdbool.h>
 #include <string.h>
 #include <stdint.h>
 #include <unistd.h>
@@ -97,16 +96,18 @@ mlx5_rxq_obj_modify_wq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
  *
  * @param rxq_obj
  *   Verbs Rx queue object.
+ * @param type
+ *   Type of change queue state.
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_ibv_modify_wq(struct mlx5_rxq_obj *rxq_obj, bool is_start)
+mlx5_ibv_modify_wq(struct mlx5_rxq_obj *rxq_obj, uint8_t type)
 {
        struct ibv_wq_attr mod = {
                .attr_mask = IBV_WQ_ATTR_STATE,
-               .wq_state = is_start ? IBV_WQS_RDY : IBV_WQS_RESET,
+               .wq_state = (enum ibv_wq_state)type,
        };
 
        return mlx5_glue->modify_wq(rxq_obj->wq, &mod);
@@ -418,7 +419,7 @@ mlx5_rxq_ibv_obj_new(struct rte_eth_dev *dev, uint16_t idx)
                goto error;
        }
        /* Change queue state to ready. */
-       ret = mlx5_ibv_modify_wq(tmpl, true);
+       ret = mlx5_ibv_modify_wq(tmpl, IBV_WQS_RDY);
        if (ret) {
                DRV_LOG(ERR,
                        "Port %u Rx queue %u WQ state to IBV_WQS_RDY failed.",

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index fd5dd87..f385b48 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -766,6 +766,13 @@ struct mlx5_txq_obj {
        };
 };
 
+enum mlx5_rxq_modify_type {
+       MLX5_RXQ_MOD_ERR2RST, /* modify state from error to reset. */
+       MLX5_RXQ_MOD_RST2RDY, /* modify state from reset to ready. */
+       MLX5_RXQ_MOD_RDY2ERR, /* modify state from ready to error. */
+       MLX5_RXQ_MOD_RDY2RST, /* modify state from ready to reset. */
+};
+
 enum mlx5_txq_modify_type {
        MLX5_TXQ_MOD_RDY2RDY, /* modify state from ready to ready. */
        MLX5_TXQ_MOD_RST2RDY, /* modify state from reset to ready. */
@@ -778,7 +785,7 @@ struct mlx5_obj_ops {
        int (*rxq_obj_modify_vlan_strip)(struct mlx5_rxq_obj *rxq_obj, int on);
        int (*rxq_obj_new)(struct rte_eth_dev *dev, uint16_t idx);
        int (*rxq_event_get)(struct mlx5_rxq_obj *rxq_obj);
-       int (*rxq_obj_modify)(struct mlx5_rxq_obj *rxq_obj, bool is_start);
+       int (*rxq_obj_modify)(struct mlx5_rxq_obj *rxq_obj, uint8_t type);
        void (*rxq_obj_release)(struct mlx5_rxq_obj *rxq_obj);
        int (*ind_table_new)(struct rte_eth_dev *dev, const unsigned int log_n,
                             struct mlx5_ind_table_obj *ind_tbl);

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 430ad08..a7c941c 100644 (file)
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -52,22 +52,37 @@ mlx5_rxq_obj_modify_rq_vlan_strip(struct mlx5_rxq_obj *rxq_obj, int on)
  *
  * @param rxq_obj
  *   DevX Rx queue object.
+ * @param type
+ *   Type of change queue state.
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_devx_modify_rq(struct mlx5_rxq_obj *rxq_obj, bool is_start)
+mlx5_devx_modify_rq(struct mlx5_rxq_obj *rxq_obj, uint8_t type)
 {
        struct mlx5_devx_modify_rq_attr rq_attr;
 
        memset(&rq_attr, 0, sizeof(rq_attr));
-       if (is_start) {
+       switch (type) {
+       case MLX5_RXQ_MOD_ERR2RST:
+               rq_attr.rq_state = MLX5_RQC_STATE_ERR;
+               rq_attr.state = MLX5_RQC_STATE_RST;
+               break;
+       case MLX5_RXQ_MOD_RST2RDY:
                rq_attr.rq_state = MLX5_RQC_STATE_RST;
                rq_attr.state = MLX5_RQC_STATE_RDY;
-       } else {
+               break;
+       case MLX5_RXQ_MOD_RDY2ERR:
+               rq_attr.rq_state = MLX5_RQC_STATE_RDY;
+               rq_attr.state = MLX5_RQC_STATE_ERR;
+               break;
+       case MLX5_RXQ_MOD_RDY2RST:
                rq_attr.rq_state = MLX5_RQC_STATE_RDY;
                rq_attr.state = MLX5_RQC_STATE_RST;
+               break;
+       default:
+               break;
        }
        return mlx5_devx_cmd_modify_rq(rxq_obj->rq, &rq_attr);
 }
@@ -194,7 +209,7 @@ mlx5_rxq_devx_obj_release(struct mlx5_rxq_obj *rxq_obj)
        MLX5_ASSERT(rxq_obj);
        MLX5_ASSERT(rxq_obj->rq);
        if (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_DEVX_HAIRPIN) {
-               mlx5_devx_modify_rq(rxq_obj, false);
+               mlx5_devx_modify_rq(rxq_obj, MLX5_RXQ_MOD_RDY2RST);
                claim_zero(mlx5_devx_cmd_destroy(rxq_obj->rq));
        } else {
                MLX5_ASSERT(rxq_obj->devx_cq);
@@ -628,7 +643,7 @@ mlx5_rxq_devx_obj_new(struct rte_eth_dev *dev, uint16_t idx)
                goto error;
        }
        /* Change queue state to ready. */
-       ret = mlx5_devx_modify_rq(tmpl, true);
+       ret = mlx5_devx_modify_rq(tmpl, MLX5_RXQ_MOD_RST2RDY);
        if (ret)
                goto error;
        rxq_data->cq_arm_sn = 0;

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index c059e21..f1d8373 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -513,7 +513,7 @@ mlx5_rx_queue_stop_primary(struct rte_eth_dev *dev, uint16_t idx)
        int ret;
 
        MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_PRIMARY);
-       ret = priv->obj_ops.rxq_obj_modify(rxq_ctrl->obj, false);
+       ret = priv->obj_ops.rxq_obj_modify(rxq_ctrl->obj, MLX5_RXQ_MOD_RDY2RST);
        if (ret) {
                DRV_LOG(ERR, "Cannot change Rx WQ state to RESET:  %s",
                        strerror(errno));
@@ -612,7 +612,7 @@ mlx5_rx_queue_start_primary(struct rte_eth_dev *dev, uint16_t idx)
        /* Reset RQ consumer before moving queue ro READY state. */
        *rxq->rq_db = rte_cpu_to_be_32(0);
        rte_io_wmb();
-       ret = priv->obj_ops.rxq_obj_modify(rxq_ctrl->obj, true);
+       ret = priv->obj_ops.rxq_obj_modify(rxq_ctrl->obj, MLX5_RXQ_MOD_RST2RDY);
        if (ret) {
                DRV_LOG(ERR, "Cannot change Rx WQ state to READY:  %s",
                        strerror(errno));

diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 1d92b54..b530ff4 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -16,8 +16,6 @@
 #include <rte_cycles.h>
 #include <rte_flow.h>
 
-#include <mlx5_glue.h>
-#include <mlx5_devx_cmds.h>
 #include <mlx5_prm.h>
 #include <mlx5_common.h>
 
@@ -898,30 +896,7 @@ mlx5_queue_state_modify_primary(struct rte_eth_dev *dev,
                struct mlx5_rxq_ctrl *rxq_ctrl =
                        container_of(rxq, struct mlx5_rxq_ctrl, rxq);
 
-               if (rxq_ctrl->obj->type == MLX5_RXQ_OBJ_TYPE_IBV) {
-                       struct ibv_wq_attr mod = {
-                               .attr_mask = IBV_WQ_ATTR_STATE,
-                               .wq_state = sm->state,
-                       };
-
-                       ret = mlx5_glue->modify_wq(rxq_ctrl->obj->wq, &mod);
-               } else { /* rxq_ctrl->obj->type == MLX5_RXQ_OBJ_TYPE_DEVX_RQ. */
-                       struct mlx5_devx_modify_rq_attr rq_attr;
-
-                       memset(&rq_attr, 0, sizeof(rq_attr));
-                       if (sm->state == IBV_WQS_RESET) {
-                               rq_attr.rq_state = MLX5_RQC_STATE_ERR;
-                               rq_attr.state = MLX5_RQC_STATE_RST;
-                       } else if (sm->state == IBV_WQS_RDY) {
-                               rq_attr.rq_state = MLX5_RQC_STATE_RST;
-                               rq_attr.state = MLX5_RQC_STATE_RDY;
-                       } else if (sm->state == IBV_WQS_ERR) {
-                               rq_attr.rq_state = MLX5_RQC_STATE_RDY;
-                               rq_attr.state = MLX5_RQC_STATE_ERR;
-                       }
-                       ret = mlx5_devx_cmd_modify_rq(rxq_ctrl->obj->rq,
-                                                     &rq_attr);
-               }
+               ret = priv->obj_ops.rxq_obj_modify(rxq_ctrl->obj, sm->state);
                if (ret) {
                        DRV_LOG(ERR, "Cannot change Rx WQ state to %u  - %s",
                                        sm->state, strerror(errno));