#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 <libcfs/libcfs_string.h>
#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
#include <ifaddrs.h>
#include "liblnetconfig.h"
#include "cyaml.h"
#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
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.
+ */
+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:
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;
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;
}
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);
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;
}
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\"");
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");
/* 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");
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;
}
}
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");
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,
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,
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);
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;
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)
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;
}
/*
{
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;
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));
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;
}
/*
* 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;
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);
}
}
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*)
- (data + sizeof(*conf));
+ conf->lic_bulk;
LIBCFS_IOC_INIT_V2(*conf, lic_cfg_hdr);
conf->lic_cfg_hdr.ioc_len = len;
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);
snprintf(err_str,
LNET_MAX_STR_LEN,
"\"cannot add network: %s\"", strerror(errno));
+ free(data);
return rc;
}
+ free(data);
i++;
}
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\"");
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,
goto out;
}
+ if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+ snprintf(err_str, sizeof(err_str),
+ "\"no interfaces match ip2nets rules\"");
+ 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);
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*)
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,
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);
}
}
__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) {
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),
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:
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)
{
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;
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);
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;
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_buffers(int tiny, int small, int large, int seq_no,
- struct cYAML **err_rc)
+int lustre_lnet_config_max_intf(int max, int seq_no, struct cYAML **err_rc)
{
- struct lnet_ioctl_config_data data;
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\"");
- /* -1 indicates to ignore changes to this field */
- if (tiny < -1 || small < -1 || large < -1) {
- snprintf(err_str,
- sizeof(err_str),
- "\"tiny, small and large must be >= 0\"");
- rc = LUSTRE_CFG_RC_OUT_OF_RANGE_PARAM;
- goto out;
- }
+ snprintf(val, sizeof(val), "%d", max);
- LIBCFS_IOC_INIT_V2(data, cfg_hdr);
- data.cfg_config_u.cfg_buffers.buf_tiny = tiny;
- data.cfg_config_u.cfg_buffers.buf_small = small;
- data.cfg_config_u.cfg_buffers.buf_large = large;
+ 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));
- rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_BUF, &data);
- if (rc != 0) {
- rc = -errno;
- snprintf(err_str,
- sizeof(err_str),
- "\"cannot configure buffers: %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,
+ struct cYAML **err_rc)
+{
+ struct lnet_ioctl_config_data data;
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ /* -1 indicates to ignore changes to this field */
+ if (tiny < -1 || small < -1 || large < -1) {
+ snprintf(err_str,
+ sizeof(err_str),
+ "\"tiny, small and large must be >= 0\"");
+ rc = LUSTRE_CFG_RC_OUT_OF_RANGE_PARAM;
+ goto out;
+ }
+
+ LIBCFS_IOC_INIT_V2(data, cfg_hdr);
+ data.cfg_config_u.cfg_buffers.buf_tiny = tiny;
+ data.cfg_config_u.cfg_buffers.buf_small = small;
+ data.cfg_config_u.cfg_buffers.buf_large = large;
+
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_BUF, &data);
+ if (rc != 0) {
+ rc = -errno;
+ snprintf(err_str,
+ sizeof(err_str),
+ "\"cannot configure buffers: %s\"", strerror(errno));
goto 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)
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_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));
+ 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_key_nid != prev_primary_nid) {
- prev_primary_nid = peer_info->prcfg_key_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_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;
- }
+ 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);
+ 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;
== 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)
== NULL)
goto out;
- if (cYAML_create_number(peer_ni, "tx_q_num_of_buf",
- lpni_cri->cr_peer_tx_qnob)
- == NULL)
+ if (cYAML_create_number(peer_ni, "refcount",
+ lpni_cri->cr_refcount) == NULL)
goto out;
- if (cYAML_create_number(peer_ni, "send_count",
- lpni_stats->send_count)
- == NULL)
+ 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);
+
+ 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;
+ }
- if (l_errno != ENOENT) {
+ 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)
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) {
"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);
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;
}
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;
goto out;
}
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
goto out;
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);
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;
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) {
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;
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;
{
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;
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
}
}
- 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,
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;
}
}
- 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);
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);
}
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)
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;
{
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,
{
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);
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);
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 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 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,
+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;
+ 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_show_numa_range(seq_no ? seq_no->cy_valueint : -1,
- show_rc, err_rc);
+ 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 {
};
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 = "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 = "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 = "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 = "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)
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);
}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff