Merge remote-tracking branch 'origin/master' into topic/gda_channels

Author: Artemy-Mellanox

AUTHORS

@@ -71,6 +71,7 @@ Michal Shalev <[email protected]>
 Mike Dubman <[email protected]>
 Mikhail Brinskii <[email protected]>
 Min Fang <[email protected]>
+Nathan Bellalou <[email protected]>
 Nathan Hjelm <[email protected]>
 Netanel Yosephian <[email protected]>
 Ofir Farjon <[email protected]>

config/ucx.conf

@@ -2,7 +2,7 @@
 CPU model=Grace
 UCX_REG_NONBLOCK_MEM_TYPES=host,cuda-managed
 UCX_IB_ODP_MEM_TYPES=host,cuda-managed
-UCX_IB_MLX5_DEVX_OBJECTS=
+UCX_IB_MLX5_DEVX_OBJECTS=auto
 UCX_GDR_COPY_BW=0MBs,get_dedicated:30GBs,put_dedicated:30GBs
 UCX_GDR_COPY_LAT=30ns
 UCX_GDR_COPY_RCACHE_OVERHEAD=170ns

src/tools/perf/cuda/ucp_cuda_kernel.cu

@@ -183,16 +183,19 @@ private:
         params.elements     = elems;
 
         ucs_status_t status;
-        const ucs_time_t deadline = ucs_get_time() + ucs_time_from_sec(5.0);
+        ucs_time_t deadline = ucs_get_time() + ucs_time_from_sec(60.0);
         do {
+            if (ucs_get_time() > deadline) {
+                ucs_warn("timeout creating device memory list");
+                deadline = ULONG_MAX;
+            }
+
             ucp_worker_progress(perf.ucp.worker);
             status = ucp_device_mem_list_create(perf.ucp.ep, &params,
                                                 &m_params.mem_list);
-        } while ((status == UCS_ERR_NOT_CONNECTED) && (ucs_get_time() < deadline));
+        } while (status == UCS_ERR_NOT_CONNECTED);
 
-        if (status == UCS_ERR_NOT_CONNECTED) {
-            throw std::runtime_error("Timeout waiting for connection");
-        } else if (status != UCS_OK) {
+        if (status != UCS_OK) {
             throw std::runtime_error("Failed to create memory list");
         }
     }

src/ucp/core/ucp_device.c

@@ -414,7 +414,7 @@ static ucs_status_t ucp_device_mem_list_create_handle(
     if (i == 0) {
         ucs_error("failed to select lane for local device %s",
                   ucs_topo_sys_device_get_name(local_sys_dev));
-        return UCS_ERR_NO_RESOURCE;
+        return UCS_ERR_NO_DEVICE;
     }
 
     /* Populate handle header */

src/ucp/wireup/select.c

@@ -2501,8 +2501,7 @@ ucp_wireup_add_device_lanes(const ucp_wireup_select_params_t *select_params,
                                          mem_type_tl_bitmap, UCP_NULL_LANE,
                                          select_ctx, 0);
     if (!found_lane) {
-        ucs_error("could not find device lanes");
-        return UCS_ERR_UNREACHABLE;
+        ucs_debug("ep %p: could not find device lanes", select_params->ep);
     }
 
     return UCS_OK;

src/ucs/config/global_opts.c

@@ -129,7 +129,7 @@ static ucs_config_field_t ucs_global_opts_table[] = {
 #if ENABLE_DEBUG_DATA
   "bt,freeze",
 #else
-  "bt",
+  "none",
 #endif
   "Error signal handling mode. Either 'none' to disable signal interception,\n"
   "or a combination of:\n"

src/ucs/sys/netlink.c

@@ -29,6 +29,8 @@ typedef struct {
     const struct sockaddr *sa_remote;
     int                    if_index;
     int                    found;
+    int                    allow_default_gw; /* Allow matching default
+                                                gateway routes */
 } ucs_netlink_route_info_t;
 
 
@@ -174,7 +176,7 @@ ucs_netlink_send_request(int protocol, unsigned short nlmsg_type,
 
 static ucs_status_t
 ucs_netlink_get_route_info(const struct rtattr *rta, int len, int *if_index_p,
-                           const void **dst_in_addr)
+                           const void **dst_in_addr, size_t rtm_dst_len)
 {
     *if_index_p  = -1;
     *dst_in_addr = NULL;
@@ -187,7 +189,10 @@ ucs_netlink_get_route_info(const struct rtattr *rta, int len, int *if_index_p,
         }
     }
 
-    if ((*if_index_p == -1) || (*dst_in_addr == NULL)) {
+    if (/* Network interface index is not valid */
+        (*if_index_p == -1) ||
+        /* dst_in_addr required but not present */
+        ((rtm_dst_len != 0) && (*dst_in_addr == NULL))) {
         return UCS_ERR_INVALID_PARAM;
     }
 
@@ -206,7 +211,8 @@ ucs_netlink_parse_rt_entry_cb(const struct nlmsghdr *nlh, void *arg)
     int khret;
 
     if (ucs_netlink_get_route_info(RTM_RTA(rt_msg), RTM_PAYLOAD(nlh),
-                                   &iface_index, &dst_in_addr) != UCS_OK) {
+                                   &iface_index, &dst_in_addr,
+                                   rt_msg->rtm_dst_len) != UCS_OK) {
         return UCS_INPROGRESS;
     }
 
@@ -228,12 +234,14 @@ ucs_netlink_parse_rt_entry_cb(const struct nlmsghdr *nlh, void *arg)
                                 ucs_error("could not allocate route entry");
                                 return UCS_ERR_NO_MEMORY);
 
-    memset(&new_rule->dest, 0, sizeof(sizeof(new_rule->dest)));
+    memset(&new_rule->dest, 0, sizeof(new_rule->dest));
     new_rule->dest.ss_family = rt_msg->rtm_family;
-    if (UCS_OK != ucs_sockaddr_set_inet_addr((struct sockaddr *)&new_rule->dest,
-                                             dst_in_addr)) {
-        ucs_array_pop_back(iface_rules);
-        return UCS_ERR_IO_ERROR;
+    if (dst_in_addr != NULL) {
+        if (ucs_sockaddr_set_inet_addr((struct sockaddr *)&new_rule->dest,
+                                       dst_in_addr) != UCS_OK) {
+            ucs_array_pop_back(iface_rules);
+            return UCS_ERR_IO_ERROR;
+        }
     }
 
     new_rule->subnet_prefix_len = rt_msg->rtm_dst_len;
@@ -256,6 +264,13 @@ static void ucs_netlink_lookup_route(ucs_netlink_route_info_t *info)
 
     iface_rules = &kh_val(&ucs_netlink_routing_table_cache, iter);
     ucs_array_for_each(curr_entry, iface_rules) {
+
+        if ((curr_entry->subnet_prefix_len == 0) && !info->allow_default_gw) {
+            ucs_trace("iface_index=%d: skipping default gateway route",
+                      info->if_index);
+            continue;
+        }
+
         if (ucs_sockaddr_is_same_subnet(
                                 info->sa_remote,
                                 (const struct sockaddr *)&curr_entry->dest,
@@ -266,7 +281,8 @@ static void ucs_netlink_lookup_route(ucs_netlink_route_info_t *info)
     }
 }
 
-int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote)
+int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote,
+                             int allow_default_gw)
 {
     static ucs_init_once_t init_once = UCS_INIT_ONCE_INITIALIZER;
     struct rtmsg rtm                 = {0};
@@ -285,9 +301,11 @@ int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote)
                                  NULL);
     }
 
