X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flnetconfig%2Fliblnetconfig.c;h=bb35de5565ce75cdadfaa400df583a85e3399a69;hb=dd0f5728b26bc343dd39f8d4d5eec628410a7dc6;hp=6aaa1a0516b6a643bf6267abea771a4e68e5cff3;hpb=ce8735993473c1055038f7422350c96b092d707d;p=fs%2Flustre-release.git

diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c
index 6aaa1a0..bb35de5 100644
--- a/lnet/utils/lnetconfig/liblnetconfig.c
+++ b/lnet/utils/lnetconfig/liblnetconfig.c
@@ -40,14 +40,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include <sys/ioctl.h>
 #include <net/if.h>
 #include <libcfs/util/ioctl.h>
-#include <lnet/lnetctl.h>
-#include <lnet/socklnd.h>
+#include <linux/lnet/lnetctl.h>
 #include "liblnd.h"
-#include <lnet/lnet.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <ifaddrs.h>
 #include "liblnetconfig.h"
 #include "cyaml.h"
@@ -59,6 +60,8 @@
 #define SHOW_CMD		"show"
 #define DBG_CMD			"dbg"
 
+#define modparam_path "/sys/module/lnet/parameters/"
+
 /*
  * lustre_lnet_ip_range_descr
  *	Describes an IP range.
@@ -78,6 +81,62 @@ struct lustre_lnet_ip2nets {
 	struct list_head ip2nets_ip_ranges;
 };
 
+int open_sysfs_file(const char *path, const char *attr, const int mode)
+{
+	int fd;
+	char filename[LNET_MAX_STR_LEN];
+
+	if (strlen(path) + strlen(attr) >= LNET_MAX_STR_LEN)
+		return -1;
+
+	snprintf(filename, sizeof(filename), "%s%s",
+		 path, attr);
+
+	fd = open(filename, mode);
+
+	return fd;
+}
+
+static int read_sysfs_file(const char *path, const char *attr,
+			   void *val, const size_t size, const int nelem)
+{
+	int fd;
+	int rc = LUSTRE_CFG_RC_GENERIC_ERR;
+
+	fd = open_sysfs_file(path, attr, O_RDONLY);
+	if (fd == -1)
+		return LUSTRE_CFG_RC_NO_MATCH;
+
+	if (read(fd, val, size * nelem) == -1)
+		goto close_fd;
+
+	rc = LUSTRE_CFG_RC_NO_ERR;
+
+close_fd:
+	close(fd);
+	return rc;
+}
+
+static int write_sysfs_file(const char *path, const char *attr,
+			    void *val, const size_t size, const int nelem)
+{
+	int fd;
+	int rc = LUSTRE_CFG_RC_GENERIC_ERR;
+
+	fd = open_sysfs_file(path, attr, O_WRONLY | O_TRUNC);
+	if (fd == -1)
+		return LUSTRE_CFG_RC_NO_MATCH;
+
+	if (write(fd, val, size * nelem) == -1)
+		goto close_fd;
+
+	rc = LUSTRE_CFG_RC_NO_ERR;
+
+close_fd:
+	close(fd);
+	return rc;
+}
+
 /*
  * free_intf_descr
  *	frees the memory allocated for an intf descriptor.
@@ -381,7 +440,7 @@ static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids,
 	lnet_nid_t *array = NULL;
 	__u32 i;
 
-	if (!nids) {
+	if (!nids || num_nids == 0) {
 		snprintf(err_str, LNET_MAX_STR_LEN, "no NIDs to add");
 		return NULL;
 	}
@@ -807,8 +866,8 @@ int lustre_lnet_show_route(char *nw, char *gw, int hops, int prio, int detail,
 
 		if (detail) {
 			if (cYAML_create_number(item, "hop",
-						data.cfg_config_u.cfg_route.
-							rtr_hop) ==
+						(int) data.cfg_config_u.
+						cfg_route.rtr_hop) ==
 			    NULL)
 				goto out;
 
@@ -872,7 +931,7 @@ out:
 static int socket_intf_query(int request, char *intf,
 			     struct ifreq *ifr)
 {
-	int rc;
+	int rc = 0;
 	int sockfd;
 
 	if (strlen(intf) >= IFNAMSIZ || ifr == NULL)
@@ -885,9 +944,11 @@ static int socket_intf_query(int request, char *intf,
 	strcpy(ifr->ifr_name, intf);
 	rc = ioctl(sockfd, request, ifr);
 	if (rc != 0)
-		return LUSTRE_CFG_RC_BAD_PARAM;
+		rc = LUSTRE_CFG_RC_BAD_PARAM;
 
-	return 0;
+	close(sockfd);
+
+	return rc;
 }
 
 /*
@@ -1150,15 +1211,17 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list,
 
 	list_for_each_entry(intf_descr, intf_list,
 			    intf_on_network) {
-		if (i == 0 && tunables != NULL)
+		if (tunables != NULL)
 			len = sizeof(struct lnet_ioctl_config_ni) +
 			      sizeof(struct lnet_ioctl_config_lnd_tunables);
 		else
 			len = sizeof(struct lnet_ioctl_config_ni);
 
 		data = calloc(1, len);
+		if (!data)
+			return LUSTRE_CFG_RC_OUT_OF_MEM;
 		conf = (struct lnet_ioctl_config_ni*) data;
-		if (i == 0 && tunables != NULL)
+		if (tunables != NULL)
 			tun = (struct lnet_ioctl_config_lnd_tunables*)
 				conf->lic_bulk;
 
@@ -1192,8 +1255,7 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list,
 
 		conf->lic_ncpts = count;
 
-		if (i == 0 && tunables != NULL)
-			/* TODO put in the LND tunables */
+		if (tunables != NULL)
 			memcpy(tun, tunables, sizeof(*tunables));
 
 		rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_LOCAL_NI, data);
