X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flnetconfig%2Fliblnetconfig.c;h=969143b2f6f807a1ddfcc005d39eed04dab73c93;hb=e446c1667dc9136e3a1cb3603c3851975b68e0ac;hp=bafd6b7972c65edb34c88cfc689b9dc85cdb34e2;hpb=9ff3b408aee72b97ebff9dc04becb14f1e6887b2;p=fs%2Flustre-release.git

diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c
index bafd6b7..969143b 100644
--- a/lnet/utils/lnetconfig/liblnetconfig.c
+++ b/lnet/utils/lnetconfig/liblnetconfig.c
@@ -40,17 +40,17 @@
 #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"
 
 #define CONFIG_CMD		"configure"
 #define UNCONFIG_CMD		"unconfigure"
@@ -58,6 +58,12 @@
 #define DEL_CMD			"del"
 #define SHOW_CMD		"show"
 #define DBG_CMD			"dbg"
+#define MANAGE_CMD              "manage"
+
+#define modparam_path "/sys/module/lnet/parameters/"
+
+const char *gmsg_stat_names[] = {"sent_stats", "received_stats",
+				 "dropped_stats"};
 
 /*
  * lustre_lnet_ip_range_descr
@@ -78,6 +84,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.
@@ -177,6 +239,7 @@ int lustre_lnet_add_intf_descr(struct list_head *list, char *intf, int len)
 void lustre_lnet_init_nw_descr(struct lnet_dlc_network_descr *nw_descr)
 {
 	if (nw_descr != NULL) {
+		nw_descr->nw_id = 0;
 		INIT_LIST_HEAD(&nw_descr->network_on_rule);
 		INIT_LIST_HEAD(&nw_descr->nw_intflist);
 	}
@@ -333,8 +396,7 @@ failed:
 
 int lustre_lnet_config_lib_init(void)
 {
-	return register_ioc_dev(LNET_DEV_ID, LNET_DEV_PATH,
-				LNET_DEV_MAJOR, LNET_DEV_MINOR);
+	return register_ioc_dev(LNET_DEV_ID, LNET_DEV_PATH);
 }
 
 void lustre_lnet_config_lib_uninit(void)
@@ -381,7 +443,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;
 	}
@@ -406,13 +468,13 @@ static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids,
 	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);
@@ -427,23 +489,215 @@ 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, int num_nids,
+static int infra_ping_nid(char *ping_nids, char *oper, int param, int ioc_call,
+			  int seq_no, struct cYAML **show_rc,
+			  struct cYAML **err_rc)
+{
+	void *data = NULL;
+	struct lnet_ioctl_ping_data ping;
+	struct cYAML *root = NULL, *ping_node = NULL, *item = NULL,
+		     *first_seq = NULL,	*tmp = NULL, *peer_ni = NULL;
+	lnet_process_id_t id;
+	char err_str[LNET_MAX_STR_LEN] = {0};
+	char *sep, *token, *end;
+	char buf[6];
+	size_t len;
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	int i;
+	bool flag = false;
+
+	len = (sizeof(lnet_process_id_t) * LNET_INTERFACES_MAX_DEFAULT);
+
+	data = calloc(1, len);
+	if (data == NULL)
+		goto out;
+
+	/* create struct cYAML root object */
+	root = cYAML_create_object(NULL, NULL);
+	if (root == NULL)
+		goto out;
+
+	ping_node = cYAML_create_seq(root, oper);
+	if (ping_node == NULL)
+		goto out;
+
+	/* tokenise each nid in string ping_nids */
+	token = strtok(ping_nids, ",");
+
+	do {
+		item = cYAML_create_seq_item(ping_node);
+		if (item == NULL)
+			goto out;
+
+		if (first_seq == NULL)
+			first_seq = item;
+
+		/* check if '-' is a part of NID, token */
+		sep = strchr(token, '-');
+		if (sep == NULL) {
+			id.pid = LNET_PID_ANY;
+			/* if no net is specified, libcfs_str2nid() will assume tcp */
+			id.nid = libcfs_str2nid(token);
+			if (id.nid == LNET_NID_ANY) {
+				snprintf(err_str, sizeof(err_str),
+					 "\"cannot parse NID '%s'\"",
+					 token);
+				rc = LUSTRE_CFG_RC_BAD_PARAM;
+				cYAML_build_error(rc, seq_no, MANAGE_CMD,
+						  oper, err_str, err_rc);
+				continue;
+			}
+		} else {
+			if (token[0] == 'u' || token[0] == 'U')
+				id.pid = (strtoul(&token[1], &end, 0) |
+					  (LNET_PID_USERFLAG));
+			else
+				id.pid = strtoul(token, &end, 0);
+
+			/* assuming '-' is part of hostname */
+			if (end != sep) {
+				id.pid = LNET_PID_ANY;
+				id.nid = libcfs_str2nid(token);
+				if (id.nid == LNET_NID_ANY) {
+					snprintf(err_str, sizeof(err_str),
+						 "\"cannot parse NID '%s'\"",
+						 token);
+					rc = LUSTRE_CFG_RC_BAD_PARAM;
+					cYAML_build_error(rc, seq_no, MANAGE_CMD,
+							  oper, err_str,
+							  err_rc);
+					continue;
+				}
+			} else {
+				id.nid = libcfs_str2nid(sep + 1);
+				if (id.nid == LNET_NID_ANY) {
+					snprintf(err_str, sizeof(err_str),
+						 "\"cannot parse NID '%s'\"",
+						 token);
+					rc = LUSTRE_CFG_RC_BAD_PARAM;
+					cYAML_build_error(rc, seq_no, MANAGE_CMD,
+							  oper, err_str,
+							  err_rc);
+					continue;
+				}
+			}
+		}
+		LIBCFS_IOC_INIT_V2(ping, ping_hdr);
+		ping.ping_hdr.ioc_len = sizeof(ping);
+		ping.ping_id          = id;
+		ping.op_param         = param;
+		ping.ping_count       = LNET_INTERFACES_MAX_DEFAULT;
+		ping.ping_buf         = data;
+
+		rc = l_ioctl(LNET_DEV_ID, ioc_call, &ping);
+		if (rc != 0) {
+			snprintf(err_str,
+				 sizeof(err_str), "failed to %s %s: %s\n", oper,
+				 id.pid == LNET_PID_ANY ?
+				 libcfs_nid2str(id.nid) :
+				 libcfs_id2str(id), strerror(errno));
+			rc = LUSTRE_CFG_RC_BAD_PARAM;
+			cYAML_build_error(rc, seq_no, MANAGE_CMD,
+					  oper, err_str, err_rc);
+			continue;
+		}
+
+		if (cYAML_create_string(item, "primary nid",
+					libcfs_nid2str(ping.ping_id.nid)) == NULL)
+			goto out;
+
+		if (cYAML_create_string(item, "Multi-Rail", ping.mr_info ?
+					"True" : "False") == NULL)
+			goto out;
+
+		tmp = cYAML_create_seq(item, "peer ni");
+		if (tmp == NULL)
+			goto out;
+
+		for (i = 0; i < ping.ping_count; i++) {
+			if (!strcmp(libcfs_nid2str(ping.ping_buf[i].nid),
+				    "0@lo"))
+				continue;
+			peer_ni = cYAML_create_seq_item(tmp);
+			if (peer_ni == NULL)
+				goto out;
+			memset(buf, 0, sizeof buf);
+			snprintf(buf, sizeof buf, "nid");
+			if (cYAML_create_string(peer_ni, buf,
+						libcfs_nid2str(ping.ping_buf[i].nid)) == NULL)
+				goto out;
+		}
+
+		flag = true;
+
+	} while ((token = strtok(NULL, ",")) != NULL);
+
+	if (flag)
+		rc = LUSTRE_CFG_RC_NO_ERR;
+
+out:
+	if (data)
+		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;
+		show_node = cYAML_get_object_item(*show_rc, oper);
+		if (show_node != NULL && cYAML_is_sequence(show_node)) {
+			cYAML_insert_child(show_node, first_seq);
+			free(ping_node);
+			free(root);
+		} else if (show_node == NULL) {
+			cYAML_insert_sibling((*show_rc)->cy_child,
+					     ping_node);
+			free(root);
+		} else {
+			cYAML_free_tree(root);
+		}
+	} else {
+		*show_rc = root;
+	}
+
+	return rc;
+}
+
+int lustre_lnet_ping_nid(char *ping_nids, int timeout, int seq_no,
+			 struct cYAML **show_rc, struct cYAML **err_rc)
+{
+	int rc;
+
+	rc = infra_ping_nid(ping_nids, "ping", timeout, IOC_LIBCFS_PING_PEER,
+			    seq_no, show_rc, err_rc);
+	return rc;
+}
+
+int lustre_lnet_discover_nid(char *ping_nids, int force, int seq_no,
+			 struct cYAML **show_rc, struct cYAML **err_rc)
+{
+	int rc;
+
+	rc = infra_ping_nid(ping_nids, "discover", force, IOC_LIBCFS_DISCOVER,
+			    seq_no, show_rc, err_rc);
+	return 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, num_nids, err_str);
 
