Whamcloud - gitweb
LU-8769 lnet: removal of obsolete LNDs
[fs/lustre-release.git] / lnet / utils / lnetconfig / liblnetconfig.c
index 917ca44..6aaa1a0 100644 (file)
@@ -47,7 +47,6 @@
 #include <lnet/socklnd.h>
 #include "liblnd.h"
 #include <lnet/lnet.h>
-#include <libcfs/libcfs_string.h>
 #include <sys/types.h>
 #include <ifaddrs.h>
 #include "liblnetconfig.h"
@@ -80,6 +79,20 @@ struct lustre_lnet_ip2nets {
 };
 
 /*
+ * free_intf_descr
+ *     frees the memory allocated for an intf descriptor.
+ */
+void free_intf_descr(struct lnet_dlc_intf_descr *intf_descr)
+{
+       if (!intf_descr)
+               return;
+
+       if (intf_descr->cpt_expr != NULL)
+               cfs_expr_list_free(intf_descr->cpt_expr);
+       free(intf_descr);
+}
+
+/*
  * lustre_lnet_add_ip_range
  * Formatting:
  *     given a string of the format:
@@ -169,6 +182,90 @@ void lustre_lnet_init_nw_descr(struct lnet_dlc_network_descr *nw_descr)
        }
 }
 
+int lustre_lnet_parse_nids(char *nids, char **array, int size,
+                          char ***out_array)
+{
+       int num_nids = 0;
+       char *comma = nids, *cur, *entry;
+       char **new_array;
+       int i, len, start = 0, finish = 0;
+
+       if (nids == NULL || strlen(nids) == 0)
+               return size;
+
+       /* count the number or new nids, by counting the number of commas */
+       while (comma) {
+               comma = strchr(comma, ',');
+               if (comma) {
+                       comma++;
+                       num_nids++;
+               } else {
+                       num_nids++;
+               }
+       }
+
+       /*
+        * if the array is not NULL allocate a large enough array to house
+        * the old and new entries
+        */
+       new_array = calloc(sizeof(char*),
+                          (size > 0) ? size + num_nids : num_nids);
+
+       if (!new_array)
+               goto failed;
+
+       /* parse our the new nids and add them to the tail of the array */
+       comma = nids;
+       cur = nids;
+       start = (size > 0) ? size: 0;
+       finish = (size > 0) ? size + num_nids : num_nids;
+       for (i = start; i < finish; i++) {
+               comma = strchr(comma, ',');
+               if (!comma)
+                       /*
+                        * the length of the string to be parsed out is
+                        * from cur to end of string. So it's good enough
+                        * to strlen(cur)
+                        */
+                       len = strlen(cur) + 1;
+               else
+                       /* length of the string is comma - cur */
+                       len = (comma - cur) + 1;
+
+               entry = calloc(1, len);
+               if (!entry) {
+                       finish = i > 0 ? i - 1: 0;
+                       goto failed;
+               }
+               strncpy(entry, cur, len - 1);
+               entry[len] = '\0';
+               new_array[i] = entry;
+               if (comma) {
+                       comma++;
+                       cur = comma;
+               }
+       }
+
+       /* add the old entries in the array and delete the old array*/
+       for (i = 0; i < size; i++)
+               new_array[i] = array[i];
+
+       if (array)
+               free(array);
+
+       *out_array = new_array;
+
+       return finish;
+
+failed:
+       for (i = start; i < finish; i++)
+               free(new_array[i]);
+       if (new_array)
+               free(new_array);
+
+       return size;
+}
+
 /*
  * format expected:
  *     <intf>[<expr>], <intf>[<expr>],..
@@ -227,9 +324,8 @@ int lustre_lnet_parse_interfaces(char *intf_str,
 failed:
        list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist,
                                 intf_on_network) {
-               if (intf_descr->cpt_expr != NULL)
-                       cfs_expr_list_free(intf_descr->cpt_expr);
-               free(intf_descr);
+               list_del(&intf_descr->intf_on_network);
+               free_intf_descr(intf_descr);
        }
 
        return rc;
@@ -279,52 +375,44 @@ int lustre_lnet_config_ni_system(bool up, bool load_ni_from_mod,
        return rc;
 }
 
-static lnet_nid_t *allocate_create_nid_array(char **nids, char *err_str)
+static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids,
+                                            char *err_str)
 {
        lnet_nid_t *array = NULL;
-       int idx = 0;
+       __u32 i;
 
        if (!nids) {
                snprintf(err_str, LNET_MAX_STR_LEN, "no NIDs to add");
                return NULL;
        }
 
-       /* count the size of the array */
-       while (nids[idx] != NULL)
-               idx++;
-
-       array = calloc(sizeof(*array) * idx + 1, 1);
+       array = calloc(sizeof(*array) * num_nids, 1);
        if (array == NULL) {
                snprintf(err_str, LNET_MAX_STR_LEN, "out of memory");
                return NULL;
        }
 