@@ -1202,8 +1264,10 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list,
 			snprintf(err_str,
 				 LNET_MAX_STR_LEN,
 				 "\"cannot add network: %s\"", strerror(errno));
+			free(data);
 			return rc;
 		}
+		free(data);
 		i++;
 	}
 
@@ -1231,6 +1295,11 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets,
 		goto out;
 	}
 
+	/*
+	 * call below function to resolve the rules into a list of nids.
+	 * The memory is allocated in that function then freed here when
+	 * it's no longer needed.
+	 */
 	rc = lustre_lnet_resolve_ip2nets_rule(ip2nets, &nids, &nnids);
 	if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH) {
 		snprintf(err_str,
@@ -1242,14 +1311,15 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets,
 	if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
 		snprintf(err_str, sizeof(err_str),
 			 "\"no interfaces match ip2nets rules\"");
-		goto out;
+		goto free_nids_out;
 	}
 
 	rc = lustre_lnet_ioctl_config_ni(&ip2nets->ip2nets_net.nw_intflist,
 					 tunables, global_cpts, nids,
 					 err_str);
-	if (rc != LUSTRE_CFG_RC_NO_ERR)
-		free(nids);
+
+free_nids_out:
+	free(nids);
 
 out:
 	cYAML_build_error(rc, seq_no, ADD_CMD, "ip2nets", err_str, err_rc);
@@ -1301,6 +1371,10 @@ int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr,
 		else
 			len = sizeof(struct lnet_ioctl_config_ni);
 		data = calloc(1, len);
+		if (!data) {
+			rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+			goto out;
+		}
 		conf = (struct lnet_ioctl_config_ni*) data;
 		if (tunables != NULL)
 			tun = (struct lnet_ioctl_config_lnd_tunables*)
@@ -1343,8 +1417,10 @@ int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr,
 		goto out;
 	}
 
-	if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
-		return LUSTRE_CFG_RC_NO_ERR;
+	if (LNET_NETTYP(nw_descr->nw_id) == LOLND) {
+		rc = LUSTRE_CFG_RC_NO_ERR;
+		goto out;
+	}
 
 	if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
 		snprintf(err_str,
@@ -1406,9 +1482,6 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr,
 	__u32 nnids = 0;
 	struct lnet_dlc_intf_descr *intf_descr, *tmp;
 
-	if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
-		return LUSTRE_CFG_RC_NO_ERR;
-
 	snprintf(err_str, sizeof(err_str), "\"success\"");
 
 	if (nw_descr == NULL) {
@@ -1419,6 +1492,9 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr,
 		goto out;
 	}
 
+	if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
+		return LUSTRE_CFG_RC_NO_ERR;
+
 	if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
 		snprintf(err_str,
 			 sizeof(err_str),
@@ -1607,7 +1683,7 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 			if (interfaces == NULL)
 				goto out;
 
-			for (j = 0; j < LNET_MAX_INTERFACES; j++) {
+			for (j = 0; j < LNET_INTERFACES_NUM; j++) {
 				if (strlen(ni_data->lic_ni_intf[j]) > 0) {
 					snprintf(str_buf,
 						 sizeof(str_buf), "%d", j);
@@ -1628,17 +1704,17 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 				goto out;
 
 			if (cYAML_create_number(statistics, "send_count",
-						stats->send_count)
+						stats->iel_send_count)
 							== NULL)
 				goto out;
 
 			if (cYAML_create_number(statistics, "recv_count",
-						stats->recv_count)
+						stats->iel_recv_count)
 							== NULL)
 				goto out;
 
 			if (cYAML_create_number(statistics, "drop_count",
-						stats->drop_count)
+						stats->iel_drop_count)
 							== NULL)
 				goto out;
 
@@ -1761,9 +1837,54 @@ out:
 	return rc;
 }
 
+int lustre_lnet_config_max_intf(int max, int seq_no, struct cYAML **err_rc)
+{
+	int rc = LUSTRE_CFG_RC_NO_ERR;
+	char err_str[LNET_MAX_STR_LEN];
+	char val[LNET_MAX_STR_LEN];
+
+	snprintf(err_str, sizeof(err_str), "\"success\"");
+
+	snprintf(val, sizeof(val), "%d", max);
+
+	rc = write_sysfs_file(modparam_path, "lnet_interfaces_max", val,
+			      1, strlen(val) + 1);
+	if (rc)
+		snprintf(err_str, sizeof(err_str),
+			 "\"cannot configure max interfaces: %s\"",
+			 strerror(errno));
+
+	cYAML_build_error(rc, seq_no, ADD_CMD, "max_interfaces", err_str, err_rc);
+
+	return rc;
+}
+
+int lustre_lnet_config_discovery(int enable, int seq_no, struct cYAML **err_rc)
+{
+	int rc = LUSTRE_CFG_RC_NO_ERR;
+	char err_str[LNET_MAX_STR_LEN];
+	char val[LNET_MAX_STR_LEN];
+
+	snprintf(err_str, sizeof(err_str), "\"success\"");
+
+	snprintf(val, sizeof(val), "%u", (enable) ? 0 : 1);
+
+	rc = write_sysfs_file(modparam_path, "lnet_peer_discovery_disabled", val,
+			      1, strlen(val) + 1);
+	if (rc)
+		snprintf(err_str, sizeof(err_str),
+			 "\"cannot configure discovery: %s\"",
+			 strerror(errno));
+
+	cYAML_build_error(rc, seq_no, ADD_CMD, "discovery", err_str, err_rc);
+
+	return rc;
+
+}
+
 int lustre_lnet_config_numa_range(int range, int seq_no, struct cYAML **err_rc)
 {
-	struct lnet_ioctl_numa_range data;
+	struct lnet_ioctl_set_value data;
 	int rc = LUSTRE_CFG_RC_NO_ERR;
 	char err_str[LNET_MAX_STR_LEN];
 
@@ -1777,15 +1898,15 @@ int lustre_lnet_config_numa_range(int range, int seq_no, struct cYAML **err_rc)
 		goto out;
 	}
 
-	LIBCFS_IOC_INIT_V2(data, nr_hdr);
-	data.nr_range = range;
+	LIBCFS_IOC_INIT_V2(data, sv_hdr);
+	data.sv_value = range;
 
 	rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_SET_NUMA_RANGE, &data);
 	if (rc != 0) {
 		rc = -errno;
 		snprintf(err_str,
 			 sizeof(err_str),
-			 "\"cannot configure buffers: %s\"", strerror(errno));
+			 "\"cannot configure numa_range: %s\"", strerror(errno));
 		goto out;
 	}
 
