X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flnetconfig%2Fliblnetconfig.c;h=bc545d866c85175a50f4318f76d2b1015fddedce;hb=refs%2Fchanges%2F92%2F25792%2F29;hp=edfd5d52151a985d9837a7ab37e4e5178c56964b;hpb=3c62efb37ec2757326eb0c24a78438b32d42bf2e;p=fs%2Flustre-release.git diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c index edfd5d5..bc545d8 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.c +++ b/lnet/utils/lnetconfig/liblnetconfig.c @@ -35,15 +35,21 @@ #include #include +#include #include #include #include #include +#include #include +#include #include -#include -#include +#include #include "liblnd.h" +#include +#include +#include +#include #include "liblnetconfig.h" #include "cyaml.h" @@ -52,6 +58,338 @@ #define ADD_CMD "add" #define DEL_CMD "del" #define SHOW_CMD "show" +#define DBG_CMD "dbg" +#define MANAGE_CMD "manage" + +#define modparam_path "/sys/module/lnet/parameters/" + +/* + * lustre_lnet_ip_range_descr + * Describes an IP range. + * Each octect is an expression + */ +struct lustre_lnet_ip_range_descr { + struct list_head ipr_entry; + struct list_head ipr_expr; +}; + +/* + * lustre_lnet_ip2nets + * Describes an ip2nets rule. This can be on a list of rules. + */ +struct lustre_lnet_ip2nets { + struct lnet_dlc_network_descr ip2nets_net; + 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: + * given a string of the format: + * parse each expr into + * a lustre_lnet_ip_range_descr structure and insert on the list. + * + * This function is called from + * YAML on each ip-range. + * As a result of lnetctl command + * When building a NID or P2P selection rules + */ +int lustre_lnet_add_ip_range(struct list_head *list, char *str_ip_range) +{ + struct lustre_lnet_ip_range_descr *ip_range; + int rc; + + ip_range = calloc(1, sizeof(*ip_range)); + if (ip_range == NULL) + return LUSTRE_CFG_RC_OUT_OF_MEM; + + INIT_LIST_HEAD(&ip_range->ipr_entry); + INIT_LIST_HEAD(&ip_range->ipr_expr); + + rc = cfs_ip_addr_parse(str_ip_range, strlen(str_ip_range), + &ip_range->ipr_expr); + if (rc != 0) + return LUSTRE_CFG_RC_BAD_PARAM; + + list_add_tail(&ip_range->ipr_entry, list); + + return LUSTRE_CFG_RC_NO_ERR; +} + +int lustre_lnet_add_intf_descr(struct list_head *list, char *intf, int len) +{ + char *open_sq_bracket = NULL, *close_sq_bracket = NULL, + *intf_name; + struct lnet_dlc_intf_descr *intf_descr = NULL; + int rc; + char intf_string[LNET_MAX_STR_LEN]; + + if (len >= LNET_MAX_STR_LEN) + return LUSTRE_CFG_RC_BAD_PARAM; + + strncpy(intf_string, intf, len); + intf_string[len] = '\0'; + + intf_descr = calloc(1, sizeof(*intf_descr)); + if (intf_descr == NULL) + return LUSTRE_CFG_RC_OUT_OF_MEM; + + INIT_LIST_HEAD(&intf_descr->intf_on_network); + + intf_name = intf_string; + open_sq_bracket = strchr(intf_string, '['); + if (open_sq_bracket != NULL) { + close_sq_bracket = strchr(intf_string, ']'); + if (close_sq_bracket == NULL) { + free(intf_descr); + return LUSTRE_CFG_RC_BAD_PARAM; + } + rc = cfs_expr_list_parse(open_sq_bracket, + strlen(open_sq_bracket), 0, UINT_MAX, + &intf_descr->cpt_expr); + if (rc < 0) { + free(intf_descr); + return LUSTRE_CFG_RC_BAD_PARAM; + } + strncpy(intf_descr->intf_name, intf_name, + open_sq_bracket - intf_name); + intf_descr->intf_name[open_sq_bracket - intf_name] = '\0'; + } else { + strcpy(intf_descr->intf_name, intf_name); + intf_descr->cpt_expr = NULL; + } + + list_add_tail(&intf_descr->intf_on_network, list); + + return LUSTRE_CFG_RC_NO_ERR; +} + +void lustre_lnet_init_nw_descr(struct lnet_dlc_network_descr *nw_descr) +{ + if (nw_descr != NULL) { + INIT_LIST_HEAD(&nw_descr->network_on_rule); + INIT_LIST_HEAD(&nw_descr->nw_intflist); + } +} + +int lustre_lnet_parse_nids(char *nids, char **array, int size, + char ***out_array) +{ + int num_nids = 0; + char *comma = nids, *cur, *entry; + char **new_array; + int i, len, start = 0, finish = 0; + + if (nids == NULL || strlen(nids) == 0) + return size; + + /* count the number or new nids, by counting the number of commas */ + while (comma) { + comma = strchr(comma, ','); + if (comma) { + comma++; + num_nids++; + } else { + num_nids++; + } + } + + /* + * if the array is not NULL allocate a large enough array to house + * the old and new entries + */ + new_array = calloc(sizeof(char*), + (size > 0) ? size + num_nids : num_nids); + + if (!new_array) + goto failed; + + /* parse our the new nids and add them to the tail of the array */ + comma = nids; + cur = nids; + start = (size > 0) ? size: 0; + finish = (size > 0) ? size + num_nids : num_nids; + for (i = start; i < finish; i++) { + comma = strchr(comma, ','); + if (!comma) + /* + * the length of the string to be parsed out is + * from cur to end of string. So it's good enough + * to strlen(cur) + */ + len = strlen(cur) + 1; + else + /* length of the string is comma - cur */ + len = (comma - cur) + 1; + + entry = calloc(1, len); + if (!entry) { + finish = i > 0 ? i - 1: 0; + goto failed; + } + strncpy(entry, cur, len - 1); + entry[len] = '\0'; + new_array[i] = entry; + if (comma) { + comma++; + cur = comma; + } + } + + /* add the old entries in the array and delete the old array*/ + for (i = 0; i < size; i++) + new_array[i] = array[i]; + + if (array) + free(array); + + *out_array = new_array; + + return finish; + +failed: + for (i = start; i < finish; i++) + free(new_array[i]); + if (new_array) + free(new_array); + + return size; +} + +/* + * format expected: + * [], [],.. + */ +int lustre_lnet_parse_interfaces(char *intf_str, + struct lnet_dlc_network_descr *nw_descr) +{ + char *open_square; + char *close_square; + char *comma; + char *cur = intf_str, *next = NULL; + char *end = intf_str + strlen(intf_str); + int rc, len; + struct lnet_dlc_intf_descr *intf_descr, *tmp; + + if (nw_descr == NULL) + return LUSTRE_CFG_RC_BAD_PARAM; + + while (cur < end) { + open_square = strchr(cur, '['); + if (open_square != NULL) { + close_square = strchr(cur, ']'); + if (close_square == NULL) { + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto failed; + } + + comma = strchr(cur, ','); + if (comma != NULL && comma > close_square) { + next = comma + 1; + len = next - close_square; + } else { + len = strlen(cur); + next = cur + len; + } + } else { + comma = strchr(cur, ','); + if (comma != NULL) { + next = comma + 1; + len = comma - cur; + } else { + len = strlen(cur); + next = cur + len; + } + } + + rc = lustre_lnet_add_intf_descr(&nw_descr->nw_intflist, cur, len); + if (rc != LUSTRE_CFG_RC_NO_ERR) + goto failed; + + cur = next; + } + + return LUSTRE_CFG_RC_NO_ERR; + +failed: + list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, + intf_on_network) { + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + } + + return rc; +} int lustre_lnet_config_lib_init(void) { @@ -59,6 +397,11 @@ int lustre_lnet_config_lib_init(void) LNET_DEV_MAJOR, LNET_DEV_MINOR); } +void lustre_lnet_config_lib_uninit(void) +{ + unregister_ioc_dev(LNET_DEV_ID); +} + int lustre_lnet_config_ni_system(bool up, bool load_ni_from_mod, int seq_no, struct cYAML **err_rc) { @@ -92,52 +435,44 @@ int lustre_lnet_config_ni_system(bool up, bool load_ni_from_mod, return rc; } -static lnet_nid_t *allocate_create_nid_array(char **nids, char *err_str) +static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids, + char *err_str) { lnet_nid_t *array = NULL; - int idx = 0; + __u32 i; - if (!nids) { + if (!nids || num_nids == 0) { snprintf(err_str, LNET_MAX_STR_LEN, "no NIDs to add"); return NULL; } - /* count the size of the array */ - while (nids[idx] != NULL) - idx++; - - array = calloc(sizeof(*array) * idx + 1, 1); + array = calloc(sizeof(*array) * num_nids, 1); if (array == NULL) { snprintf(err_str, LNET_MAX_STR_LEN, "out of memory"); return NULL; } - idx = 0; - while (nids[idx] != NULL) { - array[idx] = libcfs_str2nid(nids[idx]); - if (array[idx] == LNET_NID_ANY) { + for (i = 0; i < num_nids; i++) { + array[i] = libcfs_str2nid(nids[i]); + if (array[i] == LNET_NID_ANY) { free(array); snprintf(err_str, LNET_MAX_STR_LEN, "bad NID: '%s'", - nids[idx]); + nids[i]); return NULL; } - idx++; } - /* identify last entry */ - array[idx] = LNET_NID_ANY; - return array; } -static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd, +static int dispatch_peer_ni_cmd(lnet_nid_t pnid, lnet_nid_t nid, __u32 cmd, struct lnet_ioctl_peer_cfg *data, char *err_str, char *cmd_str) { int rc; - data->prcfg_key_nid = knid; + data->prcfg_prim_nid = pnid; data->prcfg_cfg_nid = nid; rc = l_ioctl(LNET_DEV_ID, cmd, data); @@ -152,62 +487,254 @@ static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd, return rc; } -int lustre_lnet_config_peer_nid(char *knid, char **nid, int 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) +{ + 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_config_peer_nid(char *pnid, char **nid, int num_nids, + bool mr, int seq_no, struct cYAML **err_rc) { struct lnet_ioctl_peer_cfg data; - lnet_nid_t key_nid = LNET_NID_ANY; + lnet_nid_t prim_nid = LNET_NID_ANY; int rc = LUSTRE_CFG_RC_NO_ERR; int idx = 0; + bool nid0_used = false; char err_str[LNET_MAX_STR_LEN] = {0}; - lnet_nid_t *nids = allocate_create_nid_array(nid, err_str); + lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str); - if (knid != NULL) { - key_nid = libcfs_str2nid(knid); - if (key_nid == LNET_NID_ANY) { + if (pnid) { + prim_nid = libcfs_str2nid(pnid); + if (prim_nid == LNET_NID_ANY) { snprintf(err_str, sizeof(err_str), "bad key NID: '%s'", - knid); + pnid); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } - } else if (nids[0] == LNET_NID_ANY) { + } else if (!nids || nids[0] == LNET_NID_ANY) { snprintf(err_str, sizeof(err_str), "no NIDs provided for configuration"); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } else { - key_nid = LNET_NID_ANY; + prim_nid = LNET_NID_ANY; } snprintf(err_str, sizeof(err_str), "\"Success\""); LIBCFS_IOC_INIT_V2(data, prcfg_hdr); - if (nids[0] == LNET_NID_ANY) { - rc = dispatch_peer_ni_cmd(LNET_NID_ANY, key_nid, - IOC_LIBCFS_ADD_PEER_NI, - &data, err_str, "add"); - goto out; + data.prcfg_mr = mr; + + /* + * if prim_nid is not specified use the first nid in the list of + * nids provided as the prim_nid. NOTE: on entering 'if' we must + * have at least 1 NID + */ + if (prim_nid == LNET_NID_ANY) { + nid0_used = true; + prim_nid = nids[0]; } - while (nids[idx] != LNET_NID_ANY) { + /* Create the prim_nid first */ + rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY, + IOC_LIBCFS_ADD_PEER_NI, + &data, err_str, "add"); + + if (rc != 0) + goto out; + + /* add the rest of the nids to the key nid if any are available */ + for (idx = nid0_used ? 1 : 0 ; nids && idx < num_nids; idx++) { /* - * If key_nid is not provided then the first nid in the - * list becomes the key_nid. First time round the loop use + * If prim_nid is not provided then the first nid in the + * list becomes the prim_nid. First time round the loop use * LNET_NID_ANY for the first parameter, then use nid[0] * as the key nid after wards */ - rc = dispatch_peer_ni_cmd(key_nid, nids[idx], + rc = dispatch_peer_ni_cmd(prim_nid, nids[idx], IOC_LIBCFS_ADD_PEER_NI, &data, err_str, "add"); if (rc != 0) goto out; - - if (idx == 0 && key_nid == LNET_NID_ANY) - key_nid = nids[0]; - - idx++; } out: @@ -217,28 +744,28 @@ out: return rc; } -int lustre_lnet_del_peer_nid(char *knid, char **nid, int seq_no, - struct cYAML **err_rc) +int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids, + int seq_no, struct cYAML **err_rc) { struct lnet_ioctl_peer_cfg data; - lnet_nid_t key_nid; + lnet_nid_t prim_nid; int rc = LUSTRE_CFG_RC_NO_ERR; int idx = 0; char err_str[LNET_MAX_STR_LEN] = {0}; - lnet_nid_t *nids = allocate_create_nid_array(nid, err_str); + lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str); - if (knid == NULL) { + if (pnid == NULL) { snprintf(err_str, sizeof(err_str), "\"Primary nid is not provided\""); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } else { - key_nid = libcfs_str2nid(knid); - if (key_nid == LNET_NID_ANY) { + prim_nid = libcfs_str2nid(pnid); + if (prim_nid == LNET_NID_ANY) { rc = LUSTRE_CFG_RC_BAD_PARAM; snprintf(err_str, sizeof(err_str), "bad key NID: '%s'", - knid); + pnid); goto out; } } @@ -246,22 +773,20 @@ int lustre_lnet_del_peer_nid(char *knid, char **nid, int seq_no, snprintf(err_str, sizeof(err_str), "\"Success\""); LIBCFS_IOC_INIT_V2(data, prcfg_hdr); - if (nids[0] == LNET_NID_ANY) { - rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY, + if (!nids || nids[0] == LNET_NID_ANY) { + rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY, IOC_LIBCFS_DEL_PEER_NI, &data, err_str, "del"); goto out; } - while (nids[idx] != LNET_NID_ANY) { - rc = dispatch_peer_ni_cmd(key_nid, nids[idx], + for (idx = 0; nids && idx < num_nids; idx++) { + rc = dispatch_peer_ni_cmd(prim_nid, nids[idx], IOC_LIBCFS_DEL_PEER_NI, &data, err_str, "del"); if (rc != 0) goto out; - - idx++; } out: @@ -301,17 +826,6 @@ int lustre_lnet_config_route(char *nw, char *gw, int hops, int prio, goto out; } - if (LNET_NETTYP(net) == CIBLND || - LNET_NETTYP(net) == OPENIBLND || - LNET_NETTYP(net) == IIBLND || - LNET_NETTYP(net) == VIBLND) { - snprintf(err_str, - sizeof(err_str), - "\"obselete LNet type '%s'\"", libcfs_lnd2str(net)); - rc = LUSTRE_CFG_RC_BAD_PARAM; - goto out; - } - gateway_nid = libcfs_str2nid(gw); if (gateway_nid == LNET_NID_ANY) { snprintf(err_str, @@ -395,17 +909,6 @@ int lustre_lnet_del_route(char *nw, char *gw, goto out; } - if (LNET_NETTYP(net) == CIBLND || - LNET_NETTYP(net) == OPENIBLND || - LNET_NETTYP(net) == IIBLND || - LNET_NETTYP(net) == VIBLND) { - snprintf(err_str, - sizeof(err_str), - "\"obselete LNet type '%s'\"", libcfs_lnd2str(net)); - rc = LUSTRE_CFG_RC_BAD_PARAM; - goto out; - } - gateway_nid = libcfs_str2nid(gw); if (gateway_nid == LNET_NID_ANY) { snprintf(err_str, @@ -462,17 +965,6 @@ int lustre_lnet_show_route(char *nw, char *gw, int hops, int prio, int detail, goto out; } - if (LNET_NETTYP(net) == CIBLND || - LNET_NETTYP(net) == OPENIBLND || - LNET_NETTYP(net) == IIBLND || - LNET_NETTYP(net) == VIBLND) { - snprintf(err_str, - sizeof(err_str), - "\"obsolete LNet type '%s'\"", - libcfs_lnd2str(net)); - rc = LUSTRE_CFG_RC_BAD_PARAM; - goto out; - } } else { /* show all routes without filtering on net */ net = LNET_NIDNET(LNET_NID_ANY); @@ -557,8 +1049,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; @@ -619,106 +1111,563 @@ out: return rc; } -int lustre_lnet_config_net(char *net, char *intf, char *ip2net, - int peer_to, int peer_cr, int peer_buf_cr, - int credits, char *smp, int seq_no, - struct lnet_ioctl_config_lnd_tunables *lnd_tunables, - struct cYAML **err_rc) +static int socket_intf_query(int request, char *intf, + struct ifreq *ifr) { - struct lnet_ioctl_config_lnd_tunables *lnd = NULL; - struct lnet_ioctl_config_data *data; - size_t ioctl_size = sizeof(*data); - char buf[LNET_MAX_STR_LEN]; - int rc = LUSTRE_CFG_RC_NO_ERR; - char err_str[LNET_MAX_STR_LEN]; + int rc = 0; + int sockfd; - snprintf(err_str, sizeof(err_str), "\"success\""); + if (strlen(intf) >= IFNAMSIZ || ifr == NULL) + return LUSTRE_CFG_RC_BAD_PARAM; - /* No need to register lo */ - if (net != NULL && !strcmp(net, "lo")) - return 0; + sockfd = socket(AF_INET, SOCK_DGRAM, 0); + if (sockfd < 0) + return LUSTRE_CFG_RC_BAD_PARAM; - if (ip2net == NULL && (intf == NULL || net == NULL)) { - snprintf(err_str, - sizeof(err_str), - "\"mandatory parameter '%s' not specified." - " Optionally specify ip2net parameter\"", - (intf == NULL && net == NULL) ? "net, if" : - (intf == NULL) ? "if" : "net"); - rc = LUSTRE_CFG_RC_MISSING_PARAM; - goto out; - } + strcpy(ifr->ifr_name, intf); + rc = ioctl(sockfd, request, ifr); + if (rc != 0) + rc = LUSTRE_CFG_RC_BAD_PARAM; - if (peer_to != -1 && peer_to <= 0) { - snprintf(err_str, - sizeof(err_str), - "\"peer timeout %d, must be greater than 0\"", - peer_to); - rc = LUSTRE_CFG_RC_OUT_OF_RANGE_PARAM; - goto out; - } + close(sockfd); - if (ip2net != NULL && strlen(ip2net) >= sizeof(buf)) { - snprintf(err_str, - sizeof(err_str), - "\"ip2net string too long %d\"", + return rc; +} + +/* + * for each interface in the array of interfaces find the IP address of + * that interface, create its nid and add it to an array of NIDs. + * 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) +{ + int i = 0, count = 0, rc; + struct ifreq ifr; + __u32 ip; + struct lnet_dlc_intf_descr *intf; + + if (nw == NULL || nids == NULL) + return LUSTRE_CFG_RC_BAD_PARAM; + + list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) + count++; + + *nids = calloc(count, sizeof(lnet_nid_t)); + if (*nids == NULL) + 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; + goto failed; + } + + memset(&ifr, 0, sizeof(ifr)); + rc = socket_intf_query(SIOCGIFADDR, intf->intf_name, &ifr); + if (rc != 0) + goto failed; + + ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr; + ip = bswap_32(ip); + (*nids)[i] = LNET_MKNID(nw->nw_id, ip); + i++; + } + + *nnids = count; + + return 0; + +failed: + free(*nids); + *nids = NULL; + return rc; +} + +/* + * called repeatedly until a match or no more ip range + * What do you have? + * ip_range expression + * interface list with all the interface names. + * all the interfaces in the system. + * + * try to match the ip_range expr to one of the interfaces' IPs in + * the system. If we hit a patch for an interface. Check if that + * interface name is in the list. + * + * If there are more than one interface in the list, then make sure + * that the IPs for all of these interfaces match the ip ranges + * given. + * + * for each interface in intf_list + * look up the intf name in ifa + * if not there then no match + * check ip obtained from ifa against a match to any of the + * ip_ranges given. + * If no match, then fail + * + * The result is that all the interfaces have to match. + */ +int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, + struct list_head *intf_list, + struct list_head *ip_ranges) +{ + int rc; + __u32 ip; + struct lnet_dlc_intf_descr *intf_descr, *tmp; + struct ifaddrs *ifaddr = ifa; + struct lustre_lnet_ip_range_descr *ip_range; + int family; + + /* + * if there are no explicit interfaces, and no ip ranges, then + * configure the first tcp interface we encounter. + */ + if (list_empty(intf_list) && list_empty(ip_ranges)) { + for (ifaddr = ifa; ifaddr != NULL; ifaddr = ifaddr->ifa_next) { + if (ifaddr->ifa_addr == NULL) + continue; + + if ((ifaddr->ifa_flags & IFF_UP) == 0) + continue; + + family = ifaddr->ifa_addr->sa_family; + 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; + } + } + return LUSTRE_CFG_RC_NO_MATCH; + } + + /* + * First interface which matches an IP pattern will be used + */ + if (list_empty(intf_list)) { + /* + * no interfaces provided in the rule, but an ip range is + * provided, so try and match an interface to the ip + * range. + */ + for (ifaddr = ifa; ifaddr != NULL; ifaddr = ifaddr->ifa_next) { + if (ifaddr->ifa_addr == NULL) + continue; + + if ((ifaddr->ifa_flags & IFF_UP) == 0) + continue; + + family = ifaddr->ifa_addr->sa_family; + if (family == AF_INET) { + ip = ((struct sockaddr_in *)ifaddr->ifa_addr)-> + sin_addr.s_addr; + + list_for_each_entry(ip_range, ip_ranges, + ipr_entry) { + rc = cfs_ip_addr_match(bswap_32(ip), + &ip_range->ipr_expr); + if (!rc) + continue; + + rc = lustre_lnet_add_intf_descr + (intf_list, ifaddr->ifa_name, + strlen(ifaddr->ifa_name)); + + if (rc != LUSTRE_CFG_RC_NO_ERR) + return rc; + } + } + } + + if (!list_empty(intf_list)) + return LUSTRE_CFG_RC_MATCH; + + return LUSTRE_CFG_RC_NO_MATCH; + } + + /* + * If an interface is explicitly specified the ip-range might or + * might not be specified. if specified the interface needs to match the + * ip-range. If no ip-range then the interfaces are + * automatically matched if they are all up. + * If > 1 interfaces all the interfaces must match for the NI to + * be configured. + */ + 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; + + family = ifaddr->ifa_addr->sa_family; + if (family == AF_INET && + strcmp(intf_descr->intf_name, + ifaddr->ifa_name) == 0) + break; + } + + if (ifaddr == NULL) { + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + continue; + } + + 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; + } + + if (!rc) { + /* no match for this interface */ + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + } + } + + return LUSTRE_CFG_RC_MATCH; +} + +int lustre_lnet_resolve_ip2nets_rule(struct lustre_lnet_ip2nets *ip2nets, + lnet_nid_t **nids, __u32 *nnids) +{ + struct ifaddrs *ifa; + int rc = LUSTRE_CFG_RC_NO_ERR; + + rc = getifaddrs(&ifa); + if (rc < 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) { + freeifaddrs(ifa); + return rc; + } + + rc = lustre_lnet_intf2nids(&ip2nets->ip2nets_net, nids, nnids); + if (rc != LUSTRE_CFG_RC_NO_ERR) { + *nids = NULL; + *nnids = 0; + } + + freeifaddrs(ifa); + + return rc; +} + +static int +lustre_lnet_ioctl_config_ni(struct list_head *intf_list, + struct lnet_ioctl_config_lnd_tunables *tunables, + struct cfs_expr_list *global_cpts, + lnet_nid_t *nids, char *err_str) +{ + char *data; + struct lnet_ioctl_config_ni *conf; + struct lnet_ioctl_config_lnd_tunables *tun = NULL; + int rc = LUSTRE_CFG_RC_NO_ERR, i = 0; + size_t len; + int count; + struct lnet_dlc_intf_descr *intf_descr; + __u32 *cpt_array; + struct cfs_expr_list *cpt_expr; + + list_for_each_entry(intf_descr, intf_list, + intf_on_network) { + 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 (tunables != NULL) + tun = (struct lnet_ioctl_config_lnd_tunables*) + conf->lic_bulk; + + LIBCFS_IOC_INIT_V2(*conf, lic_cfg_hdr); + conf->lic_cfg_hdr.ioc_len = len; + conf->lic_nid = nids[i]; + strncpy(conf->lic_ni_intf[0], intf_descr->intf_name, + LNET_MAX_STR_LEN); + + if (intf_descr->cpt_expr != NULL) + cpt_expr = intf_descr->cpt_expr; + else if (global_cpts != NULL) + cpt_expr = global_cpts; + else + cpt_expr = NULL; + + if (cpt_expr != NULL) { + count = cfs_expr_list_values(cpt_expr, + LNET_MAX_SHOW_NUM_CPT, + &cpt_array); + if (count > 0) { + memcpy(conf->lic_cpts, cpt_array, + sizeof(cpt_array[0]) * LNET_MAX_STR_LEN); + free(cpt_array); + } else { + count = 0; + } + } else { + count = 0; + } + + conf->lic_ncpts = count; + + if (tunables != NULL) + memcpy(tun, tunables, sizeof(*tunables)); + + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_LOCAL_NI, data); + if (rc < 0) { + rc = -errno; + snprintf(err_str, + LNET_MAX_STR_LEN, + "\"cannot add network: %s\"", strerror(errno)); + free(data); + return rc; + } + free(data); + i++; + } + + return LUSTRE_CFG_RC_NO_ERR; +} + +int +lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets, + struct lnet_ioctl_config_lnd_tunables *tunables, + struct cfs_expr_list *global_cpts, + int seq_no, struct cYAML **err_rc) +{ + lnet_nid_t *nids = NULL; + __u32 nnids = 0; + int rc; + char err_str[LNET_MAX_STR_LEN]; + + snprintf(err_str, sizeof(err_str), "\"success\""); + + if (!ip2nets) { + snprintf(err_str, + sizeof(err_str), + "\"incomplete ip2nets information\""); + rc = LUSTRE_CFG_RC_BAD_PARAM; + 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, + sizeof(err_str), + "\"cannot resolve ip2nets rule\""); + 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); + +free_nids_out: + free(nids); + +out: + cYAML_build_error(rc, seq_no, ADD_CMD, "ip2nets", err_str, err_rc); + return rc; +} + +int lustre_lnet_config_ni(struct lnet_dlc_network_descr *nw_descr, + struct cfs_expr_list *global_cpts, + char *ip2net, + struct lnet_ioctl_config_lnd_tunables *tunables, + int seq_no, struct cYAML **err_rc) +{ + char *data = NULL; + struct lnet_ioctl_config_ni *conf; + struct lnet_ioctl_config_lnd_tunables *tun = NULL; + char buf[LNET_MAX_STR_LEN]; + int rc = LUSTRE_CFG_RC_NO_ERR; + char err_str[LNET_MAX_STR_LEN]; + lnet_nid_t *nids = NULL; + __u32 nnids = 0; + size_t len; + int count; + struct lnet_dlc_intf_descr *intf_descr, *tmp; + __u32 *cpt_array; + + snprintf(err_str, sizeof(err_str), "\"success\""); + + if (ip2net == NULL && nw_descr == NULL) { + snprintf(err_str, + sizeof(err_str), + "\"mandatory parameters not specified.\""); + rc = LUSTRE_CFG_RC_MISSING_PARAM; + goto out; + } + + if (ip2net != NULL && strlen(ip2net) >= sizeof(buf)) { + snprintf(err_str, + sizeof(err_str), + "\"ip2net string too long %d\"", (int)strlen(ip2net)); rc = LUSTRE_CFG_RC_OUT_OF_RANGE_PARAM; goto out; } - if (lnd_tunables != NULL) - ioctl_size += sizeof(*lnd_tunables); + if (ip2net != 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) { + 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*) + (data + sizeof(*conf)); + + LIBCFS_IOC_INIT_V2(*conf, lic_cfg_hdr); + conf->lic_cfg_hdr.ioc_len = len; + strncpy(conf->lic_legacy_ip2nets, ip2net, + LNET_MAX_STR_LEN); + + if (global_cpts != NULL) { + count = cfs_expr_list_values(global_cpts, + LNET_MAX_SHOW_NUM_CPT, + &cpt_array); + if (count > 0) { + memcpy(conf->lic_cpts, cpt_array, + sizeof(cpt_array[0]) * LNET_MAX_STR_LEN); + free(cpt_array); + } else { + count = 0; + } + } else { + count = 0; + } - data = calloc(1, ioctl_size); - if (data == NULL) - goto out; + conf->lic_ncpts = count; - if (ip2net == NULL) - snprintf(buf, sizeof(buf) - 1, "%s(%s)%s", - net, intf, - (smp) ? smp : ""); + if (tunables != NULL) + memcpy(tun, tunables, sizeof(*tunables)); - LIBCFS_IOC_INIT_V2(*data, cfg_hdr); - strncpy(data->cfg_config_u.cfg_net.net_intf, - (ip2net != NULL) ? ip2net : buf, sizeof(buf)); - data->cfg_config_u.cfg_net.net_peer_timeout = peer_to; - data->cfg_config_u.cfg_net.net_peer_tx_credits = peer_cr; - data->cfg_config_u.cfg_net.net_peer_rtr_credits = peer_buf_cr; - data->cfg_config_u.cfg_net.net_max_tx_credits = credits; - /* Add in tunable settings if available */ - if (lnd_tunables != NULL) { - lnd = (struct lnet_ioctl_config_lnd_tunables *)data->cfg_bulk; + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_LOCAL_NI, data); + if (rc < 0) { + rc = -errno; + snprintf(err_str, + sizeof(err_str), + "\"cannot add network: %s\"", strerror(errno)); + goto out; + } - data->cfg_hdr.ioc_len = ioctl_size; - memcpy(lnd, lnd_tunables, sizeof(*lnd_tunables)); + goto out; } - rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_NET, data); - if (rc < 0) { - rc = -errno; + 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, - sizeof(err_str), - "\"cannot add network: %s\"", strerror(errno)); + sizeof(err_str), + "\"cannot parse net '%s'\"", + libcfs_net2str(nw_descr->nw_id)); + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; } - free(data); + + if (list_empty(&nw_descr->nw_intflist)) { + snprintf(err_str, + sizeof(err_str), + "\"no interface name provided\""); + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + + rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids); + if (rc != 0) { + snprintf(err_str, sizeof(err_str), + "\"bad parameter\""); + rc = LUSTRE_CFG_RC_BAD_PARAM; + goto out; + } + + rc = lustre_lnet_ioctl_config_ni(&nw_descr->nw_intflist, + tunables, global_cpts, nids, + err_str); out: + if (nw_descr != NULL) { + list_for_each_entry_safe(intf_descr, tmp, + &nw_descr->nw_intflist, + intf_on_network) { + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + } + } + cYAML_build_error(rc, seq_no, ADD_CMD, "net", err_str, err_rc); + if (nids) + free(nids); + + if (data) + free(data); + return rc; } -int lustre_lnet_del_net(char *nw, int seq_no, struct cYAML **err_rc) +int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr, + int seq_no, struct cYAML **err_rc) { - struct lnet_ioctl_config_data data; - __u32 net = LNET_NIDNET(LNET_NID_ANY); - int rc = LUSTRE_CFG_RC_NO_ERR; + struct lnet_ioctl_config_ni data; + int rc = LUSTRE_CFG_RC_NO_ERR, i; char err_str[LNET_MAX_STR_LEN]; + lnet_nid_t *nids = NULL; + __u32 nnids = 0; + struct lnet_dlc_intf_descr *intf_descr, *tmp; snprintf(err_str, sizeof(err_str), "\"success\""); - if (nw == NULL) { + if (nw_descr == NULL) { snprintf(err_str, sizeof(err_str), "\"missing mandatory parameter\""); @@ -726,30 +1675,66 @@ int lustre_lnet_del_net(char *nw, int seq_no, struct cYAML **err_rc) goto out; } - net = libcfs_str2net(nw); - if (net == LNET_NIDNET(LNET_NID_ANY)) { + 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), - "\"cannot parse net '%s'\"", nw); + "\"cannot parse net '%s'\"", + libcfs_net2str(nw_descr->nw_id)); rc = LUSTRE_CFG_RC_BAD_PARAM; goto out; } - LIBCFS_IOC_INIT_V2(data, cfg_hdr); - data.cfg_net = net; - - rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_NET, &data); + rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids); if (rc != 0) { - rc = -errno; - snprintf(err_str, - sizeof(err_str), - "\"cannot delete network: %s\"", strerror(errno)); + snprintf(err_str, sizeof(err_str), + "\"bad parameter\""); + rc = LUSTRE_CFG_RC_BAD_PARAM; goto out; } + /* + * no interfaces just the nw_id is specified + */ + if (nnids == 0) { + nids = calloc(1, sizeof(*nids)); + if (nids == NULL) { + snprintf(err_str, sizeof(err_str), + "\"out of memory\""); + rc = LUSTRE_CFG_RC_OUT_OF_MEM; + goto out; + } + nids[0] = LNET_MKNID(nw_descr->nw_id, 0); + nnids = 1; + } + + for (i = 0; i < nnids; i++) { + LIBCFS_IOC_INIT_V2(data, lic_cfg_hdr); + data.lic_nid = nids[i]; + + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_LOCAL_NI, &data); + if (rc < 0) { + rc = -errno; + snprintf(err_str, + sizeof(err_str), + "\"cannot del network: %s\"", strerror(errno)); + } + } + + list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, + intf_on_network) { + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + } + out: cYAML_build_error(rc, seq_no, DEL_CMD, "net", err_str, err_rc); + if (nids != NULL) + free(nids); + return rc; } @@ -757,29 +1742,32 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, struct cYAML **show_rc, struct cYAML **err_rc) { char *buf; - struct lnet_ioctl_config_lnd_tunables *lnd_cfg; - struct lnet_ioctl_config_data *data; - struct lnet_ioctl_net_config *net_config; + struct lnet_ioctl_config_ni *ni_data; + struct lnet_ioctl_config_lnd_tunables *lnd; + struct lnet_ioctl_element_stats *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; int l_errno = 0; - struct cYAML *root = NULL, *tunables = NULL, *net_node = NULL, - *interfaces = NULL, *item = NULL, *first_seq = NULL; + struct cYAML *root = NULL, *tunables = NULL, + *net_node = NULL, *interfaces = NULL, + *item = NULL, *first_seq = NULL, + *tmp = NULL, *statistics = NULL; int str_buf_len = LNET_MAX_SHOW_NUM_CPT * 2; char str_buf[str_buf_len]; char *pos; char err_str[LNET_MAX_STR_LEN]; - bool exist = false; - size_t buf_len; + bool exist = false, new_net = true; + int net_num = 0; + size_t buf_size = sizeof(*ni_data) + sizeof(*lnd) + sizeof(*stats); snprintf(err_str, sizeof(err_str), "\"out of memory\""); - buf_len = sizeof(*data) + sizeof(*net_config) + sizeof(*lnd_cfg); - buf = calloc(1, buf_len); + buf = calloc(1, buf_size); if (buf == NULL) goto out; - data = (struct lnet_ioctl_config_data *)buf; + ni_data = (struct lnet_ioctl_config_ni *)buf; if (nw != NULL) { net = libcfs_str2net(nw); @@ -802,116 +1790,158 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, for (i = 0;; i++) { pos = str_buf; + __u32 rc_net; - memset(buf, 0, buf_len); + memset(buf, 0, buf_size); - LIBCFS_IOC_INIT_V2(*data, cfg_hdr); + LIBCFS_IOC_INIT_V2(*ni_data, lic_cfg_hdr); /* * set the ioc_len to the proper value since INIT assumes * size of data */ - data->cfg_hdr.ioc_len = buf_len; - data->cfg_count = i; + ni_data->lic_cfg_hdr.ioc_len = buf_size; + ni_data->lic_idx = i; - rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_NET, data); + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_LOCAL_NI, ni_data); if (rc != 0) { l_errno = errno; break; } + rc_net = LNET_NIDNET(ni_data->lic_nid); + /* filter on provided data */ if (net != LNET_NIDNET(LNET_NID_ANY) && - net != LNET_NIDNET(data->cfg_nid)) + net != rc_net) continue; /* default rc to -1 in case we hit the goto */ rc = -1; exist = true; - net_config = (struct lnet_ioctl_net_config *)data->cfg_bulk; + stats = (struct lnet_ioctl_element_stats *)ni_data->lic_bulk; + lnd = (struct lnet_ioctl_config_lnd_tunables *) + (ni_data->lic_bulk + sizeof(*stats)); + + if (rc_net != prev_net) { + prev_net = rc_net; + new_net = true; + net_num++; + } + + if (new_net) { + if (!cYAML_create_string(net_node, "net type", + libcfs_net2str(rc_net))) + goto out; + + tmp = cYAML_create_seq(net_node, "local NI(s)"); + if (tmp == NULL) + goto out; + new_net = false; + } /* create the tree to be printed. */ - item = cYAML_create_seq_item(net_node); + item = cYAML_create_seq_item(tmp); if (item == NULL) goto out; if (first_seq == NULL) first_seq = item; - if (cYAML_create_string(item, "net", - libcfs_net2str( - LNET_NIDNET(data->cfg_nid))) - == NULL) - goto out; - if (cYAML_create_string(item, "nid", - libcfs_nid2str(data->cfg_nid)) == NULL) + libcfs_nid2str(ni_data->lic_nid)) == NULL) goto out; - if (cYAML_create_string(item, "status", - (net_config->ni_status == + if (cYAML_create_string(item, + "status", + (ni_data->lic_status == LNET_NI_STATUS_UP) ? "up" : "down") == NULL) goto out; /* don't add interfaces unless there is at least one * interface */ - if (strlen(net_config->ni_interfaces[0]) > 0) { + if (strlen(ni_data->lic_ni_intf[0]) > 0) { interfaces = cYAML_create_object(item, "interfaces"); if (interfaces == NULL) goto out; - for (j = 0; j < LNET_MAX_INTERFACES; j++) { - if (lustre_interface_show_net(interfaces, j, - detail, data, - net_config) < 0) - goto out; + 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 (cYAML_create_string(interfaces, + str_buf, + ni_data->lic_ni_intf[j]) == + NULL) + goto out; + } } } if (detail) { char *limit; + statistics = cYAML_create_object(item, "statistics"); + if (statistics == NULL) + goto out; + + if (cYAML_create_number(statistics, "send_count", + stats->iel_send_count) + == NULL) + goto out; + + if (cYAML_create_number(statistics, "recv_count", + stats->iel_recv_count) + == NULL) + goto out; + + if (cYAML_create_number(statistics, "drop_count", + stats->iel_drop_count) + == NULL) + goto out; + tunables = cYAML_create_object(item, "tunables"); - if (tunables == NULL) + if (!tunables) + goto out; + + rc = lustre_net_show_tunables(tunables, &lnd->lt_cmn); + if (rc != LUSTRE_CFG_RC_NO_ERR) goto out; - if (cYAML_create_number(tunables, "peer_timeout", - data->cfg_config_u.cfg_net. - net_peer_timeout) == NULL) + tunables = cYAML_create_object(item, "lnd tunables"); + if (tunables == NULL) goto out; - if (cYAML_create_number(tunables, "peer_credits", - data->cfg_config_u.cfg_net. - net_peer_tx_credits) == NULL) + rc = lustre_ni_show_tunables(tunables, LNET_NETTYP(rc_net), + &lnd->lt_tun); + if (rc != LUSTRE_CFG_RC_NO_ERR) goto out; - if (cYAML_create_number(tunables, - "peer_buffer_credits", - data->cfg_config_u.cfg_net. - net_peer_rtr_credits) == NULL) + if (cYAML_create_number(item, "tcp bonding", + ni_data->lic_tcp_bonding) + == NULL) goto out; - if (cYAML_create_number(tunables, "credits", - data->cfg_config_u.cfg_net. - net_max_tx_credits) == NULL) + if (cYAML_create_number(item, "dev cpt", + ni_data->lic_dev_cpt) == 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, "\"["); - for (j = 0 ; data->cfg_ncpts > 1 && - j < data->cfg_ncpts && + for (j = 0 ; ni_data->lic_ncpts >= 1 && + j < ni_data->lic_ncpts && pos < limit; j++) { pos += snprintf(pos, limit - pos, - "%d", net_config->ni_cpts[j]); - if ((j + 1) < data->cfg_ncpts) + "%d", ni_data->lic_cpts[j]); + if ((j + 1) < ni_data->lic_ncpts) pos += snprintf(pos, limit - pos, ","); } pos += snprintf(pos, 3, "]\""); - if (data->cfg_ncpts > 1 && - cYAML_create_string(tunables, "CPT", + if (ni_data->lic_ncpts >= 1 && + cYAML_create_string(item, "CPT", str_buf) == NULL) goto out; } @@ -990,28 +2020,107 @@ out: 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)); + + cYAML_build_error(rc, seq_no, ADD_CMD, "max_interfaces", err_str, err_rc); + + return rc; +} + +int lustre_lnet_config_discovery(int enable, int seq_no, struct cYAML **err_rc) +{ + int rc = LUSTRE_CFG_RC_NO_ERR; + char err_str[LNET_MAX_STR_LEN]; + char val[LNET_MAX_STR_LEN]; + + snprintf(err_str, sizeof(err_str), "\"success\""); + + snprintf(val, sizeof(val), "%u", (enable) ? 0 : 1); + + rc = write_sysfs_file(modparam_path, "lnet_peer_discovery_disabled", val, + 1, strlen(val) + 1); + if (rc) + snprintf(err_str, sizeof(err_str), + "\"cannot configure discovery: %s\"", + strerror(errno)); + + cYAML_build_error(rc, seq_no, ADD_CMD, "discovery", err_str, err_rc); + + return rc; + +} + +int lustre_lnet_config_numa_range(int range, int seq_no, struct cYAML **err_rc) +{ + struct lnet_ioctl_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, sv_hdr); + data.sv_value = range; + + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_SET_NUMA_RANGE, &data); + if (rc != 0) { + rc = -errno; + snprintf(err_str, + sizeof(err_str), + "\"cannot configure numa_range: %s\"", strerror(errno)); + goto out; + } + +out: + cYAML_build_error(rc, seq_no, ADD_CMD, "numa_range", err_str, err_rc); + + return 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) { @@ -1181,28 +2290,33 @@ out: return rc; } -int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc, - struct cYAML **err_rc) +int lustre_lnet_show_peer(char *knid, int detail, int seq_no, + struct cYAML **show_rc, struct cYAML **err_rc) { - 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; - int rc = LUSTRE_CFG_RC_OUT_OF_MEM, ncpt = 0, i = 0, j = 0; + struct lnet_ioctl_element_stats *lpni_stats; + lnet_nid_t *nidp; + int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + int i; + int j; int l_errno = 0; + __u32 count; + __u32 size; struct cYAML *root = NULL, *peer = NULL, *peer_ni = NULL, *first_seq = NULL, *peer_root = NULL, *tmp = NULL; char err_str[LNET_MAX_STR_LEN]; - lnet_nid_t prev_primary_nid = LNET_NID_ANY, primary_nid = LNET_NID_ANY; - char *data = calloc(sizeof(*peer_info) + sizeof(*lpni_cri), 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) @@ -1212,61 +2326,121 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc, if (peer_root == NULL) goto out; - if (knid != NULL) - primary_nid = libcfs_str2nid(knid); - - do { - for (i = 0;; i++) { - memset(data, 0, sizeof(*peer_info) + sizeof(*lpni_cri)); - LIBCFS_IOC_INIT_V2(*peer_info, prcfg_hdr); - peer_info->prcfg_hdr.ioc_len = sizeof(*peer_info) + - sizeof(*lpni_cri); - peer_info->prcfg_idx = i; - - rc = l_ioctl(LNET_DEV_ID, - IOC_LIBCFS_GET_PEER_NI, peer_info); - if (rc != 0) { - l_errno = errno; + count = 1000; + size = count * sizeof(lnet_process_id_t); + list = malloc(size); + if (list == NULL) { + l_errno = ENOMEM; + goto out; + } + if (knid != NULL) { + list[0].nid = libcfs_str2nid(knid); + count = 1; + } else { + for (;;) { + memset(&peer_info, 0, sizeof(peer_info)); + LIBCFS_IOC_INIT_V2(peer_info, prcfg_hdr); + peer_info.prcfg_hdr.ioc_len = sizeof(peer_info); + peer_info.prcfg_size = size; + peer_info.prcfg_bulk = list; + + l_errno = 0; + rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_PEER_LIST, + &peer_info); + count = peer_info.prcfg_count; + if (rc == 0) break; + l_errno = errno; + if (l_errno != E2BIG) { + snprintf(err_str, + sizeof(err_str), + "\"cannot get peer list: %s\"", + strerror(l_errno)); + rc = -l_errno; + goto out; } + free(list); + size = peer_info.prcfg_size; + list = malloc(size); + if (list == NULL) { + l_errno = ENOMEM; + goto out; + } + } + } - if (primary_nid != LNET_NID_ANY && - primary_nid != peer_info->prcfg_key_nid) - continue; + 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; + } + } - lpni_cri = (struct lnet_peer_ni_credit_info*)peer_info->prcfg_bulk; + 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; - tmp = cYAML_create_seq(peer, "peer ni"); - if (tmp == NULL) - goto out; - new_peer = false; - } + tmp = cYAML_create_seq(peer, "peer ni"); + if (tmp == NULL) + goto out; - if (first_seq == NULL) - first_seq = peer; + lpni_data = data; + for (j = 0; j < peer_info.prcfg_count; j++) { + nidp = lpni_data; + lpni_cri = (void*)nidp + sizeof(nidp); + lpni_stats = (void *)lpni_cri + sizeof(*lpni_cri); + lpni_data = (void *)lpni_stats + sizeof(*lpni_stats); peer_ni = cYAML_create_seq_item(tmp); if (peer_ni == NULL) goto out; if (cYAML_create_string(peer_ni, "nid", - libcfs_nid2str - (peer_info->prcfg_cfg_nid)) + libcfs_nid2str(*nidp)) == NULL) goto out; @@ -1275,82 +2449,389 @@ int lustre_lnet_show_peer(char *knid, int seq_no, struct cYAML **show_rc, == NULL) goto out; + if (!detail) + continue; + + if (cYAML_create_number(peer_ni, "max_ni_tx_credits", + lpni_cri->cr_ni_peer_tx_credits) + == NULL) + goto out; + + if (cYAML_create_number(peer_ni, "available_tx_credits", + lpni_cri->cr_peer_tx_credits) + == 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) + goto out; + + if (cYAML_create_number(peer_ni, "min_rtr_credits", + lpni_cri->cr_peer_min_rtr_credits) + == NULL) + goto out; + + if (cYAML_create_number(peer_ni, "send_count", + lpni_stats->iel_send_count) + == NULL) + goto out; + + if (cYAML_create_number(peer_ni, "recv_count", + lpni_stats->iel_recv_count) + == NULL) + goto out; + + if (cYAML_create_number(peer_ni, "drop_count", + lpni_stats->iel_drop_count) + == NULL) + goto out; + if (cYAML_create_number(peer_ni, "refcount", lpni_cri->cr_refcount) == NULL) goto out; + } + } + + /* print output iff show_rc is not provided */ + if (show_rc == NULL) + cYAML_print_tree(root); + + snprintf(err_str, sizeof(err_str), "\"success\""); + rc = LUSTRE_CFG_RC_NO_ERR; + +out: + free(list); + free(data); + if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) { + cYAML_free_tree(root); + } else if (show_rc != NULL && *show_rc != NULL) { + struct cYAML *show_node; + /* find the peer node, if one doesn't exist then + * insert one. Otherwise add to the one there + */ + show_node = cYAML_get_object_item(*show_rc, + "peer"); + if (show_node != NULL && cYAML_is_sequence(show_node)) { + cYAML_insert_child(show_node, first_seq); + free(peer_root); + free(root); + } else if (show_node == NULL) { + cYAML_insert_sibling((*show_rc)->cy_child, + peer_root); + free(root); + } else { + cYAML_free_tree(root); + } + } else { + *show_rc = root; + } + + cYAML_build_error(rc, seq_no, SHOW_CMD, "peer", err_str, + err_rc); + + return rc; +} + +int lustre_lnet_list_peer(int seq_no, + struct cYAML **show_rc, struct cYAML **err_rc) +{ + struct lnet_ioctl_peer_cfg peer_info; + int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + __u32 count; + __u32 size; + int i = 0; + int l_errno = 0; + struct cYAML *root = NULL, *list_root = NULL, *first_seq = NULL; + char err_str[LNET_MAX_STR_LEN]; + lnet_process_id_t *list = NULL; + + snprintf(err_str, sizeof(err_str), + "\"out of memory\""); + + 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 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; + } + } + + /* 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) + cYAML_print_tree(root); + + snprintf(err_str, sizeof(err_str), "\"success\""); + 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) { + 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(list_root); + free(root); + } else if (show_node == NULL) { + cYAML_insert_sibling((*show_rc)->cy_child, + list_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; +} + +static void add_to_global(struct cYAML *show_rc, struct cYAML *node, + struct cYAML *root) +{ + struct cYAML *show_node; + + show_node = cYAML_get_object_item(show_rc, "global"); + if (show_node != NULL) + cYAML_insert_sibling(show_node->cy_child, + node->cy_child); + else + cYAML_insert_sibling(show_rc->cy_child, + node); + free(root); +} + +int lustre_lnet_show_max_intf(int seq_no, struct cYAML **show_rc, + struct cYAML **err_rc) +{ + int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + char val[LNET_MAX_STR_LEN]; + int max_intf; + char err_str[LNET_MAX_STR_LEN]; + struct cYAML *root = NULL, *global = NULL; + + snprintf(err_str, sizeof(err_str), "\"out of memory\""); + + rc = read_sysfs_file(modparam_path, "lnet_interfaces_max", val, + 1, LNET_MAX_STR_LEN); + if (rc) { + snprintf(err_str, sizeof(err_str), + "\"cannot get max interfaces: %d\"", rc); + goto out; + } + + max_intf = atoi(val); + + root = cYAML_create_object(NULL, NULL); + if (root == NULL) + goto out; + + global = cYAML_create_object(root, "global"); + if (global == NULL) + goto out; + + if (cYAML_create_number(global, "max_intf", + max_intf) == NULL) + goto out; + + if (show_rc == NULL) + cYAML_print_tree(root); + + snprintf(err_str, sizeof(err_str), "\"success\""); + 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) + add_to_global(*show_rc, global, root); + else + *show_rc = root; + + cYAML_build_error(rc, seq_no, SHOW_CMD, "global", err_str, err_rc); + + return rc; +} + +int lustre_lnet_show_discovery(int seq_no, struct cYAML **show_rc, + struct cYAML **err_rc) +{ + int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + char val[LNET_MAX_STR_LEN]; + __u32 discovery; + char err_str[LNET_MAX_STR_LEN]; + struct cYAML *root = NULL, *global = NULL; + + snprintf(err_str, sizeof(err_str), "\"out of memory\""); + + rc = read_sysfs_file(modparam_path, "lnet_peer_discovery_disabled", val, + 1, sizeof(val)); + if (rc) { + snprintf(err_str, sizeof(err_str), + "\"cannot get discovery value: %d\"", rc); + goto out; + } + + /* + * the sysfs parameter read indicates if discovery is disabled, + * but we report if discovery is enabled. + */ + discovery = !atoi(val); + + root = cYAML_create_object(NULL, NULL); + if (root == NULL) + goto out; + + global = cYAML_create_object(root, "global"); + if (global == NULL) + goto out; + + if (cYAML_create_number(global, "discovery", + discovery) == NULL) + goto out; + + if (show_rc == NULL) + cYAML_print_tree(root); + + snprintf(err_str, sizeof(err_str), "\"success\""); + + 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) { + add_to_global(*show_rc, global, root); + } else { + *show_rc = root; + } + + cYAML_build_error(rc, seq_no, SHOW_CMD, "global", err_str, err_rc); + + return rc; +} + +int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc, + struct cYAML **err_rc) +{ + struct lnet_ioctl_set_value data; + int rc; + int l_errno; + char err_str[LNET_MAX_STR_LEN]; + struct cYAML *root = NULL, *global = NULL; - if (cYAML_create_number(peer_ni, "max_ni_tx_credits", - lpni_cri->cr_ni_peer_tx_credits) - == NULL) - goto out; + snprintf(err_str, sizeof(err_str), "\"out of memory\""); - if (cYAML_create_number(peer_ni, "available_tx_credits", - lpni_cri->cr_peer_tx_credits) - == NULL) - goto out; + LIBCFS_IOC_INIT_V2(data, sv_hdr); - if (cYAML_create_number(peer_ni, "available_rtr_credits", - lpni_cri->cr_peer_rtr_credits) - == NULL) - goto out; + 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; + goto out; + } - if (cYAML_create_number(peer_ni, "min_rtr_credits", - lpni_cri->cr_peer_min_rtr_credits) - == NULL) - goto out; + rc = LUSTRE_CFG_RC_OUT_OF_MEM; - if (cYAML_create_number(peer_ni, "tx_q_num_of_buf", - lpni_cri->cr_peer_tx_qnob) - == NULL) - goto out; - } + root = cYAML_create_object(NULL, NULL); + if (root == NULL) + goto out; - if (l_errno != ENOENT) { - snprintf(err_str, - sizeof(err_str), - "\"cannot get peer information: %s\"", - strerror(l_errno)); - rc = -l_errno; - goto out; - } + global = cYAML_create_object(root, "global"); + if (global == NULL) + goto out; - j++; - } while (j < ncpt); + if (cYAML_create_number(global, "numa_range", + data.sv_value) == NULL) + goto out; - /* print output iff show_rc is not provided */ if (show_rc == NULL) cYAML_print_tree(root); snprintf(err_str, sizeof(err_str), "\"success\""); rc = LUSTRE_CFG_RC_NO_ERR; - out: 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); - } + add_to_global(*show_rc, global, root); } else { *show_rc = root; } - cYAML_build_error(rc, seq_no, SHOW_CMD, "peer", err_str, - err_rc); + cYAML_build_error(rc, seq_no, SHOW_CMD, "global", err_str, err_rc); return rc; } @@ -1359,7 +2840,7 @@ int lustre_lnet_show_stats(int seq_no, struct cYAML **show_rc, struct cYAML **err_rc) { struct lnet_ioctl_lnet_stats data; - int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + int rc; int l_errno; char err_str[LNET_MAX_STR_LEN]; struct cYAML *root = NULL, *stats = NULL; @@ -1379,6 +2860,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; @@ -1435,6 +2918,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); @@ -1474,132 +2958,434 @@ static int handle_yaml_config_route(struct cYAML *tree, struct cYAML **show_rc, err_rc); } -static int handle_yaml_config_net(struct cYAML *tree, struct cYAML **show_rc, - struct cYAML **err_rc) +static void yaml_free_string_array(char **array, int num) +{ + int i; + char **sub_array = array; + + for (i = 0; i < num; i++) { + if (*sub_array != NULL) + free(*sub_array); + sub_array++; + } + if (array) + free(array); +} + +/* + * interfaces: + * 0: ['['']'] + * 1: ['['']'] + */ +static int yaml_copy_intf_info(struct cYAML *intf_tree, + struct lnet_dlc_network_descr *nw_descr) +{ + struct cYAML *child = NULL; + int intf_num = 0, rc = LUSTRE_CFG_RC_NO_ERR; + struct lnet_dlc_intf_descr *intf_descr, *tmp; + + if (intf_tree == NULL || nw_descr == NULL) + return LUSTRE_CFG_RC_BAD_PARAM; + + /* now grab all the interfaces and their cpts */ + child = intf_tree->cy_child; + while (child != NULL) { + if (child->cy_valuestring == NULL) { + child = child->cy_next; + continue; + } + + if (strlen(child->cy_valuestring) >= LNET_MAX_STR_LEN) + goto failed; + + rc = lustre_lnet_add_intf_descr(&nw_descr->nw_intflist, + child->cy_valuestring, + strlen(child->cy_valuestring)); + if (rc != LUSTRE_CFG_RC_NO_ERR) + goto failed; + + intf_num++; + child = child->cy_next; + } + + if (intf_num == 0) + return LUSTRE_CFG_RC_MISSING_PARAM; + + return intf_num; + +failed: + list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, + intf_on_network) { + 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, + struct cfs_expr_list **global_cpts) +{ + struct cYAML *tun, *item, *smp; + int rc; + + tun = cYAML_get_object_item(tree, "tunables"); + if (tun != NULL) { + item = cYAML_get_object_item(tun, "peer_timeout"); + if (item != NULL) + tunables->lct_peer_timeout = item->cy_valueint; + item = cYAML_get_object_item(tun, "peer_credits"); + if (item != NULL) + tunables->lct_peer_tx_credits = item->cy_valueint; + item = cYAML_get_object_item(tun, "peer_buffer_credits"); + if (item != NULL) + tunables->lct_peer_rtr_credits = item->cy_valueint; + item = cYAML_get_object_item(tun, "credits"); + if (item != NULL) + tunables->lct_max_tx_credits = item->cy_valueint; + smp = cYAML_get_object_item(tun, "CPT"); + if (smp != NULL) { + 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; + } + + return false; +} + +static bool +yaml_extract_tunables(struct cYAML *tree, + struct lnet_ioctl_config_lnd_tunables *tunables, + struct cfs_expr_list **global_cpts, + __u32 net_type) +{ + bool rc; + + rc = yaml_extract_cmn_tunables(tree, &tunables->lt_cmn, + global_cpts); + + if (!rc) + return rc; + + lustre_yaml_extract_lnd_tunables(tree, net_type, + &tunables->lt_tun); + + return rc; +} + +/* + * net: + * - net type: [] + * local NI(s): + * - nid: @[] + * status: up + * interfaces: + * 0: ['['']'] + * 1: ['['']'] + * tunables: + * peer_timeout: + * peer_credits: + * peer_buffer_credits: + * credits: +* lnd tunables: + * peercredits_hiw: + * map_on_demand: + * concurrent_sends: + * fmr_pool_size: + * fmr_flush_trigger: + * fmr_cache: + * + * At least one interface is required. If no interfaces are provided the + * network interface can not be configured. + */ +static int handle_yaml_config_ni(struct cYAML *tree, struct cYAML **show_rc, + struct cYAML **err_rc) { - struct cYAML *net, *intf, *tunables, *seq_no, - *peer_to = NULL, *peer_buf_cr = NULL, *peer_cr = NULL, - *credits = NULL, *ip2net = NULL, *smp = NULL, *child; - struct lnet_ioctl_config_lnd_tunables *lnd_tunables_p = NULL; - struct lnet_ioctl_config_lnd_tunables lnd_tunables; - char devs[LNET_MAX_STR_LEN]; - char *loc = devs; - int size = LNET_MAX_STR_LEN; - int num; - bool intf_found = false; + struct cYAML *net, *intf, *seq_no, *ip2net = NULL, *local_nis = NULL, + *item = NULL; + 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; + bool found = false; + + memset(&tunables, 0, sizeof(tunables)); + + INIT_LIST_HEAD(&nw_descr.network_on_rule); + INIT_LIST_HEAD(&nw_descr.nw_intflist); ip2net = cYAML_get_object_item(tree, "ip2net"); - net = cYAML_get_object_item(tree, "net"); + 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 + * configure the network. + */ + if (!net && !ip2net) + return LUSTRE_CFG_RC_MISSING_PARAM; + + local_nis = cYAML_get_object_item(tree, "local NI(s)"); + if (local_nis == NULL) + return LUSTRE_CFG_RC_MISSING_PARAM; + + if (!cYAML_is_sequence(local_nis)) + return LUSTRE_CFG_RC_BAD_PARAM; + + while (cYAML_get_next_seq_item(local_nis, &item) != NULL) { + intf = cYAML_get_object_item(item, "interfaces"); + if (intf == NULL) + continue; + num_entries = yaml_copy_intf_info(intf, &nw_descr); + if (num_entries <= 0) { + cYAML_build_error(num_entries, -1, "ni", "add", + "bad interface list", + err_rc); + return LUSTRE_CFG_RC_BAD_PARAM; + } + } + + 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, + global_cpts, + (ip2net) ? ip2net->cy_valuestring : NULL, + (found) ? &tunables: NULL, + (seq_no) ? seq_no->cy_valueint : -1, + err_rc); + + if (global_cpts != NULL) + cfs_expr_list_free(global_cpts); + + return rc; +} + +/* + * ip2nets: + * - net-spec: [NUM] + * interfaces: + * 0: ['['']'] + * 1: ['['']'] + * ip-range: + * 0: + * 1: + */ +static int handle_yaml_config_ip2nets(struct cYAML *tree, + struct cYAML **show_rc, + struct cYAML **err_rc) +{ + struct cYAML *net, *ip_range, *item = NULL, *intf = NULL, + *seq_no = NULL; + struct lustre_lnet_ip2nets ip2nets; + struct lustre_lnet_ip_range_descr *ip_range_descr = NULL, + *tmp = NULL; + 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; + struct lnet_dlc_intf_descr *intf_descr, *intf_tmp; + bool found = false; + + memset(&tunables, 0, sizeof(tunables)); + + /* 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); + + net = cYAML_get_object_item(tree, "net-spec"); + if (net == NULL) + return LUSTRE_CFG_RC_BAD_PARAM; + + if (net != NULL && net->cy_valuestring == NULL) + return LUSTRE_CFG_RC_BAD_PARAM; + + /* assign the network id */ + ip2nets.ip2nets_net.nw_id = libcfs_str2net(net->cy_valuestring); + if (ip2nets.ip2nets_net.nw_id == LNET_NID_ANY) + return LUSTRE_CFG_RC_BAD_PARAM; + + seq_no = cYAML_get_object_item(tree, "seq_no"); + intf = cYAML_get_object_item(tree, "interfaces"); if (intf != NULL) { - /* grab all the interfaces */ - child = intf->cy_child; - while (child != NULL && size > 0) { - struct cYAML *lnd_params; - - if (child->cy_valuestring == NULL) - goto ignore_child; + rc = yaml_copy_intf_info(intf, &ip2nets.ip2nets_net); + if (rc <= 0) + return LUSTRE_CFG_RC_BAD_PARAM; + } - if (loc > devs) - num = snprintf(loc, size, ",%s", - child->cy_valuestring); - else - num = snprintf(loc, size, "%s", - child->cy_valuestring); - size -= num; - loc += num; - intf_found = true; - - lnd_params = cYAML_get_object_item(intf, - "lnd tunables"); - if (lnd_params != NULL) { - const char *dev_name = child->cy_valuestring; - lnd_tunables_p = &lnd_tunables; - - lustre_interface_parse(lnd_params, dev_name, - lnd_tunables_p); + ip_range = cYAML_get_object_item(tree, "ip-range"); + if (ip_range != NULL) { + item = ip_range->cy_child; + while (item != NULL) { + if (item->cy_valuestring == NULL) { + item = item->cy_next; + continue; } -ignore_child: - child = child->cy_next; + + rc = lustre_lnet_add_ip_range(&ip2nets.ip2nets_ip_ranges, + item->cy_valuestring); + + if (rc != LUSTRE_CFG_RC_NO_ERR) + goto out; + + item = item->cy_next; } } - tunables = cYAML_get_object_item(tree, "tunables"); - if (tunables != NULL) { - peer_to = cYAML_get_object_item(tunables, "peer_timeout"); - peer_cr = cYAML_get_object_item(tunables, "peer_credits"); - peer_buf_cr = cYAML_get_object_item(tunables, - "peer_buffer_credits"); - credits = cYAML_get_object_item(tunables, "credits"); - smp = cYAML_get_object_item(tunables, "CPT"); + found = yaml_extract_tunables(tree, &tunables, &global_cpts, + LNET_NETTYP(ip2nets.ip2nets_net.nw_id)); + + rc = lustre_lnet_config_ip2nets(&ip2nets, + (found) ? &tunables : NULL, + global_cpts, + (seq_no) ? seq_no->cy_valueint : -1, + err_rc); + + /* + * don't stop because there was no match. Continue processing the + * rest of the rules. If non-match then nothing is configured + */ + if (rc == LUSTRE_CFG_RC_NO_MATCH) + rc = LUSTRE_CFG_RC_NO_ERR; +out: + list_for_each_entry_safe(intf_descr, intf_tmp, + &ip2nets.ip2nets_net.nw_intflist, + intf_on_network) { + 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) { + list_del(&el->el_link); + cfs_expr_list_free(el); + } + free(ip_range_descr); } - seq_no = cYAML_get_object_item(tree, "seq_no"); - return lustre_lnet_config_net((net) ? net->cy_valuestring : NULL, - (intf_found) ? devs : NULL, - (ip2net) ? ip2net->cy_valuestring : NULL, - (peer_to) ? peer_to->cy_valueint : -1, - (peer_cr) ? peer_cr->cy_valueint : -1, - (peer_buf_cr) ? - peer_buf_cr->cy_valueint : -1, - (credits) ? credits->cy_valueint : -1, - (smp) ? smp->cy_valuestring : NULL, - (seq_no) ? seq_no->cy_valueint : -1, - lnd_tunables_p, - err_rc); + return rc; } -static void yaml_free_string_array(char **str_array, int num) +static int handle_yaml_del_ni(struct cYAML *tree, struct cYAML **show_rc, + struct cYAML **err_rc) { - int i; + struct cYAML *net = NULL, *intf = NULL, *seq_no = NULL, *item = NULL, + *local_nis = NULL; + int num_entries, rc; + struct lnet_dlc_network_descr nw_descr; + + INIT_LIST_HEAD(&nw_descr.network_on_rule); + INIT_LIST_HEAD(&nw_descr.nw_intflist); + + net = cYAML_get_object_item(tree, "net type"); + if (net != NULL) + nw_descr.nw_id = libcfs_str2net(net->cy_valuestring); + + local_nis = cYAML_get_object_item(tree, "local NI(s)"); + if (local_nis == NULL) + return LUSTRE_CFG_RC_MISSING_PARAM; + + if (!cYAML_is_sequence(local_nis)) + return LUSTRE_CFG_RC_BAD_PARAM; + + while (cYAML_get_next_seq_item(local_nis, &item) != NULL) { + intf = cYAML_get_object_item(item, "interfaces"); + if (intf == NULL) + continue; + num_entries = yaml_copy_intf_info(intf, &nw_descr); + if (num_entries <= 0) { + cYAML_build_error(num_entries, -1, "ni", "add", + "bad interface list", + err_rc); + return LUSTRE_CFG_RC_BAD_PARAM; + } + } + + seq_no = cYAML_get_object_item(tree, "seq_no"); + + rc = lustre_lnet_del_ni((net) ? &nw_descr : NULL, + (seq_no) ? seq_no->cy_valueint : -1, + err_rc); - for (i = 0; i < num; i++) - free(str_array[num]); - free(str_array); + 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; + struct cYAML *nids_entry = NULL, *child = NULL, *entry = NULL, + *prim_nid = NULL; char **nids = NULL; int num = 0, rc = LUSTRE_CFG_RC_NO_ERR; - nids_entry = cYAML_get_object_item(tree, "nids"); - if (nids_entry != NULL) { - /* count */ - child = nids_entry->cy_child; - while (child != NULL) { + 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)) { + 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++; - child = child->cy_next; } + } - if (num == 0) - return LUSTRE_CFG_RC_MISSING_PARAM; + if (num == 0) + return LUSTRE_CFG_RC_MISSING_PARAM; - nids = calloc(sizeof(*nids) * num, 1); - if (nids == NULL) - return LUSTRE_CFG_RC_OUT_OF_MEM; + nids = calloc(sizeof(*nids) * num, 1); + if (nids == NULL) + return LUSTRE_CFG_RC_OUT_OF_MEM; - /* now grab all the nids */ - child = nids_entry->cy_child; - num = 0; - while (child != NULL) { - nids[num] = calloc(strlen(child->cy_valuestring) + 1, - 1); - if (nids[num] == NULL) { - rc = LUSTRE_CFG_RC_OUT_OF_MEM; - goto failed; - } - strncpy(nids[num], child->cy_valuestring, - strlen(child->cy_valuestring)); - child = child->cy_next; - num++; + /* now grab all the nids */ + num = 0; + child = NULL; + while (cYAML_get_next_seq_item(nids_entry, &child)) { + entry = cYAML_get_object_item(child, "nid"); + if (!entry || !entry->cy_valuestring) + continue; + + nids[num] = calloc(strlen(entry->cy_valuestring) + 1, 1); + if (!nids[num]) { + rc = LUSTRE_CFG_RC_OUT_OF_MEM; + goto failed; } - rc = num; - } else { - rc = LUSTRE_CFG_RC_MISSING_PARAM; - goto failed; + strncpy(nids[num], entry->cy_valuestring, + strlen(entry->cy_valuestring)); + num++; } + rc = num; *nidsppp = nids; return rc; @@ -1616,17 +3402,19 @@ static int handle_yaml_config_peer(struct cYAML *tree, struct cYAML **show_rc, { char **nids = NULL; int num, rc; - struct cYAML *seq_no, *key_nid; + 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, "key_nid"); + prim_nid = cYAML_get_object_item(tree, "primary nid"); + non_mr = cYAML_get_object_item(tree, "non_mr"); - rc = lustre_lnet_config_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL, - nids, + rc = lustre_lnet_config_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL, + nids, num, + (non_mr) ? false : true, (seq_no) ? seq_no->cy_valueint : -1, err_rc); @@ -1639,17 +3427,17 @@ static int handle_yaml_del_peer(struct cYAML *tree, struct cYAML **show_rc, { char **nids = NULL; int num, rc; - struct cYAML *seq_no, *key_nid; + struct cYAML *seq_no, *prim_nid; - num = yaml_copy_peer_nids(tree, &nids); + 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, "key_nid"); + prim_nid = cYAML_get_object_item(tree, "primary nid"); - rc = lustre_lnet_del_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL, - nids, + rc = lustre_lnet_del_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL, + nids, num, (seq_no) ? seq_no->cy_valueint : -1, err_rc); @@ -1715,19 +3503,6 @@ static int handle_yaml_del_route(struct cYAML *tree, struct cYAML **show_rc, err_rc); } -static int handle_yaml_del_net(struct cYAML *tree, struct cYAML **show_rc, - struct cYAML **err_rc) -{ - struct cYAML *net, *seq_no; - - net = cYAML_get_object_item(tree, "net"); - seq_no = cYAML_get_object_item(tree, "seq_no"); - - return lustre_lnet_del_net((net) ? net->cy_valuestring : NULL, - (seq_no) ? seq_no->cy_valueint : -1, - err_rc); -} - static int handle_yaml_del_routing(struct cYAML *tree, struct cYAML **show_rc, struct cYAML **err_rc) { @@ -1794,15 +3569,17 @@ static int handle_yaml_show_routing(struct cYAML *tree, struct cYAML **show_rc, show_rc, err_rc); } -static int handle_yaml_show_credits(struct cYAML *tree, struct cYAML **show_rc, - struct cYAML **err_rc) +static int handle_yaml_show_peers(struct cYAML *tree, struct cYAML **show_rc, + struct cYAML **err_rc) { - struct cYAML *seq_no, *key_nid; + struct cYAML *seq_no, *nid, *detail; seq_no = cYAML_get_object_item(tree, "seq_no"); - key_nid = cYAML_get_object_item(tree, "key_nid"); + detail = cYAML_get_object_item(tree, "detail"); + nid = cYAML_get_object_item(tree, "nid"); - return lustre_lnet_show_peer((key_nid) ? key_nid->cy_valuestring : NULL, + return lustre_lnet_show_peer((nid) ? nid->cy_valuestring : NULL, + (detail) ? detail->cy_valueint : 0, (seq_no) ? seq_no->cy_valueint : -1, show_rc, err_rc); } @@ -1818,37 +3595,172 @@ static int handle_yaml_show_stats(struct cYAML *tree, struct cYAML **show_rc, show_rc, err_rc); } +static int handle_yaml_config_global_settings(struct cYAML *tree, + struct cYAML **show_rc, + struct cYAML **err_rc) +{ + struct cYAML *max_intf, *numa, *discovery, *seq_no; + int rc = 0; + + seq_no = cYAML_get_object_item(tree, "seq_no"); + max_intf = cYAML_get_object_item(tree, "max_intf"); + if (max_intf) + rc = lustre_lnet_config_max_intf(max_intf->cy_valueint, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + numa = cYAML_get_object_item(tree, "numa_range"); + if (numa) + rc = lustre_lnet_config_numa_range(numa->cy_valueint, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + discovery = cYAML_get_object_item(tree, "discovery"); + if (discovery) + rc = lustre_lnet_config_discovery(discovery->cy_valueint, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + return rc; +} + +static int handle_yaml_del_global_settings(struct cYAML *tree, + struct cYAML **show_rc, + struct cYAML **err_rc) +{ + struct cYAML *max_intf, *numa, *discovery, *seq_no; + int rc = 0; + + seq_no = cYAML_get_object_item(tree, "seq_no"); + max_intf = cYAML_get_object_item(tree, "max_intf"); + if (max_intf) + rc = lustre_lnet_config_max_intf(LNET_INTERFACES_MAX_DEFAULT, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + numa = cYAML_get_object_item(tree, "numa_range"); + if (numa) + rc = lustre_lnet_config_numa_range(0, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + /* peer discovery is enabled by default */ + discovery = cYAML_get_object_item(tree, "discovery"); + if (discovery) + rc = lustre_lnet_config_discovery(1, + seq_no ? seq_no->cy_valueint + : -1, + err_rc); + + return rc; +} + +static int handle_yaml_show_global_settings(struct cYAML *tree, + struct cYAML **show_rc, + struct cYAML **err_rc) +{ + struct cYAML *max_intf, *numa, *discovery, *seq_no; + int rc = 0; + + seq_no = cYAML_get_object_item(tree, "seq_no"); + max_intf = cYAML_get_object_item(tree, "max_intf"); + if (max_intf) + rc = lustre_lnet_show_max_intf(seq_no ? seq_no->cy_valueint + : -1, + show_rc, err_rc); + + numa = cYAML_get_object_item(tree, "numa_range"); + if (numa) + rc = lustre_lnet_show_numa_range(seq_no ? seq_no->cy_valueint + : -1, + show_rc, err_rc); + + discovery = cYAML_get_object_item(tree, "discovery"); + if (discovery) + rc = lustre_lnet_show_discovery(seq_no ? seq_no->cy_valueint + : -1, + show_rc, err_rc); + + return rc; +} + +static int handle_yaml_ping(struct cYAML *tree, struct cYAML **show_rc, + struct cYAML **err_rc) +{ + struct cYAML *seq_no, *nid, *timeout; + + seq_no = cYAML_get_object_item(tree, "seq_no"); + nid = cYAML_get_object_item(tree, "primary nid"); + timeout = cYAML_get_object_item(tree, "timeout"); + + return lustre_lnet_ping_nid((nid) ? nid->cy_valuestring : NULL, + (timeout) ? timeout->cy_valueint : 1000, + (seq_no) ? seq_no->cy_valueint : -1, + show_rc, err_rc); +} + +static int handle_yaml_no_op() +{ + return LUSTRE_CFG_RC_NO_ERR; +} + struct lookup_cmd_hdlr_tbl { char *name; cmd_handler_t cb; }; static struct lookup_cmd_hdlr_tbl lookup_config_tbl[] = { - {"route", handle_yaml_config_route}, - {"net", handle_yaml_config_net}, - {"peer", handle_yaml_config_peer}, - {"routing", handle_yaml_config_routing}, - {"buffers", handle_yaml_config_buffers}, - {NULL, NULL} -}; + { .name = "route", .cb = handle_yaml_config_route }, + { .name = "net", .cb = handle_yaml_config_ni }, + { .name = "ip2nets", .cb = handle_yaml_config_ip2nets }, + { .name = "peer", .cb = handle_yaml_config_peer }, + { .name = "routing", .cb = handle_yaml_config_routing }, + { .name = "buffers", .cb = handle_yaml_config_buffers }, + { .name = "statistics", .cb = handle_yaml_no_op }, + { .name = "global", .cb = handle_yaml_config_global_settings}, + { .name = "ping", .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_net}, - {"peer", handle_yaml_del_peer}, - {"routing", handle_yaml_del_routing}, - {NULL, NULL} -}; + { .name = "route", .cb = handle_yaml_del_route }, + { .name = "net", .cb = handle_yaml_del_ni }, + { .name = "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 = NULL } }; static struct lookup_cmd_hdlr_tbl lookup_show_tbl[] = { - {"route", handle_yaml_show_route}, - {"net", handle_yaml_show_net}, - {"buffers", handle_yaml_show_routing}, - {"routing", handle_yaml_show_routing}, - {"credits", handle_yaml_show_credits}, - {"statistics", handle_yaml_show_stats}, - {NULL, NULL} -}; + { .name = "route", .cb = handle_yaml_show_route }, + { .name = "net", .cb = handle_yaml_show_net }, + { .name = "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 = 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 = NULL } }; static cmd_handler_t lookup_fn(char *key, struct lookup_cmd_hdlr_tbl *tbl) @@ -1873,7 +3785,7 @@ static int lustre_yaml_cb_helper(char *f, struct lookup_cmd_hdlr_tbl *table, char err_str[LNET_MAX_STR_LEN]; int rc = LUSTRE_CFG_RC_NO_ERR, return_rc = LUSTRE_CFG_RC_NO_ERR; - tree = cYAML_build_tree(f, NULL, 0, err_rc); + tree = cYAML_build_tree(f, NULL, 0, err_rc, false); if (tree == NULL) return LUSTRE_CFG_RC_BAD_PARAM; @@ -1928,3 +3840,9 @@ int lustre_yaml_show(char *f, struct cYAML **show_rc, struct cYAML **err_rc) return lustre_yaml_cb_helper(f, lookup_show_tbl, show_rc, err_rc); } + +int lustre_yaml_exec(char *f, struct cYAML **show_rc, struct cYAML **err_rc) +{ + return lustre_yaml_cb_helper(f, lookup_exec_tbl, + show_rc, err_rc); +}