-	if (knid) {
-		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;
 		}
@@ -453,7 +707,7 @@ int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids,
 		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\"");
@@ -462,17 +716,17 @@ int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids,
 	data.prcfg_mr = mr;
 
 	/*
-	 * if key_nid is not specified use the first nid in the list of
-	 * nids provided as the key_nid. NOTE: on entering 'if' we must
+	 * 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 (key_nid == LNET_NID_ANY) {
+	if (prim_nid == LNET_NID_ANY) {
 		nid0_used = true;
-		key_nid = nids[0];
+		prim_nid = nids[0];
 	}
 
-	/* Create the key_nid first */
-	rc = dispatch_peer_ni_cmd(key_nid, 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");
 
@@ -482,12 +736,12 @@ int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids,
 	/* 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");
 
@@ -502,28 +756,28 @@ out:
 	return rc;
 }
 
-int lustre_lnet_del_peer_nid(char *knid, char **nid, int num_nids,
+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, 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;
 		}
 	}
@@ -532,14 +786,14 @@ int lustre_lnet_del_peer_nid(char *knid, char **nid, int num_nids,
 
 	LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
 	if (!nids || nids[0] == LNET_NID_ANY) {
-		rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY,
+		rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
 					  IOC_LIBCFS_DEL_PEER_NI,
 					  &data, err_str, "del");
 		goto out;
 	}
 
 	for (idx = 0; nids && idx < num_nids; idx++) {
-		rc = dispatch_peer_ni_cmd(key_nid, nids[idx],
+		rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
 					  IOC_LIBCFS_DEL_PEER_NI, &data,
 					  err_str, "del");
 
@@ -584,17 +838,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,
@@ -678,17 +921,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,
@@ -745,17 +977,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);
@@ -840,8 +1061,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;
 
@@ -905,7 +1126,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)
@@ -918,9 +1139,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;
 }
 
 /*
@@ -1183,15 +1406,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;
 
@@ -1225,8 +1450,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);
@@ -1235,8 +1459,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++;
 	}
 
@@ -1264,6 +1490,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,
@@ -1275,14 +1506,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);
@@ -1310,10 +1542,11 @@ int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr,
 
 	snprintf(err_str, sizeof(err_str), "\"success\"");
 
-	if (ip2net == NULL && nw_descr == NULL) {
+	if (ip2net == NULL && (nw_descr == NULL || nw_descr->nw_id == 0 ||
+	    list_empty(&nw_descr->nw_intflist))) {
 		snprintf(err_str,
 			 sizeof(err_str),
-			 "\"mandatory parameters not specified.\"");
+			 "\"missing mandatory parameters\"");
 		rc = LUSTRE_CFG_RC_MISSING_PARAM;
 		goto out;
 	}
@@ -1334,6 +1567,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*)
@@ -1376,8 +1613,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,
@@ -1439,12 +1678,10 @@ 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) {
+	if (nw_descr == NULL || nw_descr->nw_id == 0 ||
+	    list_empty(&nw_descr->nw_intflist)) {
 		snprintf(err_str,
 			 sizeof(err_str),
 			 "\"missing mandatory parameter\"");
@@ -1452,6 +1689,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),
@@ -1512,6 +1752,47 @@ out:
 	return rc;
 }
 
+static bool
+add_msg_stats_to_yaml_blk(struct cYAML *yaml,
+			  struct lnet_ioctl_comm_count *counts)
+{
+	if (cYAML_create_number(yaml, "put",
+				counts->ico_put_count)
+					== NULL)
+		return false;
+	if (cYAML_create_number(yaml, "get",
+				counts->ico_get_count)
+					== NULL)
+		return false;
+	if (cYAML_create_number(yaml, "reply",
+				counts->ico_reply_count)
+					== NULL)
+		return false;
+	if (cYAML_create_number(yaml, "ack",
+				counts->ico_ack_count)
+					== NULL)
+		return false;
+	if (cYAML_create_number(yaml, "hello",
+				counts->ico_hello_count)
+					== NULL)
+		return false;
+
+	return true;
+}
+
+static struct lnet_ioctl_comm_count *
+get_counts(struct lnet_ioctl_element_msg_stats *msg_stats, int idx)
+{
+	if (idx == 0)
+		return &msg_stats->im_send_stats;
+	if (idx == 1)
+		return &msg_stats->im_recv_stats;
+	if (idx == 2)
+		return &msg_stats->im_drop_stats;
+
+	return NULL;
+}
+
 int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 			 struct cYAML **show_rc, struct cYAML **err_rc)
 {
@@ -1519,6 +1800,7 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 	struct lnet_ioctl_config_ni *ni_data;
 	struct lnet_ioctl_config_lnd_tunables *lnd;
 	struct lnet_ioctl_element_stats *stats;
+	struct lnet_ioctl_element_msg_stats msg_stats;
 	__u32 net = LNET_NIDNET(LNET_NID_ANY);
 	__u32 prev_net = LNET_NIDNET(LNET_NID_ANY);
 	int rc = LUSTRE_CFG_RC_OUT_OF_MEM, i, j;
@@ -1640,7 +1922,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);
@@ -1655,26 +1937,61 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no,
 
 		if (detail) {
 			char *limit;
+			int k;
 
 			statistics = cYAML_create_object(item, "statistics");
 			if (statistics == NULL)
 				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;
 
+			if (detail < 2)
+				goto continue_without_msg_stats;
+
+			LIBCFS_IOC_INIT_V2(msg_stats, im_hdr);
+			msg_stats.im_hdr.ioc_len = sizeof(msg_stats);
+			msg_stats.im_idx = i;
+
+			rc = l_ioctl(LNET_DEV_ID,
+				     IOC_LIBCFS_GET_LOCAL_NI_MSG_STATS,
+				     &msg_stats);
+			if (rc != 0) {
+				l_errno = errno;
+				goto continue_without_msg_stats;
+			}
+
+			for (k = 0; k < 3; k++) {
+				struct lnet_ioctl_comm_count *counts;
+				struct cYAML *msg_statistics = NULL;
+
+				msg_statistics = cYAML_create_object(item,
+						 (char *)gmsg_stat_names[k]);
+				if (msg_statistics == NULL)
+					goto out;
+
+				counts = get_counts(&msg_stats, k);
+				if (counts == NULL)
+					goto out;
+
+				if (!add_msg_stats_to_yaml_blk(msg_statistics,
+							       counts))
+					goto out;
+			}
+
+continue_without_msg_stats:
 			tunables = cYAML_create_object(item, "tunables");
 			if (!tunables)
 				goto out;
@@ -1794,38 +2111,81 @@ out:
 	return rc;
 }
 
-int lustre_lnet_config_numa_range(int range, int seq_no, struct cYAML **err_rc)
+int ioctl_set_value(__u32 val, int ioc, char *name,
+		    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];
 
 	snprintf(err_str, sizeof(err_str), "\"success\"");
 
-	if (range < 0) {
-		snprintf(err_str,
-			 sizeof(err_str),
-			 "\"range must be >= 0\"");
-		rc = LUSTRE_CFG_RC_OUT_OF_RANGE_PARAM;
-		goto out;
-	}
-
-	LIBCFS_IOC_INIT_V2(data, nr_hdr);
-	data.nr_range = range;
+	LIBCFS_IOC_INIT_V2(data, sv_hdr);
+	data.sv_value = val;
 
-	rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_SET_NUMA_RANGE, &data);
+	rc = l_ioctl(LNET_DEV_ID, ioc , &data);
 	if (rc != 0) {
 		rc = -errno;
 		snprintf(err_str,
 			 sizeof(err_str),
-			 "\"cannot configure buffers: %s\"", strerror(errno));
-		goto out;
+			 "\"cannot configure %s to %d: %s\"", name,
+			 val, strerror(errno));
 	}
 
-out:
-	cYAML_build_error(rc, seq_no, ADD_CMD, "numa_range", err_str, err_rc);
+	cYAML_build_error(rc, seq_no, ADD_CMD, name, err_str, err_rc);
+
+	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)
+{
+	return ioctl_set_value(range, IOC_LIBCFS_SET_NUMA_RANGE,
+			       "numa_range", seq_no, err_rc);
 }
 
 int lustre_lnet_config_buffers(int tiny, int small, int large, int seq_no,
@@ -2022,28 +2382,31 @@ out:
 int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 			  struct cYAML **show_rc, struct cYAML **err_rc)
 {
-	struct lnet_ioctl_peer_cfg *peer_info;
+	/*
+	 * 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;
-	int rc = LUSTRE_CFG_RC_OUT_OF_MEM, ncpt = 0, i = 0, j = 0;
+	struct lnet_ioctl_element_msg_stats *msg_stats;
+	lnet_nid_t *nidp;
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	int i, j, k;
 	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;
+		     *first_seq = NULL, *peer_root = NULL, *tmp = NULL,
+		     *msg_statistics = NULL, *statistics = 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)
@@ -2053,68 +2416,132 @@ 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);
-
-	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;
-
-			rc = l_ioctl(LNET_DEV_ID,
-				     IOC_LIBCFS_GET_PEER_NI, peer_info);
-			if (rc != 0) {
-				l_errno = errno;
+	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;
+			}
+		}
+	}
 
-			if (primary_nid != LNET_NID_ANY &&
-			    primary_nid != peer_info->prcfg_key_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));
+	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;
 
-			peer = cYAML_create_seq_item(peer_root);
-			if (peer == NULL)
+			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;
-
-			if (peer_info->prcfg_key_nid != prev_primary_nid) {
-				prev_primary_nid = peer_info->prcfg_key_nid;
-				new_peer = true;
 			}
-
-			if (new_peer) {
-				lnet_nid_t pnid = peer_info->prcfg_key_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;
+			free(data);
+			size = peer_info.prcfg_size;
+			data = malloc(size);
+			if (data == NULL) {
+				l_errno = ENOMEM;
+				goto out;
 			}
+		}
 
-			if (first_seq == NULL)
-				first_seq = peer;
+		peer = cYAML_create_seq_item(peer_root);
+		if (peer == NULL)
+			goto out;
+
+		if (first_seq == NULL)
+			first_seq = 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;
+		/*
+		 * print out the state of the peer only if details are
+		 * requested
+		 */
+		if (detail >= 3) {
+			if (cYAML_create_number(peer, "peer state",
+						peer_info.prcfg_state)
+				== NULL)
+				goto out;
+		}
+
+		tmp = cYAML_create_seq(peer, "peer ni");
+		if (tmp == NULL)
+			goto out;
+
+		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);
+			msg_stats = (void *)lpni_stats + sizeof(*lpni_stats);
+			lpni_data = (void *)msg_stats + sizeof(*msg_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;
 
@@ -2156,37 +2583,162 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
 			    == NULL)
 				goto out;
 