@@ -1993,28 +2114,26 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 	 * 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_ioctl_peer_cfg peer_info;
 	struct lnet_peer_ni_credit_info *lpni_cri;
 	struct lnet_ioctl_element_stats *lpni_stats;
-	int rc = LUSTRE_CFG_RC_OUT_OF_MEM, ncpt = 0, i = 0, j = 0;
+	lnet_nid_t *nidp;
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	int i;
+	int j;
 	int l_errno = 0;
+	__u32 count;
+	__u32 size;
 	struct cYAML *root = NULL, *peer = NULL, *peer_ni = NULL,
 		     *first_seq = NULL, *peer_root = NULL, *tmp = NULL;
 	char err_str[LNET_MAX_STR_LEN];
-	lnet_nid_t prev_primary_nid = LNET_NID_ANY, primary_nid = LNET_NID_ANY;
-	int data_size = sizeof(*peer_info) + sizeof(*lpni_cri) +
-			sizeof(*lpni_stats);
-	char *data = calloc(data_size, 1);
-	bool new_peer = true;
+	lnet_process_id_t *list = NULL;
+	void *data = NULL;
+	void *lpni_data;
 
 	snprintf(err_str, sizeof(err_str),
 		 "\"out of memory\"");
 
-	if (data == NULL)
-		goto out;
-
-	peer_info = (struct lnet_ioctl_peer_cfg *)data;
-
 	/* create struct cYAML root object */
 	root = cYAML_create_object(NULL, NULL);
 	if (root == NULL)
@@ -2024,68 +2143,121 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 	if (peer_root == NULL)
 		goto out;
 
-	if (knid != NULL)
-		primary_nid = libcfs_str2nid(knid);
+	count = 1000;
+	size = count * sizeof(lnet_process_id_t);
+	list = malloc(size);
+	if (list == NULL) {
+		l_errno = ENOMEM;
+		goto out;
+	}
+	if (knid != NULL) {
+		list[0].nid = libcfs_str2nid(knid);
+		count = 1;
+	} else {
+		for (;;) {
+			memset(&peer_info, 0, sizeof(peer_info));
+			LIBCFS_IOC_INIT_V2(peer_info, prcfg_hdr);
+			peer_info.prcfg_hdr.ioc_len = sizeof(peer_info);
+			peer_info.prcfg_size = size;
+			peer_info.prcfg_bulk = list;
+
+			l_errno = 0;
+			rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER_LIST,
+				     &peer_info);
+			count = peer_info.prcfg_count;
+			if (rc == 0)
+				break;
+			l_errno = errno;
+			if (l_errno != E2BIG) {
+				snprintf(err_str,
+					sizeof(err_str),
+					"\"cannot get peer list: %s\"",
+					strerror(l_errno));
+				rc = -l_errno;
+				goto out;
+			}
+			free(list);
+			size = peer_info.prcfg_size;
+			list = malloc(size);
+			if (list == NULL) {
+				l_errno = ENOMEM;
+				goto out;
+			}
+		}
+	}
 
