UCS/NETLINK: code review fixes

Author: amastbaum

src/ucs/sys/netlink.c

@@ -233,7 +233,7 @@ ucs_netlink_parse_rt_entry_cb(const struct nlmsghdr *nlh, void *arg)
 
     memset(&new_rule->dest, 0, sizeof(new_rule->dest));
     new_rule->dest.ss_family = rt_msg->rtm_family;
-    if (rt_msg->rtm_dst_len != 0) {
+    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);
@@ -250,7 +250,6 @@ static void ucs_netlink_lookup_route(ucs_netlink_route_info_t *info)
 {
     ucs_netlink_rt_rules_t *iface_rules;
     ucs_netlink_route_entry_t *curr_entry;
-    int is_default_gw;
     khiter_t iter;
 
     iter = kh_get(ucs_netlink_rt_cache, &ucs_netlink_routing_table_cache,
@@ -262,11 +261,10 @@ 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) {
-        is_default_gw = (curr_entry->subnet_prefix_len == 0);
 
         /* Skip default gateway routes if not allowed (e.g., for
            IPoIB remote devices) */
-        if (is_default_gw && !info->allow_default_gw) {
+        if ((curr_entry->subnet_prefix_len == 0) && !info->allow_default_gw) {
             ucs_trace("iface_index=%d: skipping default gateway route",
                       info->if_index);
             continue;
@@ -312,8 +310,8 @@ int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote,
     return info.found;
 }
 
-int ucs_netlink_ethernet_device_route_exists(int if_index,
-                                             const struct sockaddr *sa_remote)
+int ucs_netlink_route_exists_allow_default(int if_index,
+                                           const struct sockaddr *sa_remote)
 {
     return ucs_netlink_route_exists(if_index, sa_remote, 1);
 }

src/ucs/sys/netlink.h

@@ -62,7 +62,8 @@ int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote,
 
 /**
  * Check whether a routing table rule exists for a given network
- * interface name and a destination address (allows default gateway).
+ * interface name and a destination address, while allowing default gateway
+ * routes.
  *
  * @param [in]  if_index   A global index representing the network interface,
                            as assigned by the system (e.g., obtained via
@@ -71,8 +72,8 @@ int ucs_netlink_route_exists(int if_index, const struct sockaddr *sa_remote,
  *
  * @return 1 if rule exists, or 0 otherwise.
  */
-int ucs_netlink_ethernet_device_route_exists(int if_index,
-                                             const struct sockaddr *sa_remote);
+int ucs_netlink_route_exists_allow_default(int if_index,
+                                           const struct sockaddr *sa_remote);
 
 END_C_DECLS
 

src/ucs/sys/sys.c

@@ -190,7 +190,7 @@ int ucs_netif_is_ipoib(const char *if_name)
         return 0;
     }
 
-    return (ifr.ifr_hwaddr.sa_family == ARPHRD_INFINIBAND);
+    return ifr.ifr_hwaddr.sa_family == ARPHRD_INFINIBAND;
 }
 
 static uint64_t ucs_get_mac_address()

src/uct/ib/base/ib_iface.c

@@ -710,7 +710,7 @@ uct_ib_iface_roce_is_routable(uct_ib_iface_t *iface, uint8_t gid_index,
         return 0;
     }
 
-    if (!ucs_netlink_ethernet_device_route_exists(ndev_index, sa_remote)) {
+    if (!ucs_netlink_route_exists_allow_default(ndev_index, sa_remote)) {
         /* try to use loopback interface for reachability check, because it may
          * be used for routing in case of an interface with VRF is configured
          * and a RoCE IP interface uses this VRF table for routing.
@@ -721,8 +721,8 @@ uct_ib_iface_roce_is_routable(uct_ib_iface_t *iface, uint8_t gid_index,
             return 0;
         }
 
-        if (!ucs_netlink_ethernet_device_route_exists(lo_ndev_index,
-                                                      sa_remote)) {
+        if (!ucs_netlink_route_exists_allow_default(lo_ndev_index,
+                                                    sa_remote)) {
             uct_iface_fill_info_str_buf(params,
                                         "remote address %s is not routable "
                                         "neither by interface "UCT_IB_IFACE_FMT

src/uct/tcp/tcp.h

@@ -296,6 +296,7 @@ typedef enum uct_tcp_device_addr_flags {
      * @ref uct_iface_local_addr_ns_t for loopback reachability
      */
     UCT_TCP_DEVICE_ADDR_FLAG_LOOPBACK      = UCS_BIT(0),
+
     /**
      * Interface is IPoIB (IP over InfiniBand)
      */