-    info.if_index  = if_index;
-    info.sa_remote = sa_remote;
-    info.found     = 0;
+    info.if_index         = if_index;
+    info.sa_remote        = sa_remote;
+    info.found            = 0;
+    info.allow_default_gw = allow_default_gw;
+
     ucs_netlink_lookup_route(&info);
 
     return info.found;

src/ucs/sys/netlink.h

@@ -48,14 +48,17 @@ ucs_netlink_send_request(int protocol, unsigned short nlmsg_type,
  * Check whether a routing table rule exists for a given network
  * interface name and a destination address.
  *
- * @param [in]  if_index   A global index representing the network interface,
-                           as assigned by the system (e.g., obtained via
-                           if_nametoindex()).
- * @param [in]  sa_remote  Pointer to the destination address.
+ * @param [in]  if_index          A global index representing the network
+                                  interface, as assigned by the system
+                                  (e.g., obtained via if_nametoindex()).
+ * @param [in]  sa_remote         Pointer to the destination address.
+ * @param [in]  allow_default_gw  Allow matching default gateway routes (1) or
+ *                                only specific subnet routes (0).
  *
  * @return 1 if rule exists, or 0 otherwise.
  */
-int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote);
+int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote,
+                             int allow_default_gw);
 
 END_C_DECLS
 

src/ucs/sys/sys.c

@@ -15,6 +15,7 @@
 #include <ucs/sys/checker.h>
 #include <ucs/sys/ptr_arith.h>
 #include <ucs/sys/string.h>
+#include <ucs/sys/sock.h>
 #include <ucs/sys/sys.h>
 #include <ucs/debug/log.h>
 #include <ucs/time/time.h>
@@ -177,6 +178,21 @@ ucs_status_t ucs_ifname_to_index(const char *ndev_name, unsigned *ndev_index_p)
     return UCS_OK;
 }
 
+int ucs_netif_is_ipoib(const char *if_name)
+{
+    struct ifreq ifr;
+    ucs_status_t status;
+
+    status = ucs_netif_ioctl(if_name, SIOCGIFHWADDR, &ifr);
+    if (status != UCS_OK) {
+        /* If we can't determine the hardware type, assume it's not IPoIB */
+        ucs_debug("failed to get hardware address for %s", if_name);
+        return 0;
+    }
+
+    return ifr.ifr_hwaddr.sa_family == ARPHRD_INFINIBAND;
+}
+
 static uint64_t ucs_get_mac_address()
 {
     static uint64_t mac_address = 0;

src/ucs/sys/sys.h

@@ -192,6 +192,16 @@ uint32_t ucs_file_checksum(const char *filename);
 ucs_status_t ucs_ifname_to_index(const char *ndev_name, unsigned *ndev_index_p);
 
 
+/**
+ * Check if a network interface is an IPoIB (IP over InfiniBand) device.
+ *
+ * @param [in]  if_name  Network interface name to check.
+ *
+ * @return 1 if the interface is IPoIB, 0 otherwise.
+ */
+int ucs_netif_is_ipoib(const char *if_name);
+
+
 /**
  * Get a globally unique identifier of the machine running the current process.
  */