X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Futils%2Flnetconfig%2Fliblnetconfig.c;h=523529b962838b4cb8a801f48e0245af570e2095;hb=7241e68f37962991ef43a6c01b3a83ff67282d88;hp=7202e1e65f692b47e33dcd76ea5093ddbd8779d0;hpb=c906ab9c88ef3cf0b38102763aff20072611f2e0;p=fs%2Flustre-release.git diff --git a/lnet/utils/lnetconfig/liblnetconfig.c b/lnet/utils/lnetconfig/liblnetconfig.c index 7202e1e..523529b 100644 --- a/lnet/utils/lnetconfig/liblnetconfig.c +++ b/lnet/utils/lnetconfig/liblnetconfig.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -47,7 +48,6 @@ #include #include "liblnd.h" #include -#include #include #include #include "liblnetconfig.h" @@ -80,6 +80,20 @@ struct lustre_lnet_ip2nets { }; /* + * 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: @@ -311,9 +325,8 @@ int lustre_lnet_parse_interfaces(char *intf_str, failed: list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, intf_on_network) { - if (intf_descr->cpt_expr != NULL) - cfs_expr_list_free(intf_descr->cpt_expr); - free(intf_descr); + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); } return rc; @@ -394,13 +407,13 @@ static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids, return array; } -static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd, +static int dispatch_peer_ni_cmd(lnet_nid_t pnid, lnet_nid_t nid, __u32 cmd, struct lnet_ioctl_peer_cfg *data, char *err_str, char *cmd_str) { int rc; - data->prcfg_key_nid = knid; + data->prcfg_prim_nid = pnid; data->prcfg_cfg_nid = nid; rc = l_ioctl(LNET_DEV_ID, cmd, data); @@ -415,23 +428,23 @@ static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd, return rc; } -int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids, +int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids, bool mr, int seq_no, struct cYAML **err_rc) { struct lnet_ioctl_peer_cfg data; - lnet_nid_t key_nid = LNET_NID_ANY; + lnet_nid_t prim_nid = LNET_NID_ANY; int rc = LUSTRE_CFG_RC_NO_ERR; int idx = 0; bool nid0_used = false; char err_str[LNET_MAX_STR_LEN] = {0}; lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str); - if (knid) { - key_nid = libcfs_str2nid(knid); - if (key_nid == LNET_NID_ANY) { + if (pnid) { + prim_nid = libcfs_str2nid(pnid); + if (prim_nid == LNET_NID_ANY) { snprintf(err_str, sizeof(err_str), "bad key NID: '%s'", - knid); + pnid); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } @@ -441,7 +454,7 @@ int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids, rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } else { - key_nid = LNET_NID_ANY; + prim_nid = LNET_NID_ANY; } snprintf(err_str, sizeof(err_str), "\"Success\""); @@ -450,17 +463,17 @@ int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids, data.prcfg_mr = mr; /* - * if key_nid is not specified use the first nid in the list of - * nids provided as the key_nid. NOTE: on entering 'if' we must + * if prim_nid is not specified use the first nid in the list of + * nids provided as the prim_nid. NOTE: on entering 'if' we must * have at least 1 NID */ - if (key_nid == LNET_NID_ANY) { + if (prim_nid == LNET_NID_ANY) { nid0_used = true; - key_nid = nids[0]; + prim_nid = nids[0]; } - /* Create the key_nid first */ - rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY, + /* Create the prim_nid first */ + rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY, IOC_LIBCFS_ADD_PEER_NI, &data, err_str, "add"); @@ -470,12 +483,12 @@ int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids, /* add the rest of the nids to the key nid if any are available */ for (idx = nid0_used ? 1 : 0 ; nids && idx < num_nids; idx++) { /* - * If key_nid is not provided then the first nid in the - * list becomes the key_nid. First time round the loop use + * If prim_nid is not provided then the first nid in the + * list becomes the prim_nid. First time round the loop use * LNET_NID_ANY for the first parameter, then use nid[0] * as the key nid after wards */ - rc = dispatch_peer_ni_cmd(key_nid, nids[idx], + rc = dispatch_peer_ni_cmd(prim_nid, nids[idx], IOC_LIBCFS_ADD_PEER_NI, &data, err_str, "add"); @@ -490,28 +503,28 @@ out: return rc; } -int lustre_lnet_del_peer_nid(char *knid, char **nid, int num_nids, +int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids, int seq_no, struct cYAML **err_rc) { struct lnet_ioctl_peer_cfg data; - lnet_nid_t key_nid; + lnet_nid_t prim_nid; int rc = LUSTRE_CFG_RC_NO_ERR; int idx = 0; char err_str[LNET_MAX_STR_LEN] = {0}; lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str); - if (knid == NULL) { + if (pnid == NULL) { snprintf(err_str, sizeof(err_str), "\"Primary nid is not provided\""); rc = LUSTRE_CFG_RC_MISSING_PARAM; goto out; } else { - key_nid = libcfs_str2nid(knid); - if (key_nid == LNET_NID_ANY) { + prim_nid = libcfs_str2nid(pnid); + if (prim_nid == LNET_NID_ANY) { rc = LUSTRE_CFG_RC_BAD_PARAM; snprintf(err_str, sizeof(err_str), "bad key NID: '%s'", - knid); + pnid); goto out; } } @@ -520,14 +533,14 @@ int lustre_lnet_del_peer_nid(char *knid, char **nid, int num_nids, LIBCFS_IOC_INIT_V2(data, prcfg_hdr); if (!nids || nids[0] == LNET_NID_ANY) { - rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY, + rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY, IOC_LIBCFS_DEL_PEER_NI, &data, err_str, "del"); goto out; } for (idx = 0; nids && idx < num_nids; idx++) { - rc = dispatch_peer_ni_cmd(key_nid, nids[idx], + rc = dispatch_peer_ni_cmd(prim_nid, nids[idx], IOC_LIBCFS_DEL_PEER_NI, &data, err_str, "del"); @@ -572,17 +585,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, @@ -666,17 +668,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, @@ -733,17 +724,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); @@ -828,8 +808,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; @@ -893,7 +873,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) @@ -906,9 +886,11 @@ static int socket_intf_query(int request, char *intf, strcpy(ifr->ifr_name, intf); rc = ioctl(sockfd, request, ifr); if (rc != 0) - return LUSTRE_CFG_RC_BAD_PARAM; + rc = LUSTRE_CFG_RC_BAD_PARAM; - return 0; + close(sockfd); + + return rc; } /* @@ -996,7 +978,7 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, { int rc; __u32 ip; - struct lnet_dlc_intf_descr *intf_descr; + struct lnet_dlc_intf_descr *intf_descr, *tmp; struct ifaddrs *ifaddr = ifa; struct lustre_lnet_ip_range_descr *ip_range; int family; @@ -1014,7 +996,8 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, continue; family = ifaddr->ifa_addr->sa_family; - if (family == AF_INET) { + if (family == AF_INET && + strcmp(ifaddr->ifa_name, "lo") != 0) { rc = lustre_lnet_add_intf_descr (intf_list, ifaddr->ifa_name, strlen(ifaddr->ifa_name)); @@ -1062,11 +1045,14 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, if (rc != LUSTRE_CFG_RC_NO_ERR) return rc; - - return LUSTRE_CFG_RC_MATCH; } } } + + if (!list_empty(intf_list)) + return LUSTRE_CFG_RC_MATCH; + + return LUSTRE_CFG_RC_NO_MATCH; } /* @@ -1077,7 +1063,7 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, * If > 1 interfaces all the interfaces must match for the NI to * be configured. */ - list_for_each_entry(intf_descr, intf_list, intf_on_network) { + list_for_each_entry_safe(intf_descr, tmp, intf_list, intf_on_network) { for (ifaddr = ifa; ifaddr != NULL; ifaddr = ifaddr->ifa_next) { if (ifaddr->ifa_addr == NULL) continue; @@ -1089,20 +1075,31 @@ int lustre_lnet_match_ip_to_intf(struct ifaddrs *ifa, break; } - if (ifaddr == NULL) - return LUSTRE_CFG_RC_NO_MATCH; + if (ifaddr == NULL) { + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + continue; + } - if ((ifaddr->ifa_flags & IFF_UP) == 0) - return LUSTRE_CFG_RC_NO_MATCH; + if ((ifaddr->ifa_flags & IFF_UP) == 0) { + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); + continue; + } ip = ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr; + rc = 1; list_for_each_entry(ip_range, ip_ranges, ipr_entry) { rc = cfs_ip_addr_match(bswap_32(ip), &ip_range->ipr_expr); if (rc) break; - else - return LUSTRE_CFG_RC_NO_MATCH; + } + + if (!rc) { + /* no match for this interface */ + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); } } @@ -1163,6 +1160,8 @@ lustre_lnet_ioctl_config_ni(struct list_head *intf_list, 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) tun = (struct lnet_ioctl_config_lnd_tunables*) @@ -1208,8 +1207,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++; } @@ -1229,8 +1230,7 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets, snprintf(err_str, sizeof(err_str), "\"success\""); - if (ip2nets == NULL || - list_empty(&ip2nets->ip2nets_net.nw_intflist)) { + if (!ip2nets) { snprintf(err_str, sizeof(err_str), "\"incomplete ip2nets information\""); @@ -1238,6 +1238,11 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets, goto out; } + /* + * call below function to resolve the rules into a list of nids. + * The memory is allocated in that function then freed here when + * it's no longer needed. + */ rc = lustre_lnet_resolve_ip2nets_rule(ip2nets, &nids, &nnids); if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH) { snprintf(err_str, @@ -1246,11 +1251,18 @@ lustre_lnet_config_ip2nets(struct lustre_lnet_ip2nets *ip2nets, goto out; } + if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) { + snprintf(err_str, sizeof(err_str), + "\"no interfaces match ip2nets rules\""); + goto free_nids_out; + } + rc = lustre_lnet_ioctl_config_ni(&ip2nets->ip2nets_net.nw_intflist, tunables, global_cpts, nids, err_str); - if (rc != LUSTRE_CFG_RC_NO_ERR) - free(nids); + +free_nids_out: + free(nids); out: cYAML_build_error(rc, seq_no, ADD_CMD, "ip2nets", err_str, err_rc); @@ -1302,6 +1314,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*) @@ -1344,8 +1360,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, @@ -1381,9 +1399,8 @@ out: list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, intf_on_network) { - if (intf_descr->cpt_expr != NULL) - cfs_expr_list_free(intf_descr->cpt_expr); - free(intf_descr); + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); } } @@ -1408,9 +1425,6 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr, __u32 nnids = 0; struct lnet_dlc_intf_descr *intf_descr, *tmp; - if (LNET_NETTYP(nw_descr->nw_id) == LOLND) - return LUSTRE_CFG_RC_NO_ERR; - snprintf(err_str, sizeof(err_str), "\"success\""); if (nw_descr == NULL) { @@ -1421,6 +1435,9 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr, goto out; } + if (LNET_NETTYP(nw_descr->nw_id) == LOLND) + return LUSTRE_CFG_RC_NO_ERR; + if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) { snprintf(err_str, sizeof(err_str), @@ -1468,9 +1485,8 @@ int lustre_lnet_del_ni(struct lnet_dlc_network_descr *nw_descr, list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, intf_on_network) { - if (intf_descr->cpt_expr != NULL) - cfs_expr_list_free(intf_descr->cpt_expr); - free(intf_descr); + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); } out: @@ -1610,7 +1626,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_NUM_INTERFACES; j++) { if (strlen(ni_data->lic_ni_intf[j]) > 0) { snprintf(str_buf, sizeof(str_buf), "%d", j); @@ -1631,17 +1647,17 @@ int lustre_lnet_show_net(char *nw, int detail, int seq_no, goto out; if (cYAML_create_number(statistics, "send_count", - stats->send_count) + stats->iel_send_count) == NULL) goto out; if (cYAML_create_number(statistics, "recv_count", - stats->recv_count) + stats->iel_recv_count) == NULL) goto out; if (cYAML_create_number(statistics, "drop_count", - stats->drop_count) + stats->iel_drop_count) == NULL) goto out; @@ -1992,7 +2008,11 @@ out: int lustre_lnet_show_peer(char *knid, int detail, int seq_no, struct cYAML **show_rc, struct cYAML **err_rc) { - struct lnet_ioctl_peer_cfg *peer_info; + /* + * TODO: This function is changing in a future patch to accommodate + * PEER_LIST and proper filtering on any nid of the peer + */ + struct lnet_ioctl_peer_cfg peer_info; struct lnet_peer_ni_credit_info *lpni_cri; struct lnet_ioctl_element_stats *lpni_stats; int rc = LUSTRE_CFG_RC_OUT_OF_MEM, ncpt = 0, i = 0, j = 0; @@ -2001,9 +2021,8 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no, *first_seq = NULL, *peer_root = NULL, *tmp = NULL; char err_str[LNET_MAX_STR_LEN]; lnet_nid_t prev_primary_nid = LNET_NID_ANY, primary_nid = LNET_NID_ANY; - int data_size = sizeof(*peer_info) + sizeof(*lpni_cri) + - sizeof(*lpni_stats); - char *data = calloc(data_size, 1); + int data_size = sizeof(*lpni_cri) + sizeof(*lpni_stats); + char *data = malloc(data_size); bool new_peer = true; snprintf(err_str, sizeof(err_str), @@ -2012,8 +2031,6 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no, 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) @@ -2029,43 +2046,44 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no, 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; + 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_count = i; + peer_info.prcfg_bulk = (void *)data; + peer_info.prcfg_size = data_size; rc = l_ioctl(LNET_DEV_ID, - IOC_LIBCFS_GET_PEER_NI, peer_info); + IOC_LIBCFS_GET_PEER_NI, &peer_info); if (rc != 0) { l_errno = errno; break; } if (primary_nid != LNET_NID_ANY && - primary_nid != peer_info->prcfg_key_nid) + primary_nid != peer_info.prcfg_prim_nid) continue; - lpni_cri = (struct lnet_peer_ni_credit_info*)peer_info->prcfg_bulk; - lpni_stats = (struct lnet_ioctl_element_stats *) - (peer_info->prcfg_bulk + - sizeof(*lpni_cri)); + lpni_cri = peer_info.prcfg_bulk; + lpni_stats = peer_info.prcfg_bulk + sizeof(*lpni_cri); peer = cYAML_create_seq_item(peer_root); if (peer == NULL) goto out; - if (peer_info->prcfg_key_nid != prev_primary_nid) { - prev_primary_nid = peer_info->prcfg_key_nid; + 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_key_nid; + 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 ? + peer_info.prcfg_mr ? "True" : "False") == NULL) goto out; @@ -2084,7 +2102,7 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no, if (cYAML_create_string(peer_ni, "nid", libcfs_nid2str - (peer_info->prcfg_cfg_nid)) + (peer_info.prcfg_cfg_nid)) == NULL) goto out; @@ -2127,17 +2145,17 @@ int lustre_lnet_show_peer(char *knid, int detail, int seq_no, goto out; if (cYAML_create_number(peer_ni, "send_count", - lpni_stats->send_count) + lpni_stats->iel_send_count) == NULL) goto out; if (cYAML_create_number(peer_ni, "recv_count", - lpni_stats->recv_count) + lpni_stats->iel_recv_count) == NULL) goto out; if (cYAML_create_number(peer_ni, "drop_count", - lpni_stats->drop_count) + lpni_stats->iel_drop_count) == NULL) goto out; @@ -2200,7 +2218,7 @@ int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc, struct cYAML **err_rc) { struct lnet_ioctl_numa_range data; - int rc = LUSTRE_CFG_RC_OUT_OF_MEM; + int rc; int l_errno; char err_str[LNET_MAX_STR_LEN]; struct cYAML *root = NULL, *range = NULL; @@ -2220,6 +2238,8 @@ int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc, goto out; } + rc = LUSTRE_CFG_RC_OUT_OF_MEM; + root = cYAML_create_object(NULL, NULL); if (root == NULL) goto out; @@ -2236,6 +2256,7 @@ int lustre_lnet_show_numa_range(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); @@ -2256,7 +2277,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; @@ -2276,6 +2297,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; @@ -2332,6 +2355,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); @@ -2429,9 +2453,8 @@ static int yaml_copy_intf_info(struct cYAML *intf_tree, failed: list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist, intf_on_network) { - if (intf_descr->cpt_expr != NULL) - cfs_expr_list_free(intf_descr->cpt_expr); - free(intf_descr); + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); } return rc; @@ -2539,6 +2562,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 @@ -2676,17 +2701,19 @@ out: list_for_each_entry_safe(intf_descr, intf_tmp, &ip2nets.ip2nets_net.nw_intflist, intf_on_network) { - if (intf_descr->cpt_expr != NULL) - cfs_expr_list_free(intf_descr->cpt_expr); - free(intf_descr); + list_del(&intf_descr->intf_on_network); + free_intf_descr(intf_descr); } list_for_each_entry_safe(ip_range_descr, tmp, &ip2nets.ip2nets_ip_ranges, ipr_entry) { + list_del(&ip_range_descr->ipr_entry); list_for_each_entry_safe(el, el_tmp, &ip_range_descr->ipr_expr, - el_link) + el_link) { + list_del(&el->el_link); cfs_expr_list_free(el); + } free(ip_range_descr); } @@ -2789,17 +2816,17 @@ static int handle_yaml_config_peer(struct cYAML *tree, struct cYAML **show_rc, { char **nids = NULL; int num, rc; - struct cYAML *seq_no, *key_nid, *non_mr; + struct cYAML *seq_no, *prim_nid, *non_mr; num = yaml_copy_peer_nids(tree, &nids); if (num < 0) return num; seq_no = cYAML_get_object_item(tree, "seq_no"); - key_nid = cYAML_get_object_item(tree, "primary nid"); + prim_nid = cYAML_get_object_item(tree, "primary nid"); non_mr = cYAML_get_object_item(tree, "non_mr"); - rc = lustre_lnet_config_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL, + rc = lustre_lnet_config_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL, nids, num, (non_mr) ? false : true, (seq_no) ? seq_no->cy_valueint : -1, @@ -2814,16 +2841,16 @@ static int handle_yaml_del_peer(struct cYAML *tree, struct cYAML **show_rc, { char **nids = NULL; int num, rc; - struct cYAML *seq_no, *key_nid; + struct cYAML *seq_no, *prim_nid; num = yaml_copy_peer_nids(tree, &nids); if (num < 0) return num; seq_no = cYAML_get_object_item(tree, "seq_no"); - key_nid = cYAML_get_object_item(tree, "primary nid"); + prim_nid = cYAML_get_object_item(tree, "primary nid"); - rc = lustre_lnet_del_peer_nid((key_nid) ? key_nid->cy_valuestring : NULL, + rc = lustre_lnet_del_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL, nids, num, (seq_no) ? seq_no->cy_valueint : -1, err_rc); @@ -2956,16 +2983,16 @@ static int handle_yaml_show_routing(struct cYAML *tree, struct cYAML **show_rc, show_rc, err_rc); } -static int handle_yaml_show_credits(struct cYAML *tree, struct cYAML **show_rc, - struct cYAML **err_rc) +static int handle_yaml_show_peers(struct cYAML *tree, struct cYAML **show_rc, + struct cYAML **err_rc) { - struct cYAML *seq_no, *key_nid, *detail; + struct cYAML *seq_no, *nid, *detail; seq_no = cYAML_get_object_item(tree, "seq_no"); detail = cYAML_get_object_item(tree, "detail"); - key_nid = cYAML_get_object_item(tree, "key_nid"); + nid = cYAML_get_object_item(tree, "nid"); - return lustre_lnet_show_peer((key_nid) ? key_nid->cy_valuestring : NULL, + return lustre_lnet_show_peer((nid) ? nid->cy_valuestring : NULL, (detail) ? detail->cy_valueint : 0, (seq_no) ? seq_no->cy_valueint : -1, show_rc, err_rc); @@ -3023,35 +3050,32 @@ struct lookup_cmd_hdlr_tbl { }; static struct lookup_cmd_hdlr_tbl lookup_config_tbl[] = { - {"route", handle_yaml_config_route}, - {"net", handle_yaml_config_ni}, - {"ip2nets", handle_yaml_config_ip2nets}, - {"peer", handle_yaml_config_peer}, - {"routing", handle_yaml_config_routing}, - {"buffers", handle_yaml_config_buffers}, - {"numa", handle_yaml_config_numa}, - {NULL, NULL} -}; + { .name = "route", .cb = handle_yaml_config_route }, + { .name = "net", .cb = handle_yaml_config_ni }, + { .name = "ip2nets", .cb = handle_yaml_config_ip2nets }, + { .name = "peer", .cb = handle_yaml_config_peer }, + { .name = "routing", .cb = handle_yaml_config_routing }, + { .name = "buffers", .cb = handle_yaml_config_buffers }, + { .name = "numa", .cb = handle_yaml_config_numa }, + { .name = NULL } }; static struct lookup_cmd_hdlr_tbl lookup_del_tbl[] = { - {"route", handle_yaml_del_route}, - {"net", handle_yaml_del_ni}, - {"peer", handle_yaml_del_peer}, - {"routing", handle_yaml_del_routing}, - {"numa", handle_yaml_del_numa}, - {NULL, NULL} -}; + { .name = "route", .cb = handle_yaml_del_route }, + { .name = "net", .cb = handle_yaml_del_ni }, + { .name = "peer", .cb = handle_yaml_del_peer }, + { .name = "routing", .cb = handle_yaml_del_routing }, + { .name = "numa", .cb = handle_yaml_del_numa }, + { .name = NULL } }; static struct lookup_cmd_hdlr_tbl lookup_show_tbl[] = { - {"route", handle_yaml_show_route}, - {"net", handle_yaml_show_net}, - {"buffers", handle_yaml_show_routing}, - {"routing", handle_yaml_show_routing}, - {"credits", handle_yaml_show_credits}, - {"statistics", handle_yaml_show_stats}, - {"numa", handle_yaml_show_numa}, - {NULL, NULL} -}; + { .name = "route", .cb = handle_yaml_show_route }, + { .name = "net", .cb = handle_yaml_show_net }, + { .name = "buffers", .cb = handle_yaml_show_routing }, + { .name = "routing", .cb = handle_yaml_show_routing }, + { .name = "peer", .cb = handle_yaml_show_peers }, + { .name = "statistics", .cb = handle_yaml_show_stats }, + { .name = "numa", .cb = handle_yaml_show_numa }, + { .name = NULL } }; static cmd_handler_t lookup_fn(char *key, struct lookup_cmd_hdlr_tbl *tbl) @@ -3132,46 +3156,3 @@ int lustre_yaml_show(char *f, struct cYAML **show_rc, struct cYAML **err_rc) show_rc, err_rc); } -int lustre_lnet_send_dbg_task(enum lnet_dbg_task dbg_task, - struct lnet_dbg_task_info *dbg_info, - struct cYAML **show_rc, - struct cYAML **err_rc) -{ - struct lnet_ioctl_dbg *dbg; - struct lnet_dbg_task_info *info; - int rc = LUSTRE_CFG_RC_NO_ERR; - char err_str[LNET_MAX_STR_LEN]; - - snprintf(err_str, sizeof(err_str), "\"success\""); - - dbg = calloc(1, sizeof(*dbg) + sizeof(*info)); - if (!dbg) { - snprintf(err_str, sizeof(err_str), "\"out of memory\""); - rc = LUSTRE_CFG_RC_OUT_OF_MEM; - goto out; - } - - info = (struct lnet_dbg_task_info *)dbg->dbg_bulk; - - LIBCFS_IOC_INIT_V2(*dbg, dbg_hdr); - - dbg->dbg_task = dbg_task; - if (dbg_info) - memcpy(info, dbg_info, sizeof(*info)); - - rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DBG, dbg); - if (rc != 0) { - rc = -errno; - snprintf(err_str, - sizeof(err_str), - "\"debug task failed %s\"", strerror(errno)); - goto out; - } - -out: - cYAML_build_error(rc, -1, DBG_CMD, - "debug", err_str, err_rc); - - return rc; -} -