-       idx = 0;
-       while (nids[idx] != NULL) {
-               array[idx] = libcfs_str2nid(nids[idx]);
-               if (array[idx] == LNET_NID_ANY) {
+       for (i = 0; i < num_nids; i++) {
+               array[i] = libcfs_str2nid(nids[i]);
+               if (array[i] == LNET_NID_ANY) {
                        free(array);
                        snprintf(err_str, LNET_MAX_STR_LEN,
                                 "bad NID: '%s'",
-                                nids[idx]);
+                                nids[i]);
                        return NULL;
                }
-               idx++;
        }
 
-       /* identify last entry */
-       array[idx] = LNET_NID_ANY;
-
        return array;
 }
 
-static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd,
+static int dispatch_peer_ni_cmd(lnet_nid_t pnid, lnet_nid_t nid, __u32 cmd,
                                struct lnet_ioctl_peer_cfg *data,
                                char *err_str, char *cmd_str)
 {
        int rc;
 
-       data->prcfg_key_nid = knid;
+       data->prcfg_prim_nid = pnid;
        data->prcfg_cfg_nid = nid;
 
        rc = l_ioctl(LNET_DEV_ID, cmd, data);
@@ -339,63 +427,72 @@ static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd,
        return rc;
 }
 
-int lustre_lnet_config_peer_nid(char *knid, char **nid, bool mr, int seq_no,
-                               struct cYAML **err_rc)
+int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids,
+                               bool mr, int seq_no, struct cYAML **err_rc)
 {
        struct lnet_ioctl_peer_cfg data;
-       lnet_nid_t key_nid = LNET_NID_ANY;
+       lnet_nid_t prim_nid = LNET_NID_ANY;
        int rc = LUSTRE_CFG_RC_NO_ERR;
        int idx = 0;
+       bool nid0_used = false;
        char err_str[LNET_MAX_STR_LEN] = {0};
-       lnet_nid_t *nids = allocate_create_nid_array(nid, err_str);
+       lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str);
 
-       if (knid != NULL) {
-               key_nid = libcfs_str2nid(knid);
-               if (key_nid == LNET_NID_ANY) {
+       if (pnid) {
+               prim_nid = libcfs_str2nid(pnid);
+               if (prim_nid == LNET_NID_ANY) {
                        snprintf(err_str, sizeof(err_str),
                                 "bad key NID: '%s'",
-                                knid);
+                                pnid);
                        rc = LUSTRE_CFG_RC_MISSING_PARAM;
                        goto out;
                }
-       } else if (nids[0] == LNET_NID_ANY) {
+       } else if (!nids || nids[0] == LNET_NID_ANY) {
                snprintf(err_str, sizeof(err_str),
                         "no NIDs provided for configuration");
                rc = LUSTRE_CFG_RC_MISSING_PARAM;
                goto out;
        } else {
-               key_nid = LNET_NID_ANY;
+               prim_nid = LNET_NID_ANY;
        }
 
        snprintf(err_str, sizeof(err_str), "\"Success\"");
 
        LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
        data.prcfg_mr = mr;
-       if (nids[0] == LNET_NID_ANY) {
-               rc = dispatch_peer_ni_cmd(LNET_NID_ANY, key_nid,
-                                         IOC_LIBCFS_ADD_PEER_NI,
-                                         &data, err_str, "add");
-               goto out;
+
+       /*
+        * if prim_nid is not specified use the first nid in the list of
+        * nids provided as the prim_nid. NOTE: on entering 'if' we must
+        * have at least 1 NID
+        */
+       if (prim_nid == LNET_NID_ANY) {
+               nid0_used = true;
+               prim_nid = nids[0];
        }
 
-       while (nids[idx] != LNET_NID_ANY) {
+       /* Create the prim_nid first */
+       rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
+                                 IOC_LIBCFS_ADD_PEER_NI,
+                                 &data, err_str, "add");
+
+       if (rc != 0)
+               goto out;
+
+       /* add the rest of the nids to the key nid if any are available */
+       for (idx = nid0_used ? 1 : 0 ; nids && idx < num_nids; idx++) {
                /*
-                * If key_nid is not provided then the first nid in the
-                * list becomes the key_nid. First time round the loop use
+                * If prim_nid is not provided then the first nid in the
+                * list becomes the prim_nid. First time round the loop use
                 * LNET_NID_ANY for the first parameter, then use nid[0]
                 * as the key nid after wards
                 */
-               rc = dispatch_peer_ni_cmd(key_nid, nids[idx],
+               rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
                                          IOC_LIBCFS_ADD_PEER_NI, &data,
                                          err_str, "add");
 
                if (rc != 0)
                        goto out;
-
-               if (idx == 0 && key_nid == LNET_NID_ANY)
-                       key_nid = nids[0];
-
-               idx++;
        }
 
 out:
@@ -405,28 +502,28 @@ out:
        return rc;
 }
 
-int lustre_lnet_del_peer_nid(char *knid, char **nid, int seq_no,
-                            struct cYAML **err_rc)
+int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids,
+                            int seq_no, struct cYAML **err_rc)
 {
        struct lnet_ioctl_peer_cfg data;
-       lnet_nid_t key_nid;
+       lnet_nid_t prim_nid;
        int rc = LUSTRE_CFG_RC_NO_ERR;
        int idx = 0;
        char err_str[LNET_MAX_STR_LEN] = {0};
-       lnet_nid_t *nids = allocate_create_nid_array(nid, err_str);
+       lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str);
 