-	do {
-		for (i = 0;; i++) {
-			memset(data, 0, data_size);
-			LIBCFS_IOC_INIT_V2(*peer_info, prcfg_hdr);
-			peer_info->prcfg_hdr.ioc_len = data_size;
-			peer_info->prcfg_idx = i;
+	size = 4096;
+	data = malloc(size);
+	if (data == NULL) {
+		l_errno = ENOMEM;
+		goto out;
+	}
+	for (i = 0; i < count; i++) {
+		for (;;) {
+			memset(&peer_info, 0, sizeof(peer_info));
+			LIBCFS_IOC_INIT_V2(peer_info, prcfg_hdr);
+			peer_info.prcfg_hdr.ioc_len = sizeof(peer_info);
+			peer_info.prcfg_prim_nid = list[i].nid;
+			peer_info.prcfg_size = size;
+			peer_info.prcfg_bulk = data;
 
-			rc = l_ioctl(LNET_DEV_ID,
-				     IOC_LIBCFS_GET_PEER_NI, peer_info);
-			if (rc != 0) {
-				l_errno = errno;
+			l_errno = 0;
+			rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER_NI,
+				     &peer_info);
+			if (rc == 0)
 				break;
+			l_errno = errno;
+			if (l_errno != E2BIG) {
+				snprintf(err_str,
+					sizeof(err_str),
+					"\"cannot get peer information: %s\"",
+					strerror(l_errno));
+				rc = -l_errno;
+				goto out;
 			}
+			free(data);
+			size = peer_info.prcfg_size;
+			data = malloc(size);
+			if (data == NULL) {
+				l_errno = ENOMEM;
+				goto out;
+			}
+		}
 
-			if (primary_nid != LNET_NID_ANY &&
-			    primary_nid != peer_info->prcfg_prim_nid)
-					continue;
-
-			lpni_cri = (struct lnet_peer_ni_credit_info*)peer_info->prcfg_bulk;
-			lpni_stats = (struct lnet_ioctl_element_stats *)
-				     (peer_info->prcfg_bulk +
-				     sizeof(*lpni_cri));
+		peer = cYAML_create_seq_item(peer_root);
+		if (peer == NULL)
+			goto out;
 
-			peer = cYAML_create_seq_item(peer_root);
-			if (peer == NULL)
-				goto out;
+		if (first_seq == NULL)
+			first_seq = peer;
 
-			if (peer_info->prcfg_prim_nid != prev_primary_nid) {
-				prev_primary_nid = peer_info->prcfg_prim_nid;
-				new_peer = true;
-			}
+		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;
 
-			if (new_peer) {
-				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;
-				new_peer = false;
-			}
+		tmp = cYAML_create_seq(peer, "peer ni");
+		if (tmp == NULL)
+			goto out;
 
-			if (first_seq == NULL)
-				first_seq = peer;
+		lpni_data = data;
+		for (j = 0; j < peer_info.prcfg_count; j++) {
+			nidp = lpni_data;
+			lpni_cri = (void*)nidp + sizeof(nidp);
+			lpni_stats = (void *)lpni_cri + sizeof(*lpni_cri);
+			lpni_data = (void *)lpni_stats + sizeof(*lpni_stats);
 
 			peer_ni = cYAML_create_seq_item(tmp);
 			if (peer_ni == NULL)
 				goto out;
 
 			if (cYAML_create_string(peer_ni, "nid",
-						libcfs_nid2str
-						 (peer_info->prcfg_cfg_nid))
+						libcfs_nid2str(*nidp))
 			    == NULL)
 				goto out;
 
@@ -2128,17 +2300,17 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 				goto out;
 
 			if (cYAML_create_number(peer_ni, "send_count",
-						lpni_stats->send_count)
+						lpni_stats->iel_send_count)
 			    == NULL)
 				goto out;
 
 			if (cYAML_create_number(peer_ni, "recv_count",
-						lpni_stats->recv_count)
+						lpni_stats->iel_recv_count)
 			    == NULL)
 				goto out;
 
 			if (cYAML_create_number(peer_ni, "drop_count",
-						lpni_stats->drop_count)
+						lpni_stats->iel_drop_count)
 			    == NULL)
 				goto out;
 
@@ -2146,18 +2318,118 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 						lpni_cri->cr_refcount) == NULL)
 				goto out;
 		}
