net/mlx4: fix indirection table error rollback

[dpdk.git] / drivers / net / mlx4 / mlx4_intr.c

diff --git a/drivers/net/mlx4/mlx4_intr.c b/drivers/net/mlx4/mlx4_intr.c
index e3449ee..3806322 100644 (file)
--- a/drivers/net/mlx4/mlx4_intr.c
+++ b/drivers/net/mlx4/mlx4_intr.c
@@ -59,7 +59,7 @@
 #include "mlx4_rxtx.h"
 #include "mlx4_utils.h"
 
-static void mlx4_link_status_alarm(struct priv *priv);
+static int mlx4_link_status_check(struct priv *priv);
 
 /**
  * Clean up Rx interrupts handler.
@@ -135,84 +135,63 @@ mlx4_rx_intr_vec_enable(struct priv *priv)
 }
 
 /**
- * Collect interrupt events.
+ * Process scheduled link status check.
+ *
+ * If LSC interrupts are requested, process related callback.
  *
  * @param priv
  *   Pointer to private structure.
- * @param events
- *   Pointer to event flags holder.
- *
- * @return
- *   Number of events.
  */
-static int
-mlx4_collect_interrupt_events(struct priv *priv, uint32_t *events)
+static void
+mlx4_link_status_alarm(struct priv *priv)
 {
-       struct ibv_async_event event;
-       int port_change = 0;
-       struct rte_eth_link *link = &priv->dev->data->dev_link;
        const struct rte_intr_conf *const intr_conf =
                &priv->dev->data->dev_conf.intr_conf;
-       int ret = 0;
 
-       *events = 0;
-       /* Read all message and acknowledge them. */
-       for (;;) {
-               if (ibv_get_async_event(priv->ctx, &event))
-                       break;
-               if ((event.event_type == IBV_EVENT_PORT_ACTIVE ||
-                    event.event_type == IBV_EVENT_PORT_ERR) &&
-                   intr_conf->lsc) {
-                       port_change = 1;
-                       ret++;
-               } else if (event.event_type == IBV_EVENT_DEVICE_FATAL &&
-                          intr_conf->rmv) {
-                       *events |= (1 << RTE_ETH_EVENT_INTR_RMV);
-                       ret++;
-               } else {
-                       DEBUG("event type %d on port %d not handled",
-                             event.event_type, event.element.port_num);
-               }
-               ibv_ack_async_event(&event);
-       }
-       if (!port_change)
-               return ret;
-       mlx4_link_update(priv->dev, 0);
-       if (((link->link_speed == 0) && link->link_status) ||
-           ((link->link_speed != 0) && !link->link_status)) {
-               if (!priv->intr_alarm) {
-                       /* Inconsistent status, check again later. */
-                       priv->intr_alarm = 1;
-                       rte_eal_alarm_set(MLX4_INTR_ALARM_TIMEOUT,
-                                         (void (*)(void *))
-                                         mlx4_link_status_alarm,
-                                         priv);
-               }
-       } else {
-               *events |= (1 << RTE_ETH_EVENT_INTR_LSC);
-       }
-       return ret;
+       assert(priv->intr_alarm == 1);
+       priv->intr_alarm = 0;
+       if (intr_conf->lsc && !mlx4_link_status_check(priv))
+               _rte_eth_dev_callback_process(priv->dev,
+                                             RTE_ETH_EVENT_INTR_LSC,
+                                             NULL, NULL);
 }
 
 /**
- * Process scheduled link status check.
+ * Check link status.
+ *
+ * In case of inconsistency, another check is scheduled.
  *
  * @param priv
  *   Pointer to private structure.
+ *
+ * @return
+ *   0 on success (link status is consistent), negative errno value
+ *   otherwise and rte_errno is set.
  */
-static void
-mlx4_link_status_alarm(struct priv *priv)
+static int
+mlx4_link_status_check(struct priv *priv)
 {
-       uint32_t events;
-       int ret;
+       struct rte_eth_link *link = &priv->dev->data->dev_link;
+       int ret = mlx4_link_update(priv->dev, 0);
 
-       assert(priv->intr_alarm == 1);
-       priv->intr_alarm = 0;
-       ret = mlx4_collect_interrupt_events(priv, &events);
-       if (ret > 0 && events & (1 << RTE_ETH_EVENT_INTR_LSC))
-               _rte_eth_dev_callback_process(priv->dev,
-                                             RTE_ETH_EVENT_INTR_LSC,
-                                             NULL, NULL);
+       if (ret)
+               return ret;
+       if ((!link->link_speed && link->link_status) ||
+           (link->link_speed && !link->link_status)) {
+               if (!priv->intr_alarm) {
+                       /* Inconsistent status, check again later. */
+                       ret = rte_eal_alarm_set(MLX4_INTR_ALARM_TIMEOUT,
+                                               (void (*)(void *))
+                                               mlx4_link_status_alarm,
+                                               priv);
+                       if (ret)
+                               return ret;
+                       priv->intr_alarm = 1;
+               }
+               rte_errno = EINPROGRESS;
+               return -rte_errno;
+       }
+       return 0;
 }
 
 /**
@@ -224,26 +203,39 @@ mlx4_link_status_alarm(struct priv *priv)
 static void
 mlx4_interrupt_handler(struct priv *priv)
 {
-       int ret;
-       uint32_t ev;
-       int i;
+       enum { LSC, RMV, };
+       static const enum rte_eth_event_type type[] = {
+               [LSC] = RTE_ETH_EVENT_INTR_LSC,
+               [RMV] = RTE_ETH_EVENT_INTR_RMV,
+       };
+       uint32_t caught[RTE_DIM(type)] = { 0 };
+       struct ibv_async_event event;
+       const struct rte_intr_conf *const intr_conf =
+               &priv->dev->data->dev_conf.intr_conf;
+       unsigned int i;
 
-       ret = mlx4_collect_interrupt_events(priv, &ev);
-       if (ret > 0) {
-               for (i = RTE_ETH_EVENT_UNKNOWN;
-                    i < RTE_ETH_EVENT_MAX;
-                    i++) {
-                       if (ev & (1 << i)) {
-                               ev &= ~(1 << i);
-                               _rte_eth_dev_callback_process(priv->dev, i,
-                                                             NULL, NULL);
-                               ret--;
-                       }
+       /* Read all message and acknowledge them. */
+       while (!ibv_get_async_event(priv->ctx, &event)) {
+               switch (event.event_type) {
+               case IBV_EVENT_PORT_ACTIVE:
+               case IBV_EVENT_PORT_ERR:
+                       if (intr_conf->lsc && !mlx4_link_status_check(priv))
+                               ++caught[LSC];
+                       break;
+               case IBV_EVENT_DEVICE_FATAL:
+                       if (intr_conf->rmv)
+                               ++caught[RMV];
+                       break;
+               default:
+                       DEBUG("event type %d on physical port %d not handled",
+                             event.event_type, event.element.port_num);
                }
-               if (ret)
-                       WARN("%d event%s not processed", ret,
-                            (ret > 1 ? "s were" : " was"));
+               ibv_ack_async_event(&event);
        }
+       for (i = 0; i != RTE_DIM(caught); ++i)
+               if (caught[i])
+                       _rte_eth_dev_callback_process(priv->dev, type[i],
+                                                     NULL, NULL);
 }
 
 /**