-       if (knid == NULL) {
+       if (pnid == NULL) {
                snprintf(err_str, sizeof(err_str),
                         "\"Primary nid is not provided\"");
                rc = LUSTRE_CFG_RC_MISSING_PARAM;
                goto out;
        } else {
-               key_nid = libcfs_str2nid(knid);
-               if (key_nid == LNET_NID_ANY) {
+               prim_nid = libcfs_str2nid(pnid);
+               if (prim_nid == LNET_NID_ANY) {
                        rc = LUSTRE_CFG_RC_BAD_PARAM;
                        snprintf(err_str, sizeof(err_str),
                                 "bad key NID: '%s'",
-                                knid);
+                                pnid);
                        goto out;
                }
        }
@@ -434,22 +531,20 @@ int lustre_lnet_del_peer_nid(char *knid, char **nid, int seq_no,
        snprintf(err_str, sizeof(err_str), "\"Success\"");
 
        LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
-       if (nids[0] == LNET_NID_ANY) {
-               rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY,
+       if (!nids || nids[0] == LNET_NID_ANY) {
+               rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
                                          IOC_LIBCFS_DEL_PEER_NI,
                                          &data, err_str, "del");
                goto out;
        }
 
-       while (nids[idx] != LNET_NID_ANY) {
-               rc = dispatch_peer_ni_cmd(key_nid, nids[idx],
+       for (idx = 0; nids && idx < num_nids; idx++) {
+               rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
                                          IOC_LIBCFS_DEL_PEER_NI, &data,
                                          err_str, "del");
 
                if (rc != 0)
                        goto out;
-
-               idx++;
        }
 
 out:
@@ -489,17 +584,6 @@ int lustre_lnet_config_route(char *nw, char *gw, int hops, int prio,
                goto out;
        }
 
-       if (LNET_NETTYP(net) == CIBLND    ||
-           LNET_NETTYP(net) == OPENIBLND ||
-           LNET_NETTYP(net) == IIBLND    ||
-           LNET_NETTYP(net) == VIBLND) {
-               snprintf(err_str,
-                        sizeof(err_str),
-                        "\"obselete LNet type '%s'\"", libcfs_lnd2str(net));
-               rc = LUSTRE_CFG_RC_BAD_PARAM;
-               goto out;
-       }
-
        gateway_nid = libcfs_str2nid(gw);
        if (gateway_nid == LNET_NID_ANY) {
                snprintf(err_str,
@@ -583,17 +667,6 @@ int lustre_lnet_del_route(char *nw, char *gw,
                goto out;
        }
 
-       if (LNET_NETTYP(net) == CIBLND    ||
-           LNET_NETTYP(net) == OPENIBLND ||
-           LNET_NETTYP(net) == IIBLND    ||
-           LNET_NETTYP(net) == VIBLND) {
-               snprintf(err_str,
-                        sizeof(err_str),
-                        "\"obselete LNet type '%s'\"", libcfs_lnd2str(net));
-               rc = LUSTRE_CFG_RC_BAD_PARAM;
-               goto out;
-       }
-
        gateway_nid = libcfs_str2nid(gw);
        if (gateway_nid == LNET_NID_ANY) {
                snprintf(err_str,
@@ -650,17 +723,6 @@ int lustre_lnet_show_route(char *nw, char *gw, int hops, int prio, int detail,
                        goto out;
                }
 
-               if (LNET_NETTYP(net) == CIBLND    ||
-                   LNET_NETTYP(net) == OPENIBLND ||
-                   LNET_NETTYP(net) == IIBLND    ||
-                   LNET_NETTYP(net) == VIBLND) {
-                       snprintf(err_str,
-                                sizeof(err_str),
-                                "\"obsolete LNet type '%s'\"",
-                                libcfs_lnd2str(net));
-                       rc = LUSTRE_CFG_RC_BAD_PARAM;
-                       goto out;
-               }
        } else {
                /* show all routes without filtering on net */
                net = LNET_NIDNET(LNET_NID_ANY);
@@ -913,7 +975,7 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa,
 {
        int rc;
        __u32 ip;
-       struct lnet_dlc_intf_descr *intf_descr;
+       struct lnet_dlc_intf_descr *intf_descr, *tmp;
        struct ifaddrs *ifaddr = ifa;
        struct lustre_lnet_ip_range_descr *ip_range;
        int family;
@@ -931,7 +993,8 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa,
                                continue;
 
                        family = ifaddr->ifa_addr->sa_family;
-                       if (family == AF_INET) {
+                       if (family == AF_INET &&
+                           strcmp(ifaddr->ifa_name, "lo") != 0) {
                                rc = lustre_lnet_add_intf_descr
                                        (intf_list, ifaddr->ifa_name,
                                        strlen(ifaddr->ifa_name));
@@ -979,11 +1042,14 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa,
 
                                        if (rc != LUSTRE_CFG_RC_NO_ERR)
                                                return rc;
-
-                                       return LUSTRE_CFG_RC_MATCH;
                                }
                        }
                }
+
+               if (!list_empty(intf_list))
+                       return LUSTRE_CFG_RC_MATCH;
+
+               return LUSTRE_CFG_RC_NO_MATCH;
        }
 
        /*
@@ -994,7 +1060,7 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa,
         * If > 1 interfaces all the interfaces must match for the NI to
         * be configured.
         */
-       list_for_each_entry(intf_descr, intf_list, intf_on_network) {
+       list_for_each_entry_safe(intf_descr, tmp, intf_list, intf_on_network) {
                for (ifaddr = ifa; ifaddr != NULL; ifaddr = ifaddr->ifa_next) {
                        if (ifaddr->ifa_addr == NULL)
                                continue;
@@ -1006,20 +1072,31 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa,
                                break;
                }
 
-               if (ifaddr == NULL)
-                       return LUSTRE_CFG_RC_NO_MATCH;
+               if (ifaddr == NULL) {
+                       list_del(&intf_descr->intf_on_network);
+                       free_intf_descr(intf_descr);
+                       continue;
+               }
 
-               if ((ifaddr->ifa_flags & IFF_UP) == 0)
-                       return LUSTRE_CFG_RC_NO_MATCH;
+               if ((ifaddr->ifa_flags & IFF_UP) == 0) {
+                       list_del(&intf_descr->intf_on_network);
+                       free_intf_descr(intf_descr);
+                       continue;
+               }
 
                ip = ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr;
 
+               rc = 1;
                list_for_each_entry(ip_range, ip_ranges, ipr_entry) {
                        rc = cfs_ip_addr_match(bswap_32(ip), &ip_range->ipr_expr);
                        if (rc)
                                break;
-                       else
-                               return LUSTRE_CFG_RC_NO_MATCH;
+               }
+
+               if (!rc) {
+                       /* no match for this interface */
+                       list_del(&intf_descr->intf_on_network);
+                       free_intf_descr(intf_descr);
                }
        }
 
@@ -1083,7 +1160,7 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list,
                conf = (struct lnet_ioctl_config_ni*) data;
                if (i == 0 && tunables != NULL)
                        tun = (struct lnet_ioctl_config_lnd_tunables*)
-                               (data + sizeof(*conf));
+                               conf->lic_bulk;
 
                LIBCFS_IOC_INIT_V2(*conf, lic_cfg_hdr);
                conf->lic_cfg_hdr.ioc_len = len;
@@ -1146,8 +1223,7 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets,
 
        snprintf(err_str, sizeof(err_str), "\"success\"");
 
-       if (ip2nets == NULL ||
-           list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+       if (!ip2nets) {
                snprintf(err_str,
                         sizeof(err_str),
                         "\"incomplete ip2nets information\"");
@@ -1163,6 +1239,12 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets,
                goto out;
        }
 
+       if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+               snprintf(err_str, sizeof(err_str),
+                        "\"no interfaces match ip2nets rules\"");
+               goto out;
+       }
+
        rc = lustre_lnet_ioctl_config_ni(&ip2nets->ip2nets_net.nw_intflist,
                                         tunables, global_cpts, nids,
                                         err_str);
@@ -1298,9 +1380,8 @@ out:
                list_for_each_entry_safe(intf_descr, tmp,
                                         &nw_descr->nw_intflist,
                                         intf_on_network) {
-                       if (intf_descr->cpt_expr != NULL)
-                               cfs_expr_list_free(intf_descr->cpt_expr);
-                       free(intf_descr);
+                       list_del(&intf_descr->intf_on_network);
+                       free_intf_descr(intf_descr);
                }
        }
 
@@ -1385,9 +1466,8 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr,
 
        list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist,
                                 intf_on_network) {
-               if (intf_descr->cpt_expr != NULL)
-                       cfs_expr_list_free(intf_descr->cpt_expr);
-               free(intf_descr);
+               list_del(&intf_descr->intf_on_network);
+               free_intf_descr(intf_descr);
        }
 
 out:
@@ -1906,9 +1986,13 @@ out:
        return rc;
 }
 
-int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
-                         struct cYAML **err_rc)
+int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
+                         struct cYAML **show_rc, struct cYAML **err_rc)
 {
+       /*
+        * TODO: This function is changing in a future patch to accommodate
+        * PEER_LIST and proper filtering on any nid of the peer
+        */
        struct lnet_ioctl_peer_cfg *peer_info;
        struct lnet_peer_ni_credit_info *lpni_cri;
        struct lnet_ioctl_element_stats *lpni_stats;
@@ -1958,7 +2042,7 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
                        }
 
                        if (primary_nid != LNET_NID_ANY &&
-                           primary_nid != peer_info->prcfg_key_nid)
+                           primary_nid != peer_info->prcfg_prim_nid)
                                        continue;
 
                        lpni_cri = (struct lnet_peer_ni_credit_info*)peer_info->prcfg_bulk;
@@ -1970,17 +2054,22 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
                        if (peer == NULL)
                                goto out;
 
-                       if (peer_info->prcfg_key_nid != prev_primary_nid) {
-                               prev_primary_nid = peer_info->prcfg_key_nid;
+                       if (peer_info->prcfg_prim_nid != prev_primary_nid) {
+                               prev_primary_nid = peer_info->prcfg_prim_nid;
                                new_peer = true;
                        }
 
                        if (new_peer) {
-                               lnet_nid_t pnid = peer_info->prcfg_key_nid;
+                               lnet_nid_t pnid = peer_info->prcfg_prim_nid;
                                if (cYAML_create_string(peer, "primary nid",
                                                        libcfs_nid2str(pnid))
                                    == NULL)
                                        goto out;
+                               if (cYAML_create_string(peer, "Multi-Rail",
+                                                       peer_info->prcfg_mr ?
+                                                       "True" : "False")
+                                   == NULL)
+                                       goto out;
                                tmp = cYAML_create_seq(peer, "peer ni");
                                if (tmp == NULL)
                                        goto out;
@@ -2005,9 +2094,8 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
                            == NULL)
                                goto out;
 
-                       if (cYAML_create_number(peer_ni, "refcount",
-                                               lpni_cri->cr_refcount) == NULL)
-                               goto out;
+                       if (!detail)
+                               continue;
 
                        if (cYAML_create_number(peer_ni, "max_ni_tx_credits",
                                                lpni_cri->cr_ni_peer_tx_credits)
@@ -2019,6 +2107,16 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
                            == NULL)
                                goto out;
 
+                       if (cYAML_create_number(peer_ni, "min_tx_credits",
+                                               lpni_cri->cr_peer_min_tx_credits)
+                           == NULL)
+                               goto out;
+
+                       if (cYAML_create_number(peer_ni, "tx_q_num_of_buf",
+                                               lpni_cri->cr_peer_tx_qnob)
+                           == NULL)
+                               goto out;
+
                        if (cYAML_create_number(peer_ni, "available_rtr_credits",
                                                lpni_cri->cr_peer_rtr_credits)
                            == NULL)
@@ -2029,11 +2127,6 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
                            == NULL)
                                goto out;
 
-                       if (cYAML_create_number(peer_ni, "tx_q_num_of_buf",
-                                               lpni_cri->cr_peer_tx_qnob)
-                           == NULL)
-                               goto out;
-
                        if (cYAML_create_number(peer_ni, "send_count",
                                                lpni_stats->send_count)
                            == NULL)
@@ -2048,6 +2141,10 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc,
                                                lpni_stats->drop_count)
                            == NULL)
                                goto out;