+	}
+
+	/* print output iff show_rc is not provided */
+	if (show_rc == NULL)
+		cYAML_print_tree(root);
+
+	snprintf(err_str, sizeof(err_str), "\"success\"");
+	rc = LUSTRE_CFG_RC_NO_ERR;
+
+out:
+	free(list);
+	free(data);
+	if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_free_tree(root);
+	} else if (show_rc != NULL && *show_rc != NULL) {
+		struct cYAML *show_node;
+		/* find the peer node, if one doesn't exist then
+		 * insert one.  Otherwise add to the one there
+		 */
+		show_node = cYAML_get_object_item(*show_rc,
+						  "peer");
+		if (show_node != NULL && cYAML_is_sequence(show_node)) {
+			cYAML_insert_child(show_node, first_seq);
+			free(peer_root);
+			free(root);
+		} else if (show_node == NULL) {
+			cYAML_insert_sibling((*show_rc)->cy_child,
+					     peer_root);
+			free(root);
+		} else {
+			cYAML_free_tree(root);
+		}
+	} else {
+		*show_rc = root;
+	}
+
+	cYAML_build_error(rc, seq_no, SHOW_CMD, "peer", err_str,
+			  err_rc);
+
+	return rc;
+}
+
+int lustre_lnet_list_peer(int seq_no,
+			  struct cYAML **show_rc, struct cYAML **err_rc)
+{
+	struct lnet_ioctl_peer_cfg peer_info;
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	__u32 count;
+	__u32 size;
+	int i = 0;
+	int l_errno = 0;
+	struct cYAML *root = NULL, *list_root = NULL, *first_seq = NULL;
+	char err_str[LNET_MAX_STR_LEN];
+	lnet_process_id_t *list = NULL;
+
+	snprintf(err_str, sizeof(err_str),
+		 "\"out of memory\"");
 
-		if (l_errno != ENOENT) {
+	memset(&peer_info, 0, sizeof(peer_info));
+
+	/* create struct cYAML root object */
+	root = cYAML_create_object(NULL, NULL);
+	if (root == NULL)
+		goto out;
+
+	list_root = cYAML_create_seq(root, "peer list");
+	if (list_root == NULL)
+		goto out;
+
+	count = 1000;
+	size = count * sizeof(lnet_process_id_t);
+	list = malloc(size);
+	if (list == NULL) {
+		l_errno = ENOMEM;
+		goto out;
+	}
+	for (;;) {
+		LIBCFS_IOC_INIT_V2(peer_info, prcfg_hdr);
+		peer_info.prcfg_hdr.ioc_len = sizeof(peer_info);
+		peer_info.prcfg_size = size;
+		peer_info.prcfg_bulk = list;
+
+		l_errno = 0;
+		rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER_LIST, &peer_info);
+		count = peer_info.prcfg_count;
+		if (rc == 0)
+			break;
+		l_errno = errno;
+		if (l_errno != E2BIG) {
 			snprintf(err_str,
 				sizeof(err_str),
-				"\"cannot get peer information: %s\"",
+				"\"cannot get peer list: %s\"",
 				strerror(l_errno));
 			rc = -l_errno;
 			goto out;
 		}
+		free(list);
+		size = peer_info.prcfg_size;
+		list = malloc(size);
+		if (list == NULL) {
+			l_errno = ENOMEM;
+			goto out;
+		}
+	}
 
-		j++;
-	} while (j < ncpt);
+	/* count is now the actual number of ids in the list. */
+	for (i = 0; i < count; i++) {
+		if (cYAML_create_string(list_root, "nid",
+					libcfs_nid2str(list[i].nid))
+		    == NULL)
+			goto out;
+	}
 
 	/* print output iff show_rc is not provided */
 	if (show_rc == NULL)
@@ -2167,6 +2439,8 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 	rc = LUSTRE_CFG_RC_NO_ERR;
 
 out:
+	if (list != NULL)
+		free(list);
 	if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_free_tree(root);
 	} else if (show_rc != NULL && *show_rc != NULL) {
@@ -2178,11 +2452,11 @@ out:
 						  "peer");
 		if (show_node != NULL && cYAML_is_sequence(show_node)) {
 			cYAML_insert_child(show_node, first_seq);
-			free(peer_root);
+			free(list_root);
 			free(root);
 		} else if (show_node == NULL) {
 			cYAML_insert_sibling((*show_rc)->cy_child,
-					     peer_root);
+					     list_root);
 			free(root);
 		} else {
 			cYAML_free_tree(root);
@@ -2197,18 +2471,138 @@ out:
 	return rc;
 }
 