-			if (cYAML_create_number(peer_ni, "send_count",
-						lpni_stats->send_count)
-			    == NULL)
+			if (cYAML_create_number(peer_ni, "refcount",
+						lpni_cri->cr_refcount) == NULL)
+				goto out;
+
+			statistics = cYAML_create_object(peer_ni, "statistics");
+			if (statistics == NULL)
 				goto out;
 
-			if (cYAML_create_number(peer_ni, "recv_count",
-						lpni_stats->recv_count)
+			if (cYAML_create_number(statistics, "send_count",
+						lpni_stats->iel_send_count)
 			    == NULL)
 				goto out;
 
-			if (cYAML_create_number(peer_ni, "drop_count",
-						lpni_stats->drop_count)
+			if (cYAML_create_number(statistics, "recv_count",
+						lpni_stats->iel_recv_count)
 			    == NULL)
 				goto out;
 
-			if (cYAML_create_number(peer_ni, "refcount",
-						lpni_cri->cr_refcount) == NULL)
+			if (cYAML_create_number(statistics, "drop_count",
+						lpni_stats->iel_drop_count)
+			    == NULL)
 				goto out;
+
+			if (detail < 2)
+				continue;
+
+			for (k = 0; k < 3; k++) {
+				struct lnet_ioctl_comm_count *counts;
+
+				msg_statistics = cYAML_create_object(peer_ni,
+						 (char *) gmsg_stat_names[k]);
+				if (msg_statistics == NULL)
+					goto out;
+
+				counts = get_counts(msg_stats, k);
+				if (counts == NULL)
+					goto out;
+
+				if (!add_msg_stats_to_yaml_blk(msg_statistics,
+							       counts))
+					goto out;
+			}
+
 		}
+	}
+
+	/* print output iff show_rc is not provided */
+	if (show_rc == NULL)
+		cYAML_print_tree(root);
 