+
+                       if (cYAML_create_number(peer_ni, "refcount",
+                                               lpni_cri->cr_refcount) == NULL)
+                               goto out;
                }
 
                if (l_errno != ENOENT) {
@@ -2282,10 +2379,11 @@ static void yaml_free_string_array(char **array, int num)
 
        for (i = 0; i < num; i++) {
                if (*sub_array != NULL)
-                       free(sub_array);
+                       free(*sub_array);
                sub_array++;
        }
-       free(array);
+       if (array)
+               free(array);
 }
 
 /*
@@ -2332,9 +2430,8 @@ static int yaml_copy_intf_info(struct cYAML *intf_tree,
 failed:
        list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist,
                                 intf_on_network) {
-               if (intf_descr->cpt_expr != NULL)
-                       cfs_expr_list_free(intf_descr->cpt_expr);
-               free(intf_descr);
+               list_del(&intf_descr->intf_on_network);
+               free_intf_descr(intf_descr);
        }
 
        return rc;
@@ -2343,10 +2440,10 @@ failed:
 static bool
 yaml_extract_cmn_tunables(struct cYAML *tree,
                          struct lnet_ioctl_config_lnd_cmn_tunables *tunables,
-                         int *num_global_cpts,
                          struct cfs_expr_list **global_cpts)
 {
        struct cYAML *tun, *item, *smp;
+       int rc;
 
        tun = cYAML_get_object_item(tree, "tunables");
        if (tun != NULL) {
@@ -2364,10 +2461,11 @@ yaml_extract_cmn_tunables(struct cYAML *tree,
                        tunables->lct_max_tx_credits = item->cy_valueint;
                smp = cYAML_get_object_item(tun, "CPT");
                if (smp != NULL) {
-                       *num_global_cpts =
-                               cfs_expr_list_parse(smp->cy_valuestring,
+                       rc = cfs_expr_list_parse(smp->cy_valuestring,
                                                 strlen(smp->cy_valuestring),
                                                 0, UINT_MAX, global_cpts);
+                       if (rc != 0)
+                               *global_cpts = NULL;
                }
 
                return true;
@@ -2379,14 +2477,13 @@ yaml_extract_cmn_tunables(struct cYAML *tree,
 static bool
 yaml_extract_tunables(struct cYAML *tree,
                      struct lnet_ioctl_config_lnd_tunables *tunables,
-                     int *num_global_cpts,
                      struct cfs_expr_list **global_cpts,
                      __u32 net_type)
 {
        bool rc;
 
        rc = yaml_extract_cmn_tunables(tree, &tunables->lt_cmn,
-                                      num_global_cpts, global_cpts);
+                                      global_cpts);
 
        if (!rc)
                return rc;
@@ -2427,7 +2524,7 @@ static int handle_yaml_config_ni(struct cYAML *tree, struct cYAML **show_rc,
 {
        struct cYAML *net, *intf, *seq_no, *ip2net = NULL, *local_nis = NULL,
                     *item = NULL;
-       int num_entries = 0, num_global_cpts = 0, rc;
+       int num_entries = 0, rc;
        struct lnet_dlc_network_descr nw_descr;
        struct cfs_expr_list *global_cpts = NULL;
        struct lnet_ioctl_config_lnd_tunables tunables;
@@ -2470,13 +2567,12 @@ static int handle_yaml_config_ni(struct cYAML *tree, struct cYAML **show_rc,
                }
        }
 
-       found = yaml_extract_tunables(tree, &tunables, &num_global_cpts,
-                                     &global_cpts,
+       found = yaml_extract_tunables(tree, &tunables, &global_cpts,
                                      LNET_NETTYP(nw_descr.nw_id));
        seq_no = cYAML_get_object_item(tree, "seq_no");
 
        rc = lustre_lnet_config_ni(&nw_descr,
-                                  (num_global_cpts > 0) ? global_cpts: NULL,
+                                  global_cpts,
                                   (ip2net) ? ip2net->cy_valuestring : NULL,
                                   (found) ? &tunables: NULL,
                                   (seq_no) ? seq_no->cy_valueint : -1,
@@ -2507,7 +2603,7 @@ static int handle_yaml_config_ip2nets(struct cYAML *tree,
        struct lustre_lnet_ip2nets ip2nets;
        struct lustre_lnet_ip_range_descr *ip_range_descr = NULL,
                                          *tmp = NULL;
-       int rc = LUSTRE_CFG_RC_NO_ERR, num_global_cpts = 0;
+       int rc = LUSTRE_CFG_RC_NO_ERR;
        struct cfs_expr_list *global_cpts = NULL;
        struct cfs_expr_list *el, *el_tmp;
        struct lnet_ioctl_config_lnd_tunables tunables;
@@ -2561,13 +2657,12 @@ static int handle_yaml_config_ip2nets(struct cYAML *tree,
                }
        }
 
-       found = yaml_extract_tunables(tree, &tunables, &num_global_cpts,
-                                     &global_cpts,
+       found = yaml_extract_tunables(tree, &tunables, &global_cpts,
                                      LNET_NETTYP(ip2nets.ip2nets_net.nw_id));
 
        rc = lustre_lnet_config_ip2nets(&ip2nets,
                        (found) ? &tunables : NULL,
-                       (num_global_cpts > 0) ? global_cpts : NULL,
+                       global_cpts,
                        (seq_no) ? seq_no->cy_valueint : -1,
                        err_rc);
 
@@ -2581,17 +2676,19 @@ out:
        list_for_each_entry_safe(intf_descr, intf_tmp,
                                 &ip2nets.ip2nets_net.nw_intflist,
                                 intf_on_network) {
-               if (intf_descr->cpt_expr != NULL)
-                       cfs_expr_list_free(intf_descr->cpt_expr);
-               free(intf_descr);
+               list_del(&intf_descr->intf_on_network);
+               free_intf_descr(intf_descr);
        }
 
        list_for_each_entry_safe(ip_range_descr, tmp,
                                 &ip2nets.ip2nets_ip_ranges,
                                 ipr_entry) {
+               list_del(&ip_range_descr->ipr_entry);
                list_for_each_entry_safe(el, el_tmp, &ip_range_descr->ipr_expr,
-                                        el_link)
+                                        el_link) {
+                       list_del(&el->el_link);
                        cfs_expr_list_free(el);
+               }
                free(ip_range_descr);
        }
 
@@ -2644,46 +2741,40 @@ static int handle_yaml_del_ni(struct cYAML *tree, struct cYAML **show_rc,
 
 static int yaml_copy_peer_nids(struct cYAML *tree, char ***nidsppp)
 {
-       struct cYAML *nids_entry = NULL, *child;
+       struct cYAML *nids_entry = NULL, *child = NULL, *entry = NULL;
        char **nids = NULL;
        int num = 0, rc = LUSTRE_CFG_RC_NO_ERR;
 
-       nids_entry = cYAML_get_object_item(tree, "nids");
-       if (nids_entry != NULL) {
-               /* count */
-               child = nids_entry->cy_child;
-               while (child != NULL) {
+       nids_entry = cYAML_get_object_item(tree, "peer ni");
+       if (cYAML_is_sequence(nids_entry)) {
+               while (cYAML_get_next_seq_item(nids_entry, &child))
                        num++;
-                       child = child->cy_next;
-               }
+       }
 