+static void add_to_global(struct cYAML *show_rc, struct cYAML *node,
+			  struct cYAML *root)
+{
+	struct cYAML *show_node;
+
+	show_node = cYAML_get_object_item(show_rc, "global");
+	if (show_node != NULL)
+		cYAML_insert_sibling(show_node->cy_child,
+				     node->cy_child);
+	else
+		cYAML_insert_sibling(show_rc->cy_child,
+				     node);
+	free(root);
+}
+
+int lustre_lnet_show_max_intf(int seq_no, struct cYAML **show_rc,
+			      struct cYAML **err_rc)
+{
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	char val[LNET_MAX_STR_LEN];
+	int max_intf;
+	char err_str[LNET_MAX_STR_LEN];
+	struct cYAML *root = NULL, *global = NULL;
+
+	snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+	rc = read_sysfs_file(modparam_path, "lnet_interfaces_max", val,
+			     1, LNET_MAX_STR_LEN);
+	if (rc) {
+		snprintf(err_str, sizeof(err_str),
+			 "\"cannot get max interfaces: %d\"", rc);
+		goto out;
+	}
+
+	max_intf = atoi(val);
+
+	root = cYAML_create_object(NULL, NULL);
+	if (root == NULL)
+		goto out;
+
+	global = cYAML_create_object(root, "global");
+	if (global == NULL)
+		goto out;
+
+	if (cYAML_create_number(global, "max_intf",
+				max_intf) == NULL)
+		goto out;
+
+	if (show_rc == NULL)
+		cYAML_print_tree(root);
+
+	snprintf(err_str, sizeof(err_str), "\"success\"");
+out:
+	if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR)
+		cYAML_free_tree(root);
+	else if (show_rc != NULL && *show_rc != NULL)
+		add_to_global(*show_rc, global, root);
+	else
+		*show_rc = root;
+
+	cYAML_build_error(rc, seq_no, SHOW_CMD, "global", err_str, err_rc);
+
+	return rc;
+}
+
+int lustre_lnet_show_discovery(int seq_no, struct cYAML **show_rc,
+			       struct cYAML **err_rc)
+{
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	char val[LNET_MAX_STR_LEN];
+	__u32 discovery;
+	char err_str[LNET_MAX_STR_LEN];
+	struct cYAML *root = NULL, *global = NULL;
+
+	snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+	rc = read_sysfs_file(modparam_path, "lnet_peer_discovery_disabled", val,
+			     1, sizeof(val));
+	if (rc) {
+		snprintf(err_str, sizeof(err_str),
+			 "\"cannot get discovery value: %d\"", rc);
+		goto out;
+	}
+
+	/*
+	 * the sysfs parameter read indicates if discovery is disabled,
+	 * but we report if discovery is enabled.
+	 */
+	discovery = !atoi(val);
+
+	root = cYAML_create_object(NULL, NULL);
+	if (root == NULL)
+		goto out;
+
+	global = cYAML_create_object(root, "global");
+	if (global == NULL)
+		goto out;
+
+	if (cYAML_create_number(global, "discovery",
+				discovery) == NULL)
+		goto out;
+
+	if (show_rc == NULL)
+		cYAML_print_tree(root);
+
+	snprintf(err_str, sizeof(err_str), "\"success\"");
+out:
+	if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
+		cYAML_free_tree(root);
+	} else if (show_rc != NULL && *show_rc != NULL) {
+		add_to_global(*show_rc, global, root);
+	} else {
+		*show_rc = root;
+	}
+
+	cYAML_build_error(rc, seq_no, SHOW_CMD, "global", err_str, err_rc);
+
+	return rc;
+}
+
 int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc,
 				struct cYAML **err_rc)
 {
-	struct lnet_ioctl_numa_range data;
-	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	struct lnet_ioctl_set_value data;
+	int rc;
 	int l_errno;
 	char err_str[LNET_MAX_STR_LEN];
-	struct cYAML *root = NULL, *range = NULL;
+	struct cYAML *root = NULL, *global = NULL;
 
 	snprintf(err_str, sizeof(err_str), "\"out of memory\"");
 
-	LIBCFS_IOC_INIT_V2(data, nr_hdr);
+	LIBCFS_IOC_INIT_V2(data, sv_hdr);
 
 	rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_NUMA_RANGE, &data);
 	if (rc != 0) {
@@ -2221,34 +2615,35 @@ int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc,
 		goto out;
 	}
 
+	rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
 	root = cYAML_create_object(NULL, NULL);
 	if (root == NULL)
 		goto out;
 
-	range = cYAML_create_object(root, "numa");
-	if (range == NULL)
+	global = cYAML_create_object(root, "global");
+	if (global == NULL)
 		goto out;
 
-	if (cYAML_create_number(range, "range",
-				data.nr_range) == NULL)
+	if (cYAML_create_number(global, "numa_range",
+				data.sv_value) == NULL)
 		goto out;
 
 	if (show_rc == NULL)
 		cYAML_print_tree(root);
 
 	snprintf(err_str, sizeof(err_str), "\"success\"");
+	rc = LUSTRE_CFG_RC_NO_ERR;
 out:
 	if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_free_tree(root);
 	} else if (show_rc != NULL && *show_rc != NULL) {
-		cYAML_insert_sibling((*show_rc)->cy_child,
-					root->cy_child);
-		free(root);
+		add_to_global(*show_rc, global, root);
 	} else {
 		*show_rc = root;
 	}
 
-	cYAML_build_error(rc, seq_no, SHOW_CMD, "numa", err_str, err_rc);
+	cYAML_build_error(rc, seq_no, SHOW_CMD, "global", err_str, err_rc);
 
 	return rc;
 }