-		if (l_errno != ENOENT) {
+	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\"");
+
+	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)
@@ -2196,6 +2748,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) {
@@ -2207,11 +2761,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);
@@ -2226,27 +2780,31 @@ out:
 	return rc;
 }
 
-int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc,
-				struct cYAML **err_rc)
+static void add_to_global(struct cYAML *show_rc, struct cYAML *node,
+			  struct cYAML *root)
 {
-	struct lnet_ioctl_numa_range data;
-	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
-	int l_errno;
-	char err_str[LNET_MAX_STR_LEN];
-	struct cYAML *root = NULL, *range = NULL;
-
-	snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+	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);
+}
 
-	LIBCFS_IOC_INIT_V2(data, nr_hdr);
+static int build_global_yaml_entry(char *err_str, int err_len, int seq_no,
+				   char *name, __u32 value,
+				   struct cYAML **show_rc,
+				   struct cYAML **err_rc, int err)
+{
+	int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+	struct cYAML *root = NULL, *global = NULL;
 
-	rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_NUMA_RANGE, &data);
-	if (rc != 0) {
-		l_errno = errno;
-		snprintf(err_str,
-			 sizeof(err_str),
-			 "\"cannot get numa range: %s\"",
-			 strerror(l_errno));
-		rc = -l_errno;
+	if (err) {
+		rc = err;
 		goto out;
 	}
 
@@ -2254,39 +2812,128 @@ int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc,
 	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, name,
+				value) == NULL)
 		goto out;
 
 	if (show_rc == NULL)
 		cYAML_print_tree(root);
 
