net/mlx5: separate Rx interrupt handling

Separate interrupt event handler into both 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 cace5de..cc5113c 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -427,8 +427,38 @@ mlx5_rxq_ibv_obj_release(struct mlx5_rxq_obj *rxq_obj)
        mlx5_free(rxq_obj);
 }
 
+/**
+ * Get event for an Rx verbs queue object.
+ *
+ * @param rxq_obj
+ *   Verbs Rx queue object.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_rx_ibv_get_event(struct mlx5_rxq_obj *rxq_obj)
+{
+       struct ibv_cq *ev_cq;
+       void *ev_ctx;
+       int ret = mlx5_glue->get_cq_event(rxq_obj->ibv_channel,
+                                         &ev_cq, &ev_ctx);
+
+       if (ret < 0 || ev_cq != rxq_obj->ibv_cq)
+               goto exit;
+       mlx5_glue->ack_cq_events(rxq_obj->ibv_cq, 1);
+       return 0;
+exit:
+       if (ret < 0)
+               rte_errno = errno;
+       else
+               rte_errno = EINVAL;
+       return -rte_errno;
+}
+
 struct mlx5_obj_ops ibv_obj_ops = {
        .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_wq_vlan_strip,
        .rxq_obj_new = mlx5_rxq_ibv_obj_new,
+       .rxq_event_get = mlx5_rx_ibv_get_event,
        .rxq_obj_release = mlx5_rxq_ibv_obj_release,
 };

diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index eba5df9..f0e2929 100644 (file)
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -709,6 +709,7 @@ struct mlx5_obj_ops {
        int (*rxq_obj_modify_vlan_strip)(struct mlx5_rxq_obj *rxq_obj, int on);
        struct mlx5_rxq_obj *(*rxq_obj_new)(struct rte_eth_dev *dev,
                                            uint16_t idx);
+       int (*rxq_event_get)(struct mlx5_rxq_obj *rxq_obj);
        void (*rxq_obj_release)(struct mlx5_rxq_obj *rxq_obj);
 };
 

diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 191b3c2..39e2ad5 100644 (file)
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -135,6 +135,43 @@ mlx5_rxq_devx_obj_release(struct mlx5_rxq_obj *rxq_obj)
        mlx5_free(rxq_obj);
 }
 
+/**
+ * Get event for an Rx DevX queue object.
+ *
+ * @param rxq_obj
+ *   DevX Rx queue object.
+ *
+ * @return
+ *   0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_rx_devx_get_event(struct mlx5_rxq_obj *rxq_obj)
+{
+#ifdef HAVE_IBV_DEVX_EVENT
+       union {
+               struct mlx5dv_devx_async_event_hdr event_resp;
+               uint8_t buf[sizeof(struct mlx5dv_devx_async_event_hdr) + 128];
+       } out;
+       int ret = mlx5_glue->devx_get_event(rxq_obj->devx_channel,
+                                           &out.event_resp,
+                                           sizeof(out.buf));
+
+       if (ret < 0) {
+               rte_errno = errno;
+               return -rte_errno;
+       }
+       if (out.event_resp.cookie != (uint64_t)(uintptr_t)rxq_obj->devx_cq) {
+               rte_errno = EINVAL;
+               return -rte_errno;
+       }
+       return 0;
+#else
+       (void)rxq_obj;
+       rte_errno = ENOTSUP;
+       return -rte_errno;
+#endif /* HAVE_IBV_DEVX_EVENT */
+}
+
 /**
  * Fill common fields of create RQ attributes structure.
  *
@@ -606,5 +643,6 @@ error:
 struct mlx5_obj_ops devx_obj_ops = {
        .rxq_obj_modify_vlan_strip = mlx5_rxq_obj_modify_rq_vlan_strip,
        .rxq_obj_new = mlx5_rxq_devx_obj_new,
+       .rxq_event_get = mlx5_rx_devx_get_event,
        .rxq_obj_release = mlx5_rxq_devx_obj_release,
 };

diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index daa92b6..46d5f6c 100644 (file)
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1024,10 +1024,8 @@ error:
 int
 mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)
 {
+       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_rxq_ctrl *rxq_ctrl;
-       struct mlx5_rxq_obj *rxq_obj = NULL;
-       struct ibv_cq *ev_cq;
-       void *ev_ctx;
        int ret = 0;
 
        rxq_ctrl = mlx5_rxq_get(dev, rx_queue_id);
@@ -1035,42 +1033,20 @@ mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id)
                rte_errno = EINVAL;
                return -rte_errno;
        }
-       if (!rxq_ctrl->irq) {
-               mlx5_rxq_release(dev, rx_queue_id);
-               return 0;
-       }
-       rxq_obj = rxq_ctrl->obj;
-       if (!rxq_obj)
+       if (!rxq_ctrl->obj)
                goto error;
-       if (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_IBV) {
-               ret = mlx5_glue->get_cq_event(rxq_obj->ibv_channel, &ev_cq,
-                                             &ev_ctx);
-               if (ret < 0 || ev_cq != rxq_obj->ibv_cq)
-                       goto error;
-               mlx5_glue->ack_cq_events(rxq_obj->ibv_cq, 1);
-       } else if (rxq_obj->type == MLX5_RXQ_OBJ_TYPE_DEVX_RQ) {
-#ifdef HAVE_IBV_DEVX_EVENT
-               union {
-                       struct mlx5dv_devx_async_event_hdr event_resp;
-                       uint8_t buf[sizeof(struct mlx5dv_devx_async_event_hdr)
-                                   + 128];
-               } out;
-
-               ret = mlx5_glue->devx_get_event
-                               (rxq_obj->devx_channel, &out.event_resp,
-                                sizeof(out.buf));
-               if (ret < 0 || out.event_resp.cookie !=
-                               (uint64_t)(uintptr_t)rxq_obj->devx_cq)
+       if (rxq_ctrl->irq) {
+               ret = priv->obj_ops->rxq_event_get(rxq_ctrl->obj);
+               if (ret < 0)
                        goto error;
-#endif /* HAVE_IBV_DEVX_EVENT */
+               rxq_ctrl->rxq.cq_arm_sn++;
        }
-       rxq_ctrl->rxq.cq_arm_sn++;
        mlx5_rxq_release(dev, rx_queue_id);
        return 0;
 error:
        /**
-        * For ret < 0 save the errno (may be EAGAIN which means the get_event
-        * function was called before receiving one).
+        * The ret variable may be EAGAIN which means the get_event function was
+        * called before receiving one.
         */
        if (ret < 0)
                rte_errno = errno;