-               if (num == 0)
-                       return LUSTRE_CFG_RC_MISSING_PARAM;
-
-               nids = calloc(sizeof(*nids) * num, 1);
-               if (nids == NULL)
-                       return LUSTRE_CFG_RC_OUT_OF_MEM;
-
-               /* now grab all the nids */
-               child = nids_entry->cy_child;
-               num = 0;
-               while (child != NULL) {
-                       nids[num] = calloc(strlen(child->cy_valuestring) + 1,
-                                          1);
-                       if (nids[num] == NULL) {
-                               rc = LUSTRE_CFG_RC_OUT_OF_MEM;
-                               goto failed;
-                       }
-                       strncpy(nids[num], child->cy_valuestring,
-                               strlen(child->cy_valuestring));
-                       child = child->cy_next;
-                       num++;
+       if (num == 0)
+               return LUSTRE_CFG_RC_MISSING_PARAM;
+
+       nids = calloc(sizeof(*nids) * num, 1);
+       if (nids == NULL)
+               return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+       /* now grab all the nids */
+       num = 0;
+       child = NULL;
+       while (cYAML_get_next_seq_item(nids_entry, &child)) {
+               entry = cYAML_get_object_item(child, "nid");
+               if (!entry)
+                       continue;
+               nids[num] = calloc(strlen(entry->cy_valuestring) + 1, 1);
+               if (!nids[num]) {
+                       rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+                       goto failed;
                }
-               rc = num;
-       } else {
-               rc = LUSTRE_CFG_RC_MISSING_PARAM;
-               goto failed;
+               strncpy(nids[num], entry->cy_valuestring,
+                       strlen(entry->cy_valuestring));
+               num++;
        }
+       rc = num;
 
        *nidsppp = nids;
        return rc;
@@ -2700,18 +2791,18 @@ static int handle_yaml_config_peer(struct cYAML *tree, struct cYAML **show_rc,
 {
        char **nids = NULL;
        int num, rc;
-       struct cYAML *seq_no, *key_nid, *non_mr;
+       struct cYAML *seq_no, *prim_nid, *non_mr;
 
        num = yaml_copy_peer_nids(tree, &nids);
        if (num < 0)
                return num;
 
        seq_no = cYAML_get_object_item(tree, "seq_no");
-       key_nid = cYAML_get_object_item(tree, "key_nid");
+       prim_nid = cYAML_get_object_item(tree, "primary nid");
        non_mr = cYAML_get_object_item(tree, "non_mr");
 
-       rc = lustre_lnet_config_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL,
-                                        nids,
+       rc = lustre_lnet_config_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL,
+                                        nids, num,
                                         (non_mr) ? false : true,
                                         (seq_no) ? seq_no->cy_valueint : -1,
                                         err_rc);
@@ -2725,17 +2816,17 @@ static int handle_yaml_del_peer(struct cYAML *tree, struct cYAML **show_rc,
 {
        char **nids = NULL;
        int num, rc;
-       struct cYAML *seq_no, *key_nid;
+       struct cYAML *seq_no, *prim_nid;
 
        num = yaml_copy_peer_nids(tree, &nids);
        if (num < 0)
                return num;
 
        seq_no = cYAML_get_object_item(tree, "seq_no");
-       key_nid = cYAML_get_object_item(tree, "key_nid");
+       prim_nid = cYAML_get_object_item(tree, "primary nid");
 
-       rc = lustre_lnet_del_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL,
-                                     nids,
+       rc = lustre_lnet_del_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL,
+                                     nids, num,
                                      (seq_no) ? seq_no->cy_valueint : -1,
                                      err_rc);
 
@@ -2867,15 +2958,17 @@ static int handle_yaml_show_routing(struct cYAML *tree, struct cYAML **show_rc,
                                        show_rc, err_rc);
 }
 
-static int handle_yaml_show_credits(struct cYAML *tree, struct cYAML **show_rc,
-                                   struct cYAML **err_rc)
+static int handle_yaml_show_peers(struct cYAML *tree, struct cYAML **show_rc,
+                                 struct cYAML **err_rc)
 {
-       struct cYAML *seq_no, *key_nid;
+       struct cYAML *seq_no, *nid, *detail;
 
        seq_no = cYAML_get_object_item(tree, "seq_no");
-       key_nid = cYAML_get_object_item(tree, "key_nid");
+       detail = cYAML_get_object_item(tree, "detail");
+       nid = cYAML_get_object_item(tree, "nid");
 
-       return lustre_lnet_show_peer((key_nid) ? key_nid->cy_valuestring : NULL,
+       return lustre_lnet_show_peer((nid) ? nid->cy_valuestring : NULL,
+                                    (detail) ? detail->cy_valueint : 0,
                                     (seq_no) ? seq_no->cy_valueint : -1,
                                     show_rc, err_rc);
 }
@@ -2891,38 +2984,73 @@ static int handle_yaml_show_stats(struct cYAML *tree, struct cYAML **show_rc,
                                      show_rc, err_rc);
 }
 
+static int handle_yaml_config_numa(struct cYAML *tree, struct cYAML **show_rc,
+                                 struct cYAML **err_rc)
+{
+       struct cYAML *seq_no, *range;
+
+       seq_no = cYAML_get_object_item(tree, "seq_no");
+       range = cYAML_get_object_item(tree, "range");
+
+       return lustre_lnet_config_numa_range(range ? range->cy_valueint : -1,
+                                            seq_no ? seq_no->cy_valueint : -1,
+                                            err_rc);
+}
+
+static int handle_yaml_del_numa(struct cYAML *tree, struct cYAML **show_rc,
+                              struct cYAML **err_rc)
+{
+       struct cYAML *seq_no;
+
+       seq_no = cYAML_get_object_item(tree, "seq_no");
+
+       return lustre_lnet_config_numa_range(0, seq_no ? seq_no->cy_valueint : -1,
+                                            err_rc);
+}
+
+static int handle_yaml_show_numa(struct cYAML *tree, struct cYAML **show_rc,
+                               struct cYAML **err_rc)
+{
+       struct cYAML *seq_no;
+
+       seq_no = cYAML_get_object_item(tree, "seq_no");
+
+       return lustre_lnet_show_numa_range(seq_no ? seq_no->cy_valueint : -1,
+                                          show_rc, err_rc);
+}
+
 struct lookup_cmd_hdlr_tbl {
        char *name;
        cmd_handler_t cb;
 };
 
 static struct lookup_cmd_hdlr_tbl lookup_config_tbl[] = {
-       {"route", handle_yaml_config_route},
-       {"net", handle_yaml_config_ni},
-       {"ip2nets", handle_yaml_config_ip2nets},
-       {"peer", handle_yaml_config_peer},
-       {"routing", handle_yaml_config_routing},
-       {"buffers", handle_yaml_config_buffers},
-       {NULL, NULL}
-};
+       { .name = "route",      .cb = handle_yaml_config_route },
+       { .name = "net",        .cb = handle_yaml_config_ni },
+       { .name = "ip2nets",    .cb = handle_yaml_config_ip2nets },
+       { .name = "peer",       .cb = handle_yaml_config_peer },
+       { .name = "routing",    .cb = handle_yaml_config_routing },
+       { .name = "buffers",    .cb = handle_yaml_config_buffers },
+       { .name = "numa",       .cb = handle_yaml_config_numa },
+       { .name = NULL } };
 
 static struct lookup_cmd_hdlr_tbl lookup_del_tbl[] = {
-       {"route", handle_yaml_del_route},
-       {"net", handle_yaml_del_ni},
-       {"peer", handle_yaml_del_peer},
-       {"routing", handle_yaml_del_routing},
-       {NULL, NULL}
-};
+       { .name = "route",      .cb = handle_yaml_del_route },
+       { .name = "net",        .cb = handle_yaml_del_ni },
+       { .name = "peer",       .cb = handle_yaml_del_peer },
+       { .name = "routing",    .cb = handle_yaml_del_routing },
+       { .name = "numa",       .cb = handle_yaml_del_numa },
+       { .name = NULL } };
 
 static struct lookup_cmd_hdlr_tbl lookup_show_tbl[] = {
-       {"route", handle_yaml_show_route},
-       {"net", handle_yaml_show_net},
-       {"buffers", handle_yaml_show_routing},
-       {"routing", handle_yaml_show_routing},
-       {"credits", handle_yaml_show_credits},
-       {"statistics", handle_yaml_show_stats},
-       {NULL, NULL}
-};
+       { .name = "route",      .cb = handle_yaml_show_route },
+       { .name = "net",        .cb = handle_yaml_show_net },
+       { .name = "buffers",    .cb = handle_yaml_show_routing },
+       { .name = "routing",    .cb = handle_yaml_show_routing },
+       { .name = "peer",       .cb = handle_yaml_show_peers },
+       { .name = "statistics", .cb = handle_yaml_show_stats },
+       { .name = "numa",       .cb = handle_yaml_show_numa },
+       { .name = NULL } };
 
 static cmd_handler_t lookup_fn(char *key,
                               struct lookup_cmd_hdlr_tbl *tbl)