-	snprintf(err_str, sizeof(err_str), "\"success\"");
+	snprintf(err_str, err_len, "\"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;
 }
 
+static int ioctl_show_global_values(int ioc, int seq_no, char *name,
+				    struct cYAML **show_rc,
+				    struct cYAML **err_rc)
+{
+	struct lnet_ioctl_set_value data;
+	int rc;
+	int l_errno = 0;
+	char err_str[LNET_MAX_STR_LEN];
+
+	snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+	LIBCFS_IOC_INIT_V2(data, sv_hdr);
+
+	rc = l_ioctl(LNET_DEV_ID, ioc, &data);
+	if (rc != 0) {
+		l_errno = -errno;
+		snprintf(err_str,
+			 sizeof(err_str),
+			 "\"cannot get %s: %s\"",
+			 name, strerror(l_errno));
+	}
+
+	return build_global_yaml_entry(err_str, sizeof(err_str), seq_no, name,
+				       data.sv_value, show_rc, err_rc, l_errno);
+}
+
+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 = -1, l_errno = 0;
+	char err_str[LNET_MAX_STR_LEN];
+
+	snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+	rc = read_sysfs_file(modparam_path, "lnet_interfaces_max", val,
+			     1, sizeof(val));
+	if (rc) {
+		l_errno = -errno;
+		snprintf(err_str, sizeof(err_str),
+			 "\"cannot get max interfaces: %d\"", rc);
+	} else {
+		max_intf = atoi(val);
+	}
+
+	return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+				       "max_intf", max_intf, show_rc,
+				       err_rc, l_errno);
+}
+
+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];
+	int discovery = -1, l_errno = 0;
+	char err_str[LNET_MAX_STR_LEN];
+
+	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) {
+		l_errno = -errno;
+		snprintf(err_str, sizeof(err_str),
+			 "\"cannot get discovery setting: %d\"", rc);
+	} else {
+		/*
+		 * The kernel stores a discovery disabled value. User space
+		 * shows whether discovery is enabled. So the value must be
+		 * inverted.
+		 */
+		discovery = !atoi(val);
+	}
+
+	return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+				       "discovery", discovery, show_rc,
+				       err_rc, l_errno);
+}
+
+int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc,
+				struct cYAML **err_rc)
+{
+	return ioctl_show_global_values(IOC_LIBCFS_GET_NUMA_RANGE, seq_no,
+					"numa_range", show_rc, err_rc);
+}
+
 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;
