X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lnet%2Futils%2Flnetconfig%2Fliblnetconfig.c;h=42c0181dd45ad9d77f3fc0e036e2e1890d90d3bf;hb=60fc3c74757025f03ddd4b8e322716811ae97d3c;hp=6aaa1a0516b6a643bf6267abea771a4e68e5cff3;hpb=ce8735993473c1055038f7422350c96b092d707d;p=fs%2Flustre-release.git diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c index 6aaa1a0..42c0181 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.c +++ b/lnet/utils/lnetconfig/liblnetconfig.c @@ -18,7 +18,7 @@ * * LGPL HEADER END * - * Copyright (c) 2014, 2016, Intel Corporation. + * Copyright (c) 2014, 2017, Intel Corporation. * * Author: * Amir Shehata @@ -40,17 +40,17 @@ #include #include #include +#include #include #include #include -#include -#include +#include #include "liblnd.h" -#include #include +#include +#include #include #include "liblnetconfig.h" -#include "cyaml.h" #define CONFIG_CMD "configure" #define UNCONFIG_CMD "unconfigure" @@ -58,6 +58,15 @@ #define DEL_CMD "del" #define SHOW_CMD "show" #define DBG_CMD "dbg" +#define MANAGE_CMD "manage" + +#define MAX_NUM_IPS 128 + +#define modparam_path "/sys/module/lnet/parameters/" +#define gni_nid_path "/proc/cray_xt/" + +const char *gmsg_stat_names[] = {"sent_stats", "received_stats", + "dropped_stats"}; /* * lustre_lnet_ip_range_descr @@ -78,6 +87,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,11 +242,26 @@ 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); } } +static char *get_next_delimiter_in_nid(char *str, char sep) +{ + char *at, *comma; + + /* first find the '@' */ + at = strchr(str, '@'); + if (!at) + return str; + + /* now that you found the at find the sep after */ + comma = strchr(at, sep); + return comma; +} + int lustre_lnet_parse_nids(char *nids, char **array, int size, char ***out_array) { @@ -193,9 +273,9 @@ int lustre_lnet_parse_nids(char *nids, char **array, int size, if (nids == NULL || strlen(nids) == 0) return size; - /* count the number or new nids, by counting the number of commas */ + /* count the number or new nids, by counting the number of comma*/ while (comma) { - comma = strchr(comma, ','); + comma = get_next_delimiter_in_nid(comma, ','); if (comma) { comma++; num_nids++; @@ -220,7 +300,7 @@ int lustre_lnet_parse_nids(char *nids, char **array, int size, start = (size > 0) ? size: 0; finish = (size > 0) ? size + num_nids : num_nids; for (i = start; i < finish; i++) { - comma = strchr(comma, ','); + comma = get_next_delimiter_in_nid(comma, ','); if (!comma) /* * the length of the string to be parsed out is @@ -333,8 +413,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) @@ -375,37 +454,6 @@ int lustre_lnet_config_ni_system(bool up, bool load_ni_from_mod, return rc; } -static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids, - char *err_str) -{ - lnet_nid_t *array = NULL; - __u32 i; - - if (!nids) { - snprintf(err_str, LNET_MAX_STR_LEN, "no NIDs to add"); - return NULL; - } - - array = calloc(sizeof(*array) * num_nids, 1); - if (array == NULL) { - snprintf(err_str, LNET_MAX_STR_LEN, "out of memory"); - return NULL; - } - - for (i = 0; i < num_nids; i++) { - array[i] = libcfs_str2nid(nids[i]); - if (array[i] == LNET_NID_ANY) { - free(array); - snprintf(err_str, LNET_MAX_STR_LEN, - "bad NID: '%s'", - nids[i]); - return NULL; - } - } - - return array; -} - 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) @@ -422,104 +470,481 @@ static int dispatch_peer_ni_cmd(lnet_nid_t pnid, lnet_nid_t nid, __u32 cmd, LNET_MAX_STR_LEN, "\"cannot %s peer ni: %s\"", (cmd_str) ? cmd_str : "add", strerror(errno)); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; } return rc; } -int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids, - bool mr, int seq_no, struct cYAML **err_rc) +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) { - struct lnet_ioctl_peer_cfg data; - lnet_nid_t prim_nid = LNET_NID_ANY; - int rc = LUSTRE_CFG_RC_NO_ERR; - int idx = 0; - bool nid0_used = false; + 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; + struct lnet_process_id id; char err_str[LNET_MAX_STR_LEN] = {0}; - lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str); + char *sep, *token, *end; + char buf[6]; + size_t len; + int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + int i; + bool flag = false; - if (pnid) { - prim_nid = libcfs_str2nid(pnid); - if (prim_nid == LNET_NID_ANY) { - snprintf(err_str, sizeof(err_str), - "bad key NID: '%s'", - pnid); - rc = LUSTRE_CFG_RC_MISSING_PARAM; + len = (sizeof(struct lnet_process_id) * 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 if (!nids || nids[0] == LNET_NID_ANY) { - snprintf(err_str, sizeof(err_str), - "no NIDs provided for configuration"); - rc = LUSTRE_CFG_RC_MISSING_PARAM; - goto out; } else { - prim_nid = LNET_NID_ANY; + *show_rc = root; } - snprintf(err_str, sizeof(err_str), "\"Success\""); + 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; +} + +static void lustre_lnet_clean_ip2nets(struct lustre_lnet_ip2nets *ip2nets) +{ + struct lustre_lnet_ip_range_descr *ipr, *tmp; + struct cfs_expr_list *el, *el_tmp; + + list_for_each_entry_safe(ipr, tmp, + &ip2nets->ip2nets_ip_ranges, + ipr_entry) { + list_del(&ipr->ipr_entry); + list_for_each_entry_safe(el, el_tmp, &ipr->ipr_expr, + el_link) { + list_del(&el->el_link); + cfs_expr_list_free(el); + } + free(ipr); + } +} - LIBCFS_IOC_INIT_V2(data, prcfg_hdr); - data.prcfg_mr = mr; +/* + * returns an rc < 0 if there is an error + * otherwise it returns the number IPs generated + * it also has out params: net - network name + */ +static int lnet_expr2ips(char *nidstr, __u32 *ip_list, + struct lustre_lnet_ip2nets *ip2nets, + __u32 *net, char *err_str) +{ + struct lustre_lnet_ip_range_descr *ipr; + char *comp1, *comp2; + int ip_idx = MAX_NUM_IPS - 1; + int ip_range_len, rc = LUSTRE_CFG_RC_NO_ERR; + __u32 net_type; + char ip_range[LNET_MAX_STR_LEN]; + + /* separate the two components of the NID */ + comp1 = nidstr; + comp2 = strchr(nidstr, '@'); + if (comp2 == NULL) { + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot parse NID %s\"", nidstr); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + + /* length of the expected ip-range */ + ip_range_len = comp2 - comp1; + if (ip_range_len >= LNET_MAX_STR_LEN) { + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot parse ip_range '%s'\"", ip_range); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + + /* move beyond '@' */ + comp2++; /* - * 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 the net component is either o2ib or tcp then we expect + * an IP range which could only be a single IP address. + * Parse that. */ - if (prim_nid == LNET_NID_ANY) { - nid0_used = true; - prim_nid = nids[0]; + *net = libcfs_str2net(comp2); + net_type = LNET_NETTYP(*net); + /* expression support is for o2iblnd and socklnd only */ + if (net_type != O2IBLND && net_type != SOCKLND) + return LUSTRE_CFG_RC_SKIP; + + strncpy(ip_range, comp1, ip_range_len); + ip_range[ip_range_len] = '\0'; + ip2nets->ip2nets_net.nw_id = *net; + + rc = lustre_lnet_add_ip_range(&ip2nets->ip2nets_ip_ranges, ip_range); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot parse ip_range '%s'\"", ip_range); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; } - /* Create the prim_nid first */ - rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY, - IOC_LIBCFS_ADD_PEER_NI, - &data, err_str, "add"); + /* + * Generate all the IP Addresses from the parsed range. For sanity + * we allow only a max of MAX_NUM_IPS nids to be configured for + * a single peer. + */ + list_for_each_entry(ipr, &ip2nets->ip2nets_ip_ranges, ipr_entry) + ip_idx = cfs_ip_addr_range_gen(ip_list, MAX_NUM_IPS, + &ipr->ipr_expr); + + if (ip_idx == MAX_NUM_IPS - 1) { + snprintf(err_str, LNET_MAX_STR_LEN, + "no NIDs provided for configuration"); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_NO_MATCH; + goto out; + } else if (ip_idx == -1) { + rc = LUSTRE_CFG_RC_LAST_ELEM; + } else { + rc = ip_idx; + } - if (rc != 0) +out: + return rc; +} + +static int lustre_lnet_handle_peer_ip2nets(char **nid, int num_nids, bool mr, + bool range, __u32 cmd, + char *cmd_type, char *err_str) +{ + __u32 net = LNET_NIDNET(LNET_NID_ANY); + int ip_idx; + int i, j, rc = LUSTRE_CFG_RC_NO_ERR; + __u32 ip_list[MAX_NUM_IPS]; + struct lustre_lnet_ip2nets ip2nets; + struct lnet_ioctl_peer_cfg data; + lnet_nid_t peer_nid; + lnet_nid_t prim_nid = LNET_NID_ANY; + + /* initialize all lists */ + INIT_LIST_HEAD(&ip2nets.ip2nets_ip_ranges); + INIT_LIST_HEAD(&ip2nets.ip2nets_net.network_on_rule); + INIT_LIST_HEAD(&ip2nets.ip2nets_net.nw_intflist); + + /* each nid entry is an expression */ + for (i = 0; i < num_nids; i++) { + if (!range && i == 0) + prim_nid = libcfs_str2nid(nid[0]); + else if (range) + prim_nid = LNET_NID_ANY; + + rc = lnet_expr2ips(nid[i], ip_list, &ip2nets, &net, err_str); + if (rc == LUSTRE_CFG_RC_SKIP) + continue; + else if (rc == LUSTRE_CFG_RC_LAST_ELEM) + rc = -1; + else if (rc < LUSTRE_CFG_RC_NO_ERR) + goto out; + + ip_idx = rc; + + for (j = MAX_NUM_IPS - 1; j > ip_idx; j--) { + peer_nid = LNET_MKNID(net, ip_list[j]); + if (peer_nid == LNET_NID_ANY) { + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot parse NID\""); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + + LIBCFS_IOC_INIT_V2(data, prcfg_hdr); + data.prcfg_mr = mr; + + if (prim_nid == LNET_NID_ANY && j == MAX_NUM_IPS - 1) { + prim_nid = peer_nid; + peer_nid = LNET_NID_ANY; + } + + if (!range && num_nids > 1 && i == 0 && + cmd == IOC_LIBCFS_DEL_PEER_NI) + continue; + else if (!range && i == 0) + peer_nid = LNET_NID_ANY; + + /* + * 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(prim_nid, peer_nid, cmd, + &data, err_str, cmd_type); + if (rc != 0) + goto out; + + /* + * we just deleted the entire peer using the + * primary_nid. So don't bother iterating through + * the rest of the nids + */ + if (prim_nid != LNET_NID_ANY && + peer_nid == LNET_NID_ANY && + cmd == IOC_LIBCFS_DEL_PEER_NI) + goto next_nid; + } +next_nid: + lustre_lnet_clean_ip2nets(&ip2nets); + } + +out: + lustre_lnet_clean_ip2nets(&ip2nets); + return rc; +} + +int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids, + bool mr, bool ip2nets, int seq_no, + struct cYAML **err_rc) +{ + int rc = LUSTRE_CFG_RC_NO_ERR; + char err_str[LNET_MAX_STR_LEN] = {0}; + char **nid_array = NULL; + + snprintf(err_str, sizeof(err_str), "\"Success\""); + + if (ip2nets) { + rc = lustre_lnet_handle_peer_ip2nets(nid, num_nids, mr, + ip2nets, IOC_LIBCFS_ADD_PEER_NI, + ADD_CMD, err_str); goto out; + } - /* add the rest of the nids to the key nid if any are available */ - for (idx = nid0_used ? 1 : 0 ; nids && idx < num_nids; idx++) { - /* - * If 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(prim_nid, nids[idx], - IOC_LIBCFS_ADD_PEER_NI, &data, - err_str, "add"); + if (pnid) { + if (libcfs_str2nid(pnid) == LNET_NID_ANY) { + snprintf(err_str, sizeof(err_str), + "bad primary NID: '%s'", + pnid); + rc = LUSTRE_CFG_RC_MISSING_PARAM; + goto out; + } + + num_nids++; - if (rc != 0) + nid_array = calloc(sizeof(*nid_array), num_nids); + if (!nid_array) { + snprintf(err_str, sizeof(err_str), + "out of memory"); + rc = LUSTRE_CFG_RC_OUT_OF_MEM; goto out; + } + nid_array[0] = pnid; + memcpy(&nid_array[1], nid, sizeof(*nid) * (num_nids - 1)); } + rc = lustre_lnet_handle_peer_ip2nets((pnid) ? nid_array : nid, + num_nids, mr, ip2nets, + IOC_LIBCFS_ADD_PEER_NI, ADD_CMD, + err_str); + if (rc) + goto out; + out: - if (nids != NULL) - free(nids); + if (nid_array) + free(nid_array); + cYAML_build_error(rc, seq_no, ADD_CMD, "peer_ni", err_str, err_rc); return rc; } int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids, - int seq_no, struct cYAML **err_rc) + bool ip2nets, int seq_no, struct cYAML **err_rc) { - struct lnet_ioctl_peer_cfg data; - 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); + char **nid_array = NULL; + + snprintf(err_str, sizeof(err_str), "\"Success\""); + + if (ip2nets) { + rc = lustre_lnet_handle_peer_ip2nets(nid, num_nids, false, + ip2nets, IOC_LIBCFS_DEL_PEER_NI, + DEL_CMD, err_str); + goto out; + } if (pnid == NULL) { snprintf(err_str, sizeof(err_str), "\"Primary nid is not provided\""); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; - } else { - prim_nid = libcfs_str2nid(pnid); - if (prim_nid == LNET_NID_ANY) { + } else if (!ip2nets) { + if (libcfs_str2nid(pnid) == LNET_NID_ANY) { rc = LUSTRE_CFG_RC_BAD_PARAM; snprintf(err_str, sizeof(err_str), "bad key NID: '%s'", @@ -528,28 +953,27 @@ int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids, } } - snprintf(err_str, sizeof(err_str), "\"Success\""); - - LIBCFS_IOC_INIT_V2(data, prcfg_hdr); - if (!nids || nids[0] == LNET_NID_ANY) { - rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY, - IOC_LIBCFS_DEL_PEER_NI, - &data, err_str, "del"); + num_nids++; + nid_array = calloc(sizeof(*nid_array), num_nids); + if (!nid_array) { + snprintf(err_str, sizeof(err_str), + "out of memory"); + rc = LUSTRE_CFG_RC_OUT_OF_MEM; goto out; } + nid_array[0] = pnid; + memcpy(&nid_array[1], nid, sizeof(*nid) * (num_nids - 1)); - for (idx = 0; nids && idx < num_nids; idx++) { - rc = dispatch_peer_ni_cmd(prim_nid, nids[idx], - IOC_LIBCFS_DEL_PEER_NI, &data, - err_str, "del"); - - if (rc != 0) - goto out; - } + rc = lustre_lnet_handle_peer_ip2nets(nid_array, num_nids, false, + ip2nets, IOC_LIBCFS_DEL_PEER_NI, + DEL_CMD, err_str); + if (rc) + goto out; out: - if (nids != NULL) - free(nids); + if (nid_array) + free(nid_array); + cYAML_build_error(rc, seq_no, DEL_CMD, "peer_ni", err_str, err_rc); return rc; } @@ -560,35 +984,35 @@ int lustre_lnet_config_route(char *nw, char *gw, int hops, int prio, struct lnet_ioctl_config_data data; lnet_nid_t gateway_nid; int rc = LUSTRE_CFG_RC_NO_ERR; + int ip_idx, i; + __u32 rnet = LNET_NIDNET(LNET_NID_ANY); __u32 net = LNET_NIDNET(LNET_NID_ANY); char err_str[LNET_MAX_STR_LEN]; + __u32 ip_list[MAX_NUM_IPS]; + struct lustre_lnet_ip2nets ip2nets; + + /* initialize all lists */ + INIT_LIST_HEAD(&ip2nets.ip2nets_ip_ranges); + INIT_LIST_HEAD(&ip2nets.ip2nets_net.network_on_rule); + INIT_LIST_HEAD(&ip2nets.ip2nets_net.nw_intflist); snprintf(err_str, sizeof(err_str), "\"Success\""); if (nw == NULL || gw == NULL) { snprintf(err_str, sizeof(err_str), - "\"missing mandatory parameter(s): '%s'\"", + "\"missing mandatory parameter in route config:'%s'\"", (nw == NULL && gw == NULL) ? "network, gateway" : (nw == NULL) ? "network" : "gateway"); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } - net = libcfs_str2net(nw); - if (net == LNET_NIDNET(LNET_NID_ANY)) { + rnet = libcfs_str2net(nw); + if (rnet == LNET_NIDNET(LNET_NID_ANY)) { snprintf(err_str, sizeof(err_str), - "\"cannot parse net %s\"", nw); - rc = LUSTRE_CFG_RC_BAD_PARAM; - goto out; - } - - gateway_nid = libcfs_str2nid(gw); - if (gateway_nid == LNET_NID_ANY) { - snprintf(err_str, - sizeof(err_str), - "\"cannot parse gateway NID '%s'\"", gw); + "\"cannot parse remote net %s\"", nw); rc = LUSTRE_CFG_RC_BAD_PARAM; goto out; } @@ -616,21 +1040,42 @@ int lustre_lnet_config_route(char *nw, char *gw, int hops, int prio, goto out; } + rc = lnet_expr2ips(gw, ip_list, + &ip2nets, &net, err_str); + if (rc == LUSTRE_CFG_RC_LAST_ELEM) + rc = -1; + else if (rc < LUSTRE_CFG_RC_NO_ERR) + goto out; + + ip_idx = rc; + LIBCFS_IOC_INIT_V2(data, cfg_hdr); - data.cfg_net = net; + data.cfg_net = rnet; data.cfg_config_u.cfg_route.rtr_hop = hops; data.cfg_config_u.cfg_route.rtr_priority = prio; - data.cfg_nid = gateway_nid; - rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE, &data); - if (rc != 0) { - rc = -errno; - snprintf(err_str, - sizeof(err_str), - "\"cannot add route: %s\"", strerror(errno)); - goto out; - } + for (i = MAX_NUM_IPS - 1; i > ip_idx; i--) { + gateway_nid = LNET_MKNID(net, ip_list[i]); + if (gateway_nid == LNET_NID_ANY) { + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot form gateway NID: %u\"", + ip_list[i]); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + data.cfg_nid = gateway_nid; + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE, &data); + if (rc != 0) { + rc = -errno; + snprintf(err_str, + sizeof(err_str), + "\"cannot add route: %s\"", strerror(errno)); + goto out; + } + } out: cYAML_build_error(rc, seq_no, ADD_CMD, "route", err_str, err_rc); @@ -643,52 +1088,73 @@ int lustre_lnet_del_route(char *nw, char *gw, struct lnet_ioctl_config_data data; lnet_nid_t gateway_nid; int rc = LUSTRE_CFG_RC_NO_ERR; + __u32 rnet = LNET_NIDNET(LNET_NID_ANY); __u32 net = LNET_NIDNET(LNET_NID_ANY); char err_str[LNET_MAX_STR_LEN]; + int ip_idx, i; + __u32 ip_list[MAX_NUM_IPS]; + struct lustre_lnet_ip2nets ip2nets; + + /* initialize all lists */ + INIT_LIST_HEAD(&ip2nets.ip2nets_ip_ranges); + INIT_LIST_HEAD(&ip2nets.ip2nets_net.network_on_rule); + INIT_LIST_HEAD(&ip2nets.ip2nets_net.nw_intflist); snprintf(err_str, sizeof(err_str), "\"Success\""); if (nw == NULL || gw == NULL) { snprintf(err_str, sizeof(err_str), - "\"missing mandatory parameter(s): '%s'\"", + "\"missing mandatory parameter in route delete: '%s'\"", (nw == NULL && gw == NULL) ? "network, gateway" : (nw == NULL) ? "network" : "gateway"); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } - net = libcfs_str2net(nw); - if (net == LNET_NIDNET(LNET_NID_ANY)) { + rnet = libcfs_str2net(nw); + if (rnet == LNET_NIDNET(LNET_NID_ANY)) { snprintf(err_str, sizeof(err_str), - "\"cannot parse net '%s'\"", nw); + "\"cannot parse remote net '%s'\"", nw); rc = LUSTRE_CFG_RC_BAD_PARAM; goto out; } - gateway_nid = libcfs_str2nid(gw); - if (gateway_nid == LNET_NID_ANY) { - snprintf(err_str, - sizeof(err_str), - "\"cannot parse gateway NID '%s'\"", gw); - rc = LUSTRE_CFG_RC_BAD_PARAM; + rc = lnet_expr2ips(gw, ip_list, + &ip2nets, &net, err_str); + if (rc == LUSTRE_CFG_RC_LAST_ELEM) + rc = -1; + else if (rc < LUSTRE_CFG_RC_NO_ERR) goto out; - } + + ip_idx = rc; LIBCFS_IOC_INIT_V2(data, cfg_hdr); - data.cfg_net = net; - data.cfg_nid = gateway_nid; + data.cfg_net = rnet; - rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE, &data); - if (rc != 0) { - rc = -errno; - snprintf(err_str, - sizeof(err_str), - "\"cannot delete route: %s\"", strerror(errno)); - goto out; - } + for (i = MAX_NUM_IPS - 1; i > ip_idx; i--) { + gateway_nid = LNET_MKNID(net, ip_list[i]); + if (gateway_nid == LNET_NID_ANY) { + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot form gateway NID: %u\"", + ip_list[i]); + err_str[LNET_MAX_STR_LEN - 1] = '\0'; + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + data.cfg_nid = gateway_nid; + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE, &data); + if (rc != 0) { + rc = -errno; + snprintf(err_str, + sizeof(err_str), + "\"cannot delete route: %s\"", strerror(errno)); + goto out; + } + } out: cYAML_build_error(rc, seq_no, DEL_CMD, "route", err_str, err_rc); @@ -697,7 +1163,7 @@ out: int lustre_lnet_show_route(char *nw, char *gw, int hops, int prio, int detail, int seq_no, struct cYAML **show_rc, - struct cYAML **err_rc) + struct cYAML **err_rc, bool backup) { struct lnet_ioctl_config_data data; lnet_nid_t gateway_nid; @@ -807,8 +1273,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; @@ -817,7 +1283,8 @@ int lustre_lnet_show_route(char *nw, char *gw, int hops, int prio, int detail, cfg_route.rtr_priority) == NULL) goto out; - if (cYAML_create_string(item, "state", + if (!backup && + cYAML_create_string(item, "state", data.cfg_config_u.cfg_route. rtr_flags ? "up" : "down") == NULL) @@ -872,7 +1339,7 @@ out: static int socket_intf_query(int request, char *intf, struct ifreq *ifr) { - int rc; + int rc = 0; int sockfd; if (strlen(intf) >= IFNAMSIZ || ifr == NULL) @@ -885,9 +1352,35 @@ static int socket_intf_query(int request, char *intf, strcpy(ifr->ifr_name, intf); rc = ioctl(sockfd, request, ifr); if (rc != 0) + rc = LUSTRE_CFG_RC_BAD_PARAM; + + close(sockfd); + + return rc; +} + +static int lustre_lnet_queryip(struct lnet_dlc_intf_descr *intf, __u32 *ip) +{ + struct ifreq ifr; + int rc; + + memset(&ifr, 0, sizeof(ifr)); + rc = socket_intf_query(SIOCGIFFLAGS, intf->intf_name, &ifr); + if (rc != 0) return LUSTRE_CFG_RC_BAD_PARAM; - return 0; + if ((ifr.ifr_flags & IFF_UP) == 0) + return LUSTRE_CFG_RC_BAD_PARAM; + + memset(&ifr, 0, sizeof(ifr)); + rc = socket_intf_query(SIOCGIFADDR, intf->intf_name, &ifr); + if (rc != 0) + return LUSTRE_CFG_RC_BAD_PARAM; + + *ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; + *ip = bswap_32(*ip); + + return LUSTRE_CFG_RC_NO_ERR; } /* @@ -896,45 +1389,72 @@ static int socket_intf_query(int request, char *intf, * Stop if any of the interfaces is down */ static int lustre_lnet_intf2nids(struct lnet_dlc_network_descr *nw, - lnet_nid_t **nids, __u32 *nnids) + lnet_nid_t **nids, __u32 *nnids, + char *err_str, size_t str_len) { int i = 0, count = 0, rc; - struct ifreq ifr; - __u32 ip; struct lnet_dlc_intf_descr *intf; + char val[LNET_MAX_STR_LEN]; + __u32 ip; + int gni_num; + - if (nw == NULL || nids == NULL) + if (nw == NULL || nids == NULL) { + snprintf(err_str, str_len, + "\"unexpected parameters to lustre_lnet_intf2nids()\""); + err_str[str_len - 1] = '\0'; return LUSTRE_CFG_RC_BAD_PARAM; + } - list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) - count++; + if (LNET_NETTYP(nw->nw_id) == GNILND) { + count = 1; + } else { + list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) + count++; + } *nids = calloc(count, sizeof(lnet_nid_t)); - if (*nids == NULL) + if (*nids == NULL) { + snprintf(err_str, str_len, + "\"out of memory\""); + err_str[str_len - 1] = '\0'; return LUSTRE_CFG_RC_OUT_OF_MEM; - - list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) { - memset(&ifr, 0, sizeof(ifr)); - rc = socket_intf_query(SIOCGIFFLAGS, intf->intf_name, &ifr); - if (rc != 0) - goto failed; - - if ((ifr.ifr_flags & IFF_UP) == 0) { - rc = LUSTRE_CFG_RC_BAD_PARAM; + } + /* + * special case the GNI interface since it doesn't have an IP + * address. The assumption is that there can only be one GNI + * interface in the system. No interface name is provided. + */ + if (LNET_NETTYP(nw->nw_id) == GNILND) { + rc = read_sysfs_file(gni_nid_path, "nid", val, + 1, sizeof(val)); + if (rc) { + snprintf(err_str, str_len, + "\"cannot read gni nid\""); + err_str[str_len - 1] = '\0'; goto failed; } + gni_num = atoi(val); - memset(&ifr, 0, sizeof(ifr)); - rc = socket_intf_query(SIOCGIFADDR, intf->intf_name, &ifr); - if (rc != 0) - goto failed; + (*nids)[i] = LNET_MKNID(nw->nw_id, gni_num); + + goto out; + } - ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; - ip = bswap_32(ip); + /* look at the other interfaces */ + list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) { + rc = lustre_lnet_queryip(intf, &ip); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + snprintf(err_str, str_len, + "\"couldn't query intf %s\"", intf->intf_name); + err_str[str_len - 1] = '\0'; + goto failed; + } (*nids)[i] = LNET_MKNID(nw->nw_id, ip); i++; } +out: *nnids = count; return 0; @@ -1103,25 +1623,34 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, return LUSTRE_CFG_RC_MATCH; } -int lustre_lnet_resolve_ip2nets_rule(struct lustre_lnet_ip2nets *ip2nets, - lnet_nid_t **nids, __u32 *nnids) +static int lustre_lnet_resolve_ip2nets_rule(struct lustre_lnet_ip2nets *ip2nets, + lnet_nid_t **nids, __u32 *nnids, + char *err_str, size_t str_len) { struct ifaddrs *ifa; int rc = LUSTRE_CFG_RC_NO_ERR; rc = getifaddrs(&ifa); - if (rc < 0) + if (rc < 0) { + snprintf(err_str, str_len, + "\"failed to get interface addresses: %d\"", -errno); + err_str[str_len - 1] = '\0'; return -errno; + } rc = lustre_lnet_match_ip_to_intf(ifa, &ip2nets->ip2nets_net.nw_intflist, &ip2nets->ip2nets_ip_ranges); if (rc != LUSTRE_CFG_RC_MATCH) { + snprintf(err_str, str_len, + "\"couldn't match ip to existing interfaces\""); + err_str[str_len - 1] = '\0'; freeifaddrs(ifa); return rc; } - rc = lustre_lnet_intf2nids(&ip2nets->ip2nets_net, nids, nnids); + rc = lustre_lnet_intf2nids(&ip2nets->ip2nets_net, nids, nnids, + err_str, sizeof(err_str)); if (rc != LUSTRE_CFG_RC_NO_ERR) { *nids = NULL; *nnids = 0; @@ -1150,15 +1679,17 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list, list_for_each_entry(intf_descr, intf_list, intf_on_network) { - if (i == 0 && tunables != NULL) + if (tunables != NULL) len = sizeof(struct lnet_ioctl_config_ni) + sizeof(struct lnet_ioctl_config_lnd_tunables); else len = sizeof(struct lnet_ioctl_config_ni); data = calloc(1, len); + if (!data) + return LUSTRE_CFG_RC_OUT_OF_MEM; conf = (struct lnet_ioctl_config_ni*) data; - if (i == 0 && tunables != NULL) + if (tunables != NULL) tun = (struct lnet_ioctl_config_lnd_tunables*) conf->lic_bulk; @@ -1192,8 +1723,7 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list, conf->lic_ncpts = count; - if (i == 0 && tunables != NULL) - /* TODO put in the LND tunables */ + if (tunables != NULL) memcpy(tun, tunables, sizeof(*tunables)); rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_LOCAL_NI, data); @@ -1202,8 +1732,10 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list, snprintf(err_str, LNET_MAX_STR_LEN, "\"cannot add network: %s\"", strerror(errno)); + free(data); return rc; } + free(data); i++; } @@ -1231,25 +1763,28 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets, goto out; } - rc = lustre_lnet_resolve_ip2nets_rule(ip2nets, &nids, &nnids); - if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH) { - snprintf(err_str, - sizeof(err_str), - "\"cannot resolve ip2nets rule\""); + /* + * 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, err_str, + sizeof(err_str)); + if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH) goto out; - } 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); @@ -1277,10 +1812,14 @@ 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) && + LNET_NETTYP(nw_descr->nw_id) != GNILND))) { snprintf(err_str, sizeof(err_str), - "\"mandatory parameters not specified.\""); + "\"missing mandatory parameters in NI config: '%s'\"", + (nw_descr == NULL) ? "network , interface" : + (nw_descr->nw_id == 0) ? "network" : "interface"); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } @@ -1301,6 +1840,10 @@ int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr, else len = sizeof(struct lnet_ioctl_config_ni); data = calloc(1, len); + if (!data) { + rc = LUSTRE_CFG_RC_OUT_OF_MEM; + goto out; + } conf = (struct lnet_ioctl_config_ni*) data; if (tunables != NULL) tun = (struct lnet_ioctl_config_lnd_tunables*) @@ -1343,8 +1886,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, @@ -1355,7 +1900,11 @@ int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr, goto out; } - if (list_empty(&nw_descr->nw_intflist)) { + /* + * special case the GNI since no interface name is expected + */ + if (list_empty(&nw_descr->nw_intflist) && + (LNET_NETTYP(nw_descr->nw_id) != GNILND)) { snprintf(err_str, sizeof(err_str), "\"no interface name provided\""); @@ -1363,10 +1912,9 @@ int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr, goto out; } - rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids); + rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids, + err_str, sizeof(err_str)); if (rc != 0) { - snprintf(err_str, sizeof(err_str), - "\"bad parameter\""); rc = LUSTRE_CFG_RC_BAD_PARAM; goto out; } @@ -1406,19 +1954,21 @@ 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) { snprintf(err_str, sizeof(err_str), - "\"missing mandatory parameter\""); + "\"missing mandatory parameter in deleting NI: '%s'\"", + (nw_descr == NULL) ? "network , interface" : + (nw_descr->nw_id == 0) ? "network" : "interface"); rc = LUSTRE_CFG_RC_MISSING_PARAM; 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), @@ -1428,10 +1978,9 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr, goto out; } - rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids); + rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids, + err_str, sizeof(err_str)); if (rc != 0) { - snprintf(err_str, sizeof(err_str), - "\"bad parameter\""); rc = LUSTRE_CFG_RC_BAD_PARAM; goto out; } @@ -1476,16 +2025,60 @@ out: if (nids != NULL) free(nids); - return rc; + 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 cYAML **show_rc, struct cYAML **err_rc, + bool backup) { char *buf; 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; + struct lnet_ioctl_local_ni_hstats hstats; __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; @@ -1493,7 +2086,8 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, struct cYAML *root = NULL, *tunables = NULL, *net_node = NULL, *interfaces = NULL, *item = NULL, *first_seq = NULL, - *tmp = NULL, *statistics = NULL; + *tmp = NULL, *statistics = NULL, + *yhstats = NULL; int str_buf_len = LNET_MAX_SHOW_NUM_CPT * 2; char str_buf[str_buf_len]; char *pos; @@ -1556,6 +2150,10 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, net != rc_net) continue; + /* if we're backing up don't store lo */ + if (backup && LNET_NETTYP(rc_net) == LOLND) + continue; + /* default rc to -1 in case we hit the goto */ rc = -1; exist = true; @@ -1589,11 +2187,13 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, if (first_seq == NULL) first_seq = item; - if (cYAML_create_string(item, "nid", + if (!backup && + cYAML_create_string(item, "nid", libcfs_nid2str(ni_data->lic_nid)) == NULL) goto out; - if (cYAML_create_string(item, + if (!backup && + cYAML_create_string(item, "status", (ni_data->lic_status == LNET_NI_STATUS_UP) ? @@ -1607,7 +2207,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); @@ -1622,26 +2222,106 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, if (detail) { char *limit; + int k; + + if (backup) + goto continue_without_msg_stats; 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; + } + + LIBCFS_IOC_INIT_V2(hstats, hlni_hdr); + hstats.hlni_nid = ni_data->lic_nid; + /* grab health stats */ + rc = l_ioctl(LNET_DEV_ID, + IOC_LIBCFS_GET_LOCAL_HSTATS, + &hstats); + if (rc != 0) { + l_errno = errno; + goto continue_without_msg_stats; + } + yhstats = cYAML_create_object(item, "health stats"); + if (!yhstats) + goto out; + if (cYAML_create_number(yhstats, "health value", + hstats.hlni_health_value) + == NULL) + goto out; + if (cYAML_create_number(yhstats, "interrupts", + hstats.hlni_local_interrupt) + == NULL) + goto out; + if (cYAML_create_number(yhstats, "dropped", + hstats.hlni_local_dropped) + == NULL) + goto out; + if (cYAML_create_number(yhstats, "aborted", + hstats.hlni_local_aborted) + == NULL) + goto out; + if (cYAML_create_number(yhstats, "no route", + hstats.hlni_local_no_route) + == NULL) + goto out; + if (cYAML_create_number(yhstats, "timeouts", + hstats.hlni_local_timeout) + == NULL) + goto out; + if (cYAML_create_number(yhstats, "error", + hstats.hlni_local_error) == NULL) goto out; +continue_without_msg_stats: tunables = cYAML_create_object(item, "tunables"); if (!tunables) goto out; @@ -1650,24 +2330,30 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, if (rc != LUSTRE_CFG_RC_NO_ERR) goto out; - tunables = cYAML_create_object(item, "lnd tunables"); - if (tunables == NULL) - goto out; - rc = lustre_ni_show_tunables(tunables, LNET_NETTYP(rc_net), &lnd->lt_tun); - if (rc != LUSTRE_CFG_RC_NO_ERR) + if (rc != LUSTRE_CFG_RC_NO_ERR && + rc != LUSTRE_CFG_RC_NO_MATCH) goto out; - if (cYAML_create_number(item, "tcp bonding", - ni_data->lic_tcp_bonding) - == NULL) - goto out; + if (rc != LUSTRE_CFG_RC_NO_MATCH) { + tunables = cYAML_create_object(item, + "lnd tunables"); + if (tunables == NULL) + goto out; + } - if (cYAML_create_number(item, "dev cpt", + if (!backup && + cYAML_create_number(item, "dev cpt", ni_data->lic_dev_cpt) == NULL) goto out; + if (!backup && + cYAML_create_number(item, "tcp bonding", + ni_data->lic_tcp_bonding) + == NULL) + goto out; + /* out put the CPTs in the format: "[x,x,x,...]" */ limit = str_buf + str_buf_len - 3; pos += snprintf(pos, limit - pos, "\"["); @@ -1761,38 +2447,147 @@ 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_hsensitivity(int sen, 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", sen); + + rc = write_sysfs_file(modparam_path, "lnet_health_sensitivity", val, + 1, strlen(val) + 1); + if (rc) + snprintf(err_str, sizeof(err_str), + "\"cannot configure health sensitivity: %s\"", + strerror(errno)); + + cYAML_build_error(rc, seq_no, ADD_CMD, "health_sensitivity", err_str, err_rc); + + return rc; +} + +int lustre_lnet_config_transaction_to(int timeout, 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", timeout); + + rc = write_sysfs_file(modparam_path, "lnet_transaction_timeout", val, + 1, strlen(val) + 1); + if (rc) + snprintf(err_str, sizeof(err_str), + "\"cannot configure transaction timeout: %s\"", + strerror(errno)); + + cYAML_build_error(rc, seq_no, ADD_CMD, "transaction_timeout", err_str, err_rc); + + return rc; +} + +int lustre_lnet_config_retry_count(int count, 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", count); + + rc = write_sysfs_file(modparam_path, "lnet_retry_count", val, + 1, strlen(val) + 1); + if (rc) + snprintf(err_str, sizeof(err_str), + "\"cannot configure retry count: %s\"", + strerror(errno)); + + cYAML_build_error(rc, seq_no, ADD_CMD, "retry_count", 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, @@ -1834,7 +2629,7 @@ out: } int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, - struct cYAML **err_rc) + struct cYAML **err_rc, bool backup) { struct lnet_ioctl_config_data *data; struct lnet_ioctl_pool_cfg *pool_cfg = NULL; @@ -1863,7 +2658,10 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, if (root == NULL) goto out; - pools_node = cYAML_create_seq(root, "routing"); + if (backup) + pools_node = cYAML_create_object(root, "routing"); + else + pools_node = cYAML_create_seq(root, "routing"); if (pools_node == NULL) goto out; @@ -1883,6 +2681,9 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, pool_cfg = (struct lnet_ioctl_pool_cfg *)data->cfg_bulk; + if (backup) + goto calculate_buffers; + snprintf(node_name, sizeof(node_name), "cpt[%d]", i); item = cYAML_create_seq_item(pools_node); if (item == NULL) @@ -1895,24 +2696,31 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, if (cpt == NULL) goto out; +calculate_buffers: /* create the tree and print */ for (j = 0; j < LNET_NRBPOOLS; j++) { - type_node = cYAML_create_object(cpt, pools[j]); - if (type_node == NULL) - goto out; - if (cYAML_create_number(type_node, "npages", + if (!backup) { + type_node = cYAML_create_object(cpt, pools[j]); + if (type_node == NULL) + goto out; + } + if (!backup && + cYAML_create_number(type_node, "npages", pool_cfg->pl_pools[j].pl_npages) == NULL) goto out; - if (cYAML_create_number(type_node, "nbuffers", + if (!backup && + cYAML_create_number(type_node, "nbuffers", pool_cfg->pl_pools[j]. pl_nbuffers) == NULL) goto out; - if (cYAML_create_number(type_node, "credits", + if (!backup && + cYAML_create_number(type_node, "credits", pool_cfg->pl_pools[j]. pl_credits) == NULL) goto out; - if (cYAML_create_number(type_node, "mincredits", + if (!backup && + cYAML_create_number(type_node, "mincredits", pool_cfg->pl_pools[j]. pl_mincredits) == NULL) goto out; @@ -1923,6 +2731,15 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, } if (pool_cfg != NULL) { + if (backup) { + if (cYAML_create_number(pools_node, "enable", + pool_cfg->pl_routing) == + NULL) + goto out; + + goto add_buffer_section; + } + item = cYAML_create_seq_item(pools_node); if (item == NULL) goto out; @@ -1932,6 +2749,7 @@ int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc, goto out; } +add_buffer_section: /* create a buffers entry in the show. This is necessary so that * if the YAML output is used to configure a node, the buffer * configuration takes hold */ @@ -1987,34 +2805,34 @@ out: } int lustre_lnet_show_peer(char *knid, int detail, int seq_no, - struct cYAML **show_rc, struct cYAML **err_rc) + struct cYAML **show_rc, struct cYAML **err_rc, + bool backup) { /* * TODO: This function is changing in a future patch to accommodate * PEER_LIST and proper filtering on any nid of the peer */ - struct lnet_ioctl_peer_cfg *peer_info; + struct lnet_ioctl_peer_cfg peer_info; struct lnet_peer_ni_credit_info *lpni_cri; struct lnet_ioctl_element_stats *lpni_stats; - int rc = LUSTRE_CFG_RC_OUT_OF_MEM, ncpt = 0, i = 0, j = 0; + 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; + struct lnet_process_id *list = NULL; + void *data = NULL; + void *lpni_data; snprintf(err_str, sizeof(err_str), "\"out of memory\""); - if (data == NULL) - goto out; - - peer_info = (struct lnet_ioctl_peer_cfg *)data; - /* create struct cYAML root object */ root = cYAML_create_object(NULL, NULL); if (root == NULL) @@ -2024,71 +2842,139 @@ 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; + count = 1000; + size = count * sizeof(struct lnet_process_id); + 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; + } + } + } - rc = l_ioctl(LNET_DEV_ID, - IOC_LIBCFS_GET_PEER_NI, peer_info); - if (rc != 0) { - l_errno = errno; + 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; + + l_errno = 0; + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER_NI, + &peer_info); + if (rc == 0) break; + l_errno = errno; + if (l_errno != E2BIG) { + snprintf(err_str, + sizeof(err_str), + "\"cannot get peer information: %s\"", + strerror(l_errno)); + rc = -l_errno; + goto out; + } + free(data); + size = peer_info.prcfg_size; + data = malloc(size); + if (data == NULL) { + l_errno = ENOMEM; + goto out; } + } - if (primary_nid != LNET_NID_ANY && - primary_nid != peer_info->prcfg_prim_nid) - continue; + peer = cYAML_create_seq_item(peer_root); + if (peer == NULL) + goto out; - 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)); + if (first_seq == NULL) + first_seq = peer; - peer = cYAML_create_seq_item(peer_root); - if (peer == NULL) + 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 (!backup && + cYAML_create_number(peer, "peer state", + peer_info.prcfg_state) + == NULL) goto out; + } - if (peer_info->prcfg_prim_nid != prev_primary_nid) { - prev_primary_nid = peer_info->prcfg_prim_nid; - new_peer = true; - } - - if (new_peer) { - lnet_nid_t pnid = peer_info->prcfg_prim_nid; - if (cYAML_create_string(peer, "primary nid", - libcfs_nid2str(pnid)) - == NULL) - goto out; - if (cYAML_create_string(peer, "Multi-Rail", - peer_info->prcfg_mr ? - "True" : "False") - == NULL) - goto out; - tmp = cYAML_create_seq(peer, "peer ni"); - if (tmp == NULL) - goto out; - new_peer = false; - } + tmp = cYAML_create_seq(peer, "peer ni"); + if (tmp == NULL) + goto out; - if (first_seq == NULL) - first_seq = peer; + lpni_data = data; + for (j = 0; j < peer_info.prcfg_count; j++) { + nidp = lpni_data; + lpni_cri = (void*)nidp + sizeof(nidp); + lpni_stats = (void *)lpni_cri + sizeof(*lpni_cri); + 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; + if (backup) + continue; + if (cYAML_create_string(peer_ni, "state", lpni_cri->cr_aliveness) == NULL) @@ -2127,37 +3013,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) - goto out; + 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(statistics, "send_count", + lpni_stats->iel_send_count) + == NULL) + goto out; + + if (cYAML_create_number(statistics, "recv_count", + lpni_stats->iel_recv_count) + == NULL) + goto out; + + 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; + } + + 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]; + struct lnet_process_id *list = NULL; - if (cYAML_create_number(peer_ni, "recv_count", - lpni_stats->recv_count) - == NULL) - goto out; + snprintf(err_str, sizeof(err_str), + "\"out of memory\""); - if (cYAML_create_number(peer_ni, "drop_count", - lpni_stats->drop_count) - == NULL) - goto out; + memset(&peer_info, 0, sizeof(peer_info)); - if (cYAML_create_number(peer_ni, "refcount", - lpni_cri->cr_refcount) == NULL) - goto out; - } + /* 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; - if (l_errno != ENOENT) { + count = 1000; + size = count * sizeof(struct lnet_process_id); + list = malloc(size); + if (list == NULL) { + l_errno = ENOMEM; + goto out; + } + for (;;) { + LIBCFS_IOC_INIT_V2(peer_info, prcfg_hdr); + peer_info.prcfg_hdr.ioc_len = sizeof(peer_info); + peer_info.prcfg_size = size; + peer_info.prcfg_bulk = list; + + l_errno = 0; + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER_LIST, &peer_info); + count = peer_info.prcfg_count; + if (rc == 0) + break; + l_errno = errno; + if (l_errno != E2BIG) { snprintf(err_str, sizeof(err_str), - "\"cannot get peer information: %s\"", + "\"cannot get peer list: %s\"", strerror(l_errno)); rc = -l_errno; goto out; } + free(list); + size = peer_info.prcfg_size; + list = malloc(size); + if (list == NULL) { + l_errno = ENOMEM; + goto out; + } + } - j++; - } while (j < ncpt); + /* count is now the actual number of ids in the list. */ + for (i = 0; i < count; i++) { + if (cYAML_create_string(list_root, "nid", + libcfs_nid2str(list[i].nid)) + == NULL) + goto out; + } /* print output iff show_rc is not provided */ if (show_rc == NULL) @@ -2167,6 +3178,8 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no, rc = LUSTRE_CFG_RC_NO_ERR; out: + if (list != NULL) + free(list); if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) { cYAML_free_tree(root); } else if (show_rc != NULL && *show_rc != NULL) { @@ -2178,11 +3191,11 @@ out: "peer"); if (show_node != NULL && cYAML_is_sequence(show_node)) { cYAML_insert_child(show_node, first_seq); - free(peer_root); + free(list_root); free(root); } else if (show_node == NULL) { cYAML_insert_sibling((*show_rc)->cy_child, - peer_root); + list_root); free(root); } else { cYAML_free_tree(root); @@ -2197,27 +3210,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; } @@ -2225,39 +3242,203 @@ 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_hsensitivity(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 sen = -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_health_sensitivity", val, + 1, sizeof(val)); + if (rc) { + l_errno = -errno; + snprintf(err_str, sizeof(err_str), + "\"cannot get health sensitivity: %d\"", rc); + } else { + sen = atoi(val); + } + + return build_global_yaml_entry(err_str, sizeof(err_str), seq_no, + "health_sensitivity", sen, show_rc, + err_rc, l_errno); +} + +int lustre_lnet_show_transaction_to(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 tto = -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_transaction_timeout", val, + 1, sizeof(val)); + if (rc) { + l_errno = -errno; + snprintf(err_str, sizeof(err_str), + "\"cannot get transaction timeout: %d\"", rc); + } else { + tto = atoi(val); + } + + return build_global_yaml_entry(err_str, sizeof(err_str), seq_no, + "transaction_timeout", tto, show_rc, + err_rc, l_errno); +} + +int lustre_lnet_show_retry_count(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 retry_count = -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_retry_count", val, + 1, sizeof(val)); + if (rc) { + l_errno = -errno; + snprintf(err_str, sizeof(err_str), + "\"cannot get retry count: %d\"", rc); + } else { + retry_count = atoi(val); + } + + return build_global_yaml_entry(err_str, sizeof(err_str), seq_no, + "retry_count", retry_count, 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; @@ -2277,6 +3458,8 @@ int lustre_lnet_show_stats(int seq_no, struct cYAML **show_rc, goto out; } + rc = LUSTRE_CFG_RC_OUT_OF_MEM; + root = cYAML_create_object(NULL, NULL); if (root == NULL) goto out; @@ -2333,6 +3516,7 @@ int lustre_lnet_show_stats(int seq_no, struct cYAML **show_rc, cYAML_print_tree(root); snprintf(err_str, sizeof(err_str), "\"success\""); + rc = LUSTRE_CFG_RC_NO_ERR; out: if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) { cYAML_free_tree(root); @@ -2539,6 +3723,8 @@ static int handle_yaml_config_ni(struct cYAML *tree, struct cYAML **show_rc, net = cYAML_get_object_item(tree, "net type"); if (net) nw_descr.nw_id = libcfs_str2net(net->cy_valuestring); + else + nw_descr.nw_id = LOLND; /* * if neither net nor ip2nets are present, then we can not @@ -2739,23 +3925,41 @@ 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 *nids_entry, char ***nidsppp, + char *prim_nid, bool del) { - struct cYAML *nids_entry = NULL, *child = NULL, *entry = NULL; + struct cYAML *child = NULL, *entry = NULL; char **nids = NULL; int num = 0, rc = LUSTRE_CFG_RC_NO_ERR; - 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 (prim_nid && + (strcmp(entry->cy_valuestring, prim_nid) + == 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) return LUSTRE_CFG_RC_MISSING_PARAM; - nids = calloc(sizeof(*nids) * num, 1); - if (nids == NULL) + nids = calloc(sizeof(*nids), num); + if (!nids) return LUSTRE_CFG_RC_OUT_OF_MEM; /* now grab all the nids */ @@ -2763,8 +3967,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; @@ -2791,19 +3996,41 @@ static int handle_yaml_config_peer(struct cYAML *tree, struct cYAML **show_rc, { char **nids = NULL; int num, rc; - struct cYAML *seq_no, *prim_nid, *non_mr; - - num = yaml_copy_peer_nids(tree, &nids); - if (num < 0) - return num; + struct cYAML *seq_no, *prim_nid, *non_mr, *ip2nets, *peer_nis; + char err_str[LNET_MAX_STR_LEN]; seq_no = cYAML_get_object_item(tree, "seq_no"); prim_nid = cYAML_get_object_item(tree, "primary nid"); non_mr = cYAML_get_object_item(tree, "non_mr"); + ip2nets = cYAML_get_object_item(tree, "ip2nets"); + peer_nis = cYAML_get_object_item(tree, "peer ni"); + + if (ip2nets && (prim_nid || peer_nis)) { + rc = LUSTRE_CFG_RC_BAD_PARAM; + snprintf(err_str, sizeof(err_str), + "ip2nets can not be specified along side prim_nid" + " or peer ni fields"); + cYAML_build_error(rc, (seq_no) ? seq_no->cy_valueint : -1, + ADD_CMD, "peer", err_str, err_rc); + return rc; + } + + num = yaml_copy_peer_nids((ip2nets) ? ip2nets : peer_nis, &nids, + (prim_nid) ? prim_nid->cy_valuestring : NULL, + false); + + if (num < 0) { + snprintf(err_str, sizeof(err_str), + "error copying nids from YAML block"); + cYAML_build_error(num, (seq_no) ? seq_no->cy_valueint : -1, + ADD_CMD, "peer", err_str, err_rc); + return num; + } rc = lustre_lnet_config_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL, nids, num, (non_mr) ? false : true, + (ip2nets) ? true : false, (seq_no) ? seq_no->cy_valueint : -1, err_rc); @@ -2816,17 +4043,37 @@ static int handle_yaml_del_peer(struct cYAML *tree, struct cYAML **show_rc, { char **nids = NULL; int num, rc; - struct cYAML *seq_no, *prim_nid; - - num = yaml_copy_peer_nids(tree, &nids); - if (num < 0) - return num; + struct cYAML *seq_no, *prim_nid, *ip2nets, *peer_nis; + char err_str[LNET_MAX_STR_LEN]; seq_no = cYAML_get_object_item(tree, "seq_no"); prim_nid = cYAML_get_object_item(tree, "primary nid"); + ip2nets = cYAML_get_object_item(tree, "ip2nets"); + peer_nis = cYAML_get_object_item(tree, "peer ni"); + + if (ip2nets && (prim_nid || peer_nis)) { + rc = LUSTRE_CFG_RC_BAD_PARAM; + snprintf(err_str, sizeof(err_str), + "ip2nets can not be specified along side prim_nid" + " or peer ni fields"); + cYAML_build_error(rc, (seq_no) ? seq_no->cy_valueint : -1, + DEL_CMD, "peer", err_str, err_rc); + return rc; + } + + num = yaml_copy_peer_nids((ip2nets) ? ip2nets : peer_nis , &nids, + (prim_nid) ? prim_nid->cy_valuestring : NULL, + true); + if (num < 0) { + snprintf(err_str, sizeof(err_str), + "error copying nids from YAML block"); + cYAML_build_error(num, (seq_no) ? seq_no->cy_valueint : -1, + ADD_CMD, "peer", err_str, err_rc); + return num; + } rc = lustre_lnet_del_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL, - nids, num, + nids, num, (ip2nets) ? true : false, (seq_no) ? seq_no->cy_valueint : -1, err_rc); @@ -2927,8 +4174,7 @@ static int handle_yaml_show_route(struct cYAML *tree, struct cYAML **show_rc, (prio) ? prio->cy_valueint : -1, (detail) ? detail->cy_valueint : 0, (seq_no) ? seq_no->cy_valueint : -1, - show_rc, - err_rc); + show_rc, err_rc, false); } static int handle_yaml_show_net(struct cYAML *tree, struct cYAML **show_rc, @@ -2943,8 +4189,7 @@ static int handle_yaml_show_net(struct cYAML *tree, struct cYAML **show_rc, return lustre_lnet_show_net((net) ? net->cy_valuestring : NULL, (detail) ? detail->cy_valueint : 0, (seq_no) ? seq_no->cy_valueint : -1, - show_rc, - err_rc); + show_rc, err_rc, false); } static int handle_yaml_show_routing(struct cYAML *tree, struct cYAML **show_rc, @@ -2955,7 +4200,7 @@ static int handle_yaml_show_routing(struct cYAML *tree, struct cYAML **show_rc, seq_no = cYAML_get_object_item(tree, "seq_no"); return lustre_lnet_show_routing((seq_no) ? seq_no->cy_valueint : -1, - show_rc, err_rc); + show_rc, err_rc, false); } static int handle_yaml_show_peers(struct cYAML *tree, struct cYAML **show_rc, @@ -2970,7 +4215,7 @@ static int handle_yaml_show_peers(struct cYAML *tree, struct cYAML **show_rc, 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, false); } static int handle_yaml_show_stats(struct cYAML *tree, struct cYAML **show_rc, @@ -3019,6 +4264,176 @@ 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, *retry, *tto, *seq_no, + *sen; + 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); + + retry = cYAML_get_object_item(tree, "retry_count"); + if (retry) + rc = lustre_lnet_config_retry_count(retry->cy_valueint, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + tto = cYAML_get_object_item(tree, "transaction_timeout"); + if (tto) + rc = lustre_lnet_config_transaction_to(tto->cy_valueint, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + sen = cYAML_get_object_item(tree, "health_sensitivity"); + if (sen) + rc = lustre_lnet_config_hsensitivity(sen->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, *retry, *tto, *seq_no, + *sen; + 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); + + retry = cYAML_get_object_item(tree, "retry_count"); + if (retry) + rc = lustre_lnet_show_retry_count(seq_no ? seq_no->cy_valueint + : -1, + show_rc, err_rc); + + tto = cYAML_get_object_item(tree, "transaction_timeout"); + if (tto) + rc = lustre_lnet_show_transaction_to(seq_no ? seq_no->cy_valueint + : -1, + show_rc, err_rc); + + sen = cYAML_get_object_item(tree, "health_sensitivity"); + if (sen) + rc = lustre_lnet_show_hsensitivity(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; @@ -3031,25 +4446,53 @@ static struct lookup_cmd_hdlr_tbl lookup_config_tbl[] = { { .name = "peer", .cb = handle_yaml_config_peer }, { .name = "routing", .cb = handle_yaml_config_routing }, { .name = "buffers", .cb = handle_yaml_config_buffers }, + { .name = "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[] = { { .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[] = { { .name = "route", .cb = handle_yaml_show_route }, { .name = "net", .cb = handle_yaml_show_net }, - { .name = "buffers", .cb = handle_yaml_show_routing }, - { .name = "routing", .cb = handle_yaml_show_routing }, { .name = "peer", .cb = handle_yaml_show_peers }, + { .name = "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, @@ -3131,46 +4574,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); } -