Merge pull request #231 from evgeny-leksikov/integration3

UCT/IB: complete RX CQ cleanup on device failure
yosefe · Jan 10, 2022 · 0610d17 · 0610d17
2 parents 12ab072 + 984f799
commit 0610d17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/uct/ib/base/ib_device.c b/src/uct/ib/base/ib_device.c
@@ -298,6 +298,8 @@ static void uct_ib_async_event_handler(int fd, void *arg)
         level = UCS_LOG_LEVEL_DEBUG;
         break;
     case IBV_EVENT_DEVICE_FATAL:
+        uct_ib_device_async_event_dispatch(dev, event.event_type, 0);
+        /* fallthrough */
     case IBV_EVENT_PORT_ERR:
         snprintf(event_info, sizeof(event_info), "%s on port %d",
                  ibv_event_type_str(event.event_type), event.element.port_num);

diff --git a/src/uct/ib/rc/accel/rc_mlx5_ep.c b/src/uct/ib/rc/accel/rc_mlx5_ep.c
@@ -955,10 +955,13 @@ static int uct_rc_mlx5_ep_clean_rx_cq_cb(uct_rc_mlx5_iface_common_t *iface,
     unsigned count;
 
     if (cqe == NULL) {
-        /* Check that last WQE reached event has arrived */
+        /* Check that last WQE reached event has arrived, or device fatal */
         count = uct_ib_device_async_event_get_count(dev,
                                                     IBV_EVENT_QP_LAST_WQE_REACHED,
-                                                    qp->qp_num);
+                                                    qp->qp_num) +
+                uct_ib_device_async_event_get_count(dev,
+                                                    IBV_EVENT_DEVICE_FATAL,
+                                                    0 /* port_num */);
         return count > 0;
     }