@@ -2306,6 +2953,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;
@@ -2362,6 +3011,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);
@@ -2568,6 +3218,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
@@ -2768,16 +3420,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)
@@ -2792,8 +3466,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;
@@ -2820,17 +3495,17 @@ 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);
+	num = yaml_copy_peer_nids(tree, &nids, false);
 	if (num < 0)
 		return num;
 
 	seq_no = cYAML_get_object_item(tree, "seq_no");
-	key_nid = cYAML_get_object_item(tree, "primary 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,
+	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,
@@ -2845,16 +3520,16 @@ 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);
+	num = yaml_copy_peer_nids(tree, &nids, true);
 	if (num < 0)
 		return num;
 
 	seq_no = cYAML_get_object_item(tree, "seq_no");
-	key_nid = cYAML_get_object_item(tree, "primary nid");
+	prim_nid = cYAML_get_object_item(tree, "primary nid");
 
-	rc = lustre_lnet_del_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL,
+	rc = lustre_lnet_del_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL,
 				      nids, num,
 				      (seq_no) ? seq_no->cy_valueint : -1,
 				      err_rc);
@@ -2987,16 +3662,16 @@ 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, *detail;
+	struct cYAML *seq_no, *nid, *detail;
 
 	seq_no = cYAML_get_object_item(tree, "seq_no");
 	detail = cYAML_get_object_item(tree, "detail");