@@ -2257,7 +2652,7 @@ int lustre_lnet_show_stats(int seq_no, struct cYAML **show_rc,
 			   struct cYAML **err_rc)
 {
 	struct lnet_ioctl_lnet_stats data;
-	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	int rc;
 	int l_errno;
 	char err_str[LNET_MAX_STR_LEN];
 	struct cYAML *root = NULL, *stats = NULL;
@@ -2277,6 +2672,8 @@ int lustre_lnet_show_stats(int seq_no, struct cYAML **show_rc,
 		goto out;
 	}
 
+	rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
 	root = cYAML_create_object(NULL, NULL);
 	if (root == NULL)
 		goto out;
@@ -2333,6 +2730,7 @@ int lustre_lnet_show_stats(int seq_no, struct cYAML **show_rc,
 		cYAML_print_tree(root);
 
 	snprintf(err_str, sizeof(err_str), "\"success\"");
+	rc = LUSTRE_CFG_RC_NO_ERR;
 out:
 	if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
 		cYAML_free_tree(root);
@@ -2539,6 +2937,8 @@ static int handle_yaml_config_ni(struct cYAML *tree, struct cYAML **show_rc,
 	net = cYAML_get_object_item(tree, "net type");
 	if (net)
 		nw_descr.nw_id = libcfs_str2net(net->cy_valuestring);
+	else
+		nw_descr.nw_id = LOLND;
 
 	/*
 	 * if neither net nor ip2nets are present, then we can not
@@ -2739,16 +3139,38 @@ static int handle_yaml_del_ni(struct cYAML *tree, struct cYAML **show_rc,
 	return rc;
 }
 
-static int yaml_copy_peer_nids(struct cYAML *tree, char ***nidsppp)
+static int yaml_copy_peer_nids(struct cYAML *tree, char ***nidsppp, bool del)
 {
-	struct cYAML *nids_entry = NULL, *child = NULL, *entry = NULL;
+	struct cYAML *nids_entry = NULL, *child = NULL, *entry = NULL,
+		     *prim_nid = NULL;
 	char **nids = NULL;
 	int num = 0, rc = LUSTRE_CFG_RC_NO_ERR;
 
+	prim_nid = cYAML_get_object_item(tree, "primary nid");
+	if (!prim_nid || !prim_nid->cy_valuestring)
+		return LUSTRE_CFG_RC_MISSING_PARAM;
+
 	nids_entry = cYAML_get_object_item(tree, "peer ni");
 	if (cYAML_is_sequence(nids_entry)) {
-		while (cYAML_get_next_seq_item(nids_entry, &child))
+		while (cYAML_get_next_seq_item(nids_entry, &child)) {
+			entry = cYAML_get_object_item(child, "nid");
+			/* don't count an empty entry */
+			if (!entry || !entry->cy_valuestring)
+				continue;
+
+			if ((strcmp(entry->cy_valuestring, prim_nid->cy_valuestring)
+					== 0) && del) {
+				/*
+				 * primary nid is present in the list of
+				 * nids so that means we want to delete
+				 * the entire peer, so no need to go
+				 * further. Just delete the entire peer.
+				 */
+				return 0;
+			}
+
 			num++;
+		}
 	}
 
 	if (num == 0)
@@ -2763,8 +3185,9 @@ static int yaml_copy_peer_nids(struct cYAML *tree, char ***nidsppp)
 	child = NULL;
 	while (cYAML_get_next_seq_item(nids_entry, &child)) {
 		entry = cYAML_get_object_item(child, "nid");
-		if (!entry)
+		if (!entry || !entry->cy_valuestring)
 			continue;
+
 		nids[num] = calloc(strlen(entry->cy_valuestring) + 1, 1);
 		if (!nids[num]) {
 			rc = LUSTRE_CFG_RC_OUT_OF_MEM;
@@ -2793,7 +3216,7 @@ static int handle_yaml_config_peer(struct cYAML *tree, struct cYAML **show_rc,
 	int num, rc;
 	struct cYAML *seq_no, *prim_nid, *non_mr;
 
-	num = yaml_copy_peer_nids(tree, &nids);
+	num = yaml_copy_peer_nids(tree, &nids, false);
 	if (num < 0)
 		return num;
 
@@ -2818,7 +3241,7 @@ static int handle_yaml_del_peer(struct cYAML *tree, struct cYAML **show_rc,
 	int num, rc;
 	struct cYAML *seq_no, *prim_nid;
 
-	num = yaml_copy_peer_nids(tree, &nids);
+	num = yaml_copy_peer_nids(tree, &nids, true);
 	if (num < 0)
 		return num;
 
@@ -2984,39 +3407,98 @@ 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)
+static int handle_yaml_config_global_settings(struct cYAML *tree,
+					      struct cYAML **show_rc,
+					      struct cYAML **err_rc)
 {
-	struct cYAML *seq_no, *range;
+	struct cYAML *max_intf, *numa, *discovery, *seq_no;
+	int rc = 0;
 
 	seq_no = cYAML_get_object_item(tree, "seq_no");
-	range = cYAML_get_object_item(tree, "range");
+	max_intf = cYAML_get_object_item(tree, "max_intf");
+	if (max_intf)
+		rc = lustre_lnet_config_max_intf(max_intf->cy_valueint,
+						 seq_no ? seq_no->cy_valueint
+							: -1,
+						 err_rc);
+
+	numa = cYAML_get_object_item(tree, "numa_range");
+	if (numa)
+		rc = lustre_lnet_config_numa_range(numa->cy_valueint,
+						   seq_no ? seq_no->cy_valueint
+							: -1,
+						   err_rc);
+
+	discovery = cYAML_get_object_item(tree, "discovery");
+	if (discovery)
+		rc = lustre_lnet_config_discovery(discovery->cy_valueint,
+						  seq_no ? seq_no->cy_valueint
+							: -1,
+						  err_rc);
 
-	return lustre_lnet_config_numa_range(range ? range->cy_valueint : -1,
-					     seq_no ? seq_no->cy_valueint : -1,
-					     err_rc);
+	return rc;
 }
 
-static int handle_yaml_del_numa(struct cYAML *tree, struct cYAML **show_rc,
-			       struct cYAML **err_rc)
+static int handle_yaml_del_global_settings(struct cYAML *tree,
+					   struct cYAML **show_rc,
+					   struct cYAML **err_rc)
 {
-	struct cYAML *seq_no;
+	struct cYAML *max_intf, *numa, *discovery, *seq_no;
+	int rc = 0;
 
 	seq_no = cYAML_get_object_item(tree, "seq_no");
+	max_intf = cYAML_get_object_item(tree, "max_intf");
+	if (max_intf)
+		rc = lustre_lnet_config_max_intf(LNET_INTERFACES_MAX_DEFAULT,
+						 seq_no ? seq_no->cy_valueint
+							: -1,
+						 err_rc);
+
+	numa = cYAML_get_object_item(tree, "numa_range");
+	if (numa)
+		rc = lustre_lnet_config_numa_range(0,
+						   seq_no ? seq_no->cy_valueint
+							: -1,
+						   err_rc);
+
+	/* peer discovery is enabled by default */
+	discovery = cYAML_get_object_item(tree, "discovery");
+	if (discovery)
+		rc = lustre_lnet_config_discovery(1,
+						  seq_no ? seq_no->cy_valueint
+							: -1,
+						  err_rc);
 
-	return lustre_lnet_config_numa_range(0, seq_no ? seq_no->cy_valueint : -1,
-					     err_rc);
+	return rc;
 }
 
-static int handle_yaml_show_numa(struct cYAML *tree, struct cYAML **show_rc,
-				struct cYAML **err_rc)
+static int handle_yaml_show_global_settings(struct cYAML *tree,
+					    struct cYAML **show_rc,
+					    struct cYAML **err_rc)
 {
-	struct cYAML *seq_no;
+	struct cYAML *max_intf, *numa, *discovery, *seq_no;
+	int rc = 0;
 
 	seq_no = cYAML_get_object_item(tree, "seq_no");
+	max_intf = cYAML_get_object_item(tree, "max_intf");
+	if (max_intf)
+		rc = lustre_lnet_show_max_intf(seq_no ? seq_no->cy_valueint
+							: -1,
+						show_rc, err_rc);
+
+	numa = cYAML_get_object_item(tree, "numa_range");
+	if (numa)
+		rc = lustre_lnet_show_numa_range(seq_no ? seq_no->cy_valueint
+							: -1,
+						 show_rc, err_rc);
+
+	discovery = cYAML_get_object_item(tree, "discovery");
+	if (discovery)
+		rc = lustre_lnet_show_discovery(seq_no ? seq_no->cy_valueint
+							: -1,
+						show_rc, err_rc);
 
-	return lustre_lnet_show_numa_range(seq_no ? seq_no->cy_valueint : -1,
-					   show_rc, err_rc);
+	return rc;
 }
 
 struct lookup_cmd_hdlr_tbl {
@@ -3031,7 +3513,7 @@ static struct lookup_cmd_hdlr_tbl lookup_config_tbl[] = {
 	{ .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 = "global",	.cb = handle_yaml_config_global_settings},
 	{ .name = NULL } };
 
 static struct lookup_cmd_hdlr_tbl lookup_del_tbl[] = {
@@ -3039,7 +3521,7 @@ static struct lookup_cmd_hdlr_tbl lookup_del_tbl[] = {
 	{ .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 = "global",	.cb = handle_yaml_del_global_settings},
 	{ .name = NULL } };
 
 static struct lookup_cmd_hdlr_tbl lookup_show_tbl[] = {
@@ -3049,7 +3531,7 @@ static struct lookup_cmd_hdlr_tbl lookup_show_tbl[] = {
 	{ .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 = "global",	.cb = handle_yaml_show_global_settings},
 	{ .name = NULL } };
 
 static cmd_handler_t lookup_fn(char *key,
@@ -3131,46 +3613,3 @@ int lustre_yaml_show(char *f, struct cYAML **show_rc, struct cYAML **err_rc)
 				     show_rc, err_rc);
 }
 
-int lustre_lnet_send_dbg_task(enum lnet_dbg_task dbg_task,
-			      struct lnet_dbg_task_info *dbg_info,
-			      struct cYAML **show_rc,
-			      struct cYAML **err_rc)
-{
-	struct lnet_ioctl_dbg *dbg;
-	struct lnet_dbg_task_info *info;
-	int rc = LUSTRE_CFG_RC_NO_ERR;
-	char err_str[LNET_MAX_STR_LEN];
-
-	snprintf(err_str, sizeof(err_str), "\"success\"");
-
-	dbg = calloc(1, sizeof(*dbg) + sizeof(*info));
-	if (!dbg) {
-		snprintf(err_str, sizeof(err_str), "\"out of memory\"");
-		rc = LUSTRE_CFG_RC_OUT_OF_MEM;
-		goto out;
-	}
-
-	info = (struct lnet_dbg_task_info *)dbg->dbg_bulk;
-
-	LIBCFS_IOC_INIT_V2(*dbg, dbg_hdr);
-
-	dbg->dbg_task = dbg_task;
-	if (dbg_info)
-		memcpy(info, dbg_info, sizeof(*info));
-
-	rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DBG, dbg);
-	if (rc != 0) {
-		rc = -errno;
-		snprintf(err_str,
-			 sizeof(err_str),
-			 "\"debug task failed %s\"", strerror(errno));
-		goto out;
-	}
-
-out:
-	cYAML_build_error(rc, -1, DBG_CMD,
-			 "debug", err_str, err_rc);
-
-	return rc;
-}
-