-	key_nid = cYAML_get_object_item(tree, "key_nid");
+	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);
@@ -3048,41 +3723,195 @@ static int handle_yaml_show_numa(struct cYAML *tree, struct cYAML **show_rc,
 					   show_rc, err_rc);
 }
 
+static int handle_yaml_config_global_settings(struct cYAML *tree,
+					      struct cYAML **show_rc,
+					      struct cYAML **err_rc)
+{
+	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(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 rc;
+}
+
+static int handle_yaml_del_global_settings(struct cYAML *tree,
+					   struct cYAML **show_rc,
+					   struct cYAML **err_rc)
+{
+	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 rc;
+}
+
+static int handle_yaml_show_global_settings(struct cYAML *tree,
+					    struct cYAML **show_rc,
+					    struct cYAML **err_rc)
+{
+	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 rc;
+}
+
+static int handle_yaml_ping(struct cYAML *tree, struct cYAML **show_rc,
+			    struct cYAML **err_rc)
+{
+	struct cYAML *seq_no, *nid, *timeout;
+
+	seq_no = cYAML_get_object_item(tree, "seq_no");
+	nid = cYAML_get_object_item(tree, "primary nid");
+	timeout = cYAML_get_object_item(tree, "timeout");
+
+	return lustre_lnet_ping_nid((nid) ? nid->cy_valuestring : NULL,
+				    (timeout) ? timeout->cy_valueint : 1000,
+				    (seq_no) ? seq_no->cy_valueint : -1,
+				    show_rc, err_rc);
+}
+
+static int handle_yaml_discover(struct cYAML *tree, struct cYAML **show_rc,
+				struct cYAML **err_rc)
+{
+	struct cYAML *seq_no, *nid, *force;
+
+	seq_no = cYAML_get_object_item(tree, "seq_no");
+	nid = cYAML_get_object_item(tree, "primary nid");
+	force = cYAML_get_object_item(tree, "force");
+
+	return lustre_lnet_discover_nid((nid) ? nid->cy_valuestring : NULL,
+					(force) ? force->cy_valueint : 0,
+					(seq_no) ? seq_no->cy_valueint : -1,
+					show_rc, err_rc);
+}
+
+static int handle_yaml_no_op()
+{
+	return LUSTRE_CFG_RC_NO_ERR;
+}
+
 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},
-	{"numa", handle_yaml_config_numa},
-	{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 = "statistics", .cb = handle_yaml_no_op },
+	{ .name = "global",	.cb = handle_yaml_config_global_settings},
+	{ .name = "numa",	.cb = handle_yaml_config_numa },
+	{ .name = "ping",	.cb = handle_yaml_no_op },
+	{ .name = "discover",	.cb = handle_yaml_no_op },
+	{ .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},
-	{"numa", handle_yaml_del_numa},
-	{NULL, NULL}
-};
+	{ .name = "route",	.cb = handle_yaml_del_route },
+	{ .name = "net",	.cb = handle_yaml_del_ni },
+	{ .name = "ip2nets",	.cb = handle_yaml_no_op },
+	{ .name = "peer",	.cb = handle_yaml_del_peer },
+	{ .name = "routing",	.cb = handle_yaml_del_routing },
+	{ .name = "buffers",	.cb = handle_yaml_no_op },
+	{ .name = "statistics", .cb = handle_yaml_no_op },
+	{ .name = "global",	.cb = handle_yaml_del_global_settings},
+	{ .name = "numa",	.cb = handle_yaml_del_numa },
+	{ .name = "ping",	.cb = handle_yaml_no_op },
+	{ .name = "discover",	.cb = handle_yaml_no_op },
+	{ .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},
-	{"numa", handle_yaml_show_numa},
-	{NULL, NULL}
-};
+	{ .name = "route",	.cb = handle_yaml_show_route },
+	{ .name = "net",	.cb = handle_yaml_show_net },
+	{ .name = "peer",	.cb = handle_yaml_show_peers },
+	{ .name = "ip2nets",	.cb = handle_yaml_no_op },
+	{ .name = "routing",	.cb = handle_yaml_show_routing },
+	{ .name = "buffers",	.cb = handle_yaml_show_routing },
+	{ .name = "statistics",	.cb = handle_yaml_show_stats },
+	{ .name = "global",	.cb = handle_yaml_show_global_settings},
+	{ .name = "numa",	.cb = handle_yaml_show_numa },
+	{ .name = "ping",	.cb = handle_yaml_no_op },
+	{ .name = "discover",	.cb = handle_yaml_no_op },
+	{ .name = NULL } };
+
+static struct lookup_cmd_hdlr_tbl lookup_exec_tbl[] = {
+	{ .name = "route",	.cb = handle_yaml_no_op },
+	{ .name = "net",	.cb = handle_yaml_no_op },
+	{ .name = "peer",	.cb = handle_yaml_no_op },
+	{ .name = "ip2nets",	.cb = handle_yaml_no_op },
+	{ .name = "routing",	.cb = handle_yaml_no_op },
+	{ .name = "buffers",	.cb = handle_yaml_no_op },
+	{ .name = "statistics",	.cb = handle_yaml_no_op },
+	{ .name = "global",	.cb = handle_yaml_no_op },
+	{ .name = "numa",	.cb = handle_yaml_no_op },
+	{ .name = "ping",	.cb = handle_yaml_ping },
+	{ .name = "discover",	.cb = handle_yaml_discover },
+	{ .name = NULL } };
 
 static cmd_handler_t lookup_fn(char *key,
 			       struct lookup_cmd_hdlr_tbl *tbl)
@@ -3163,46 +3992,8 @@ 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)
+int lustre_yaml_exec(char *f, 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;
+	return lustre_yaml_cb_helper(f, lookup_exec_tbl,
+				     show_rc, err_rc);
 }
-