#include <lnet/socklnd.h>
#include "liblnd.h"
#include <lnet/lnet.h>
-#include <libcfs/libcfs_string.h>
#include <sys/types.h>
#include <ifaddrs.h>
#include "liblnetconfig.h"
};
/*
+ * 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:
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;
return array;
}
-static int dispatch_peer_ni_cmd(lnet_nid_t knid, lnet_nid_t nid, __u32 cmd,
+static int dispatch_peer_ni_cmd(lnet_nid_t pnid, lnet_nid_t nid, __u32 cmd,
struct lnet_ioctl_peer_cfg *data,
char *err_str, char *cmd_str)
{
int rc;
- data->prcfg_key_nid = knid;
+ data->prcfg_prim_nid = pnid;
data->prcfg_cfg_nid = nid;
rc = l_ioctl(LNET_DEV_ID, cmd, data);
return rc;
}
-int lustre_lnet_config_peer_nid(char *knid, char **nid, int num_nids,
+int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids,
bool mr, int seq_no, struct cYAML **err_rc)
{
struct lnet_ioctl_peer_cfg data;
- lnet_nid_t key_nid = LNET_NID_ANY;
+ lnet_nid_t prim_nid = LNET_NID_ANY;
int rc = LUSTRE_CFG_RC_NO_ERR;
int idx = 0;
bool nid0_used = false;
char err_str[LNET_MAX_STR_LEN] = {0};
lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str);
- if (knid) {
- key_nid = libcfs_str2nid(knid);
- if (key_nid == LNET_NID_ANY) {
+ if (pnid) {
+ prim_nid = libcfs_str2nid(pnid);
+ if (prim_nid == LNET_NID_ANY) {
snprintf(err_str, sizeof(err_str),
"bad key NID: '%s'",
- knid);
+ pnid);
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
}
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
} else {
- key_nid = LNET_NID_ANY;
+ prim_nid = LNET_NID_ANY;
}
snprintf(err_str, sizeof(err_str), "\"Success\"");
data.prcfg_mr = mr;
/*
- * if key_nid is not specified use the first nid in the list of
- * nids provided as the key_nid. NOTE: on entering 'if' we must
+ * if prim_nid is not specified use the first nid in the list of
+ * nids provided as the prim_nid. NOTE: on entering 'if' we must
* have at least 1 NID
*/
- if (key_nid == LNET_NID_ANY) {
+ if (prim_nid == LNET_NID_ANY) {
nid0_used = true;
- key_nid = nids[0];
+ prim_nid = nids[0];
}
- /* Create the key_nid first */
- rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY,
+ /* Create the prim_nid first */
+ rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
IOC_LIBCFS_ADD_PEER_NI,
&data, err_str, "add");
/* add the rest of the nids to the key nid if any are available */
for (idx = nid0_used ? 1 : 0 ; nids && idx < num_nids; idx++) {
/*
- * If key_nid is not provided then the first nid in the
- * list becomes the key_nid. First time round the loop use
+ * If prim_nid is not provided then the first nid in the
+ * list becomes the prim_nid. First time round the loop use
* LNET_NID_ANY for the first parameter, then use nid[0]
* as the key nid after wards
*/
- rc = dispatch_peer_ni_cmd(key_nid, nids[idx],
+ rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
IOC_LIBCFS_ADD_PEER_NI, &data,
err_str, "add");
return rc;
}
-int lustre_lnet_del_peer_nid(char *knid, char **nid, int num_nids,
+int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids,
int seq_no, struct cYAML **err_rc)
{
struct lnet_ioctl_peer_cfg data;
- lnet_nid_t key_nid;
+ lnet_nid_t prim_nid;
int rc = LUSTRE_CFG_RC_NO_ERR;
int idx = 0;
char err_str[LNET_MAX_STR_LEN] = {0};
lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str);
- if (knid == NULL) {
+ if (pnid == NULL) {
snprintf(err_str, sizeof(err_str),
"\"Primary nid is not provided\"");
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
} else {
- key_nid = libcfs_str2nid(knid);
- if (key_nid == LNET_NID_ANY) {
+ prim_nid = libcfs_str2nid(pnid);
+ if (prim_nid == LNET_NID_ANY) {
rc = LUSTRE_CFG_RC_BAD_PARAM;
snprintf(err_str, sizeof(err_str),
"bad key NID: '%s'",
- knid);
+ pnid);
goto out;
}
}
LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
if (!nids || nids[0] == LNET_NID_ANY) {
- rc = dispatch_peer_ni_cmd(key_nid, LNET_NID_ANY,
+ rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
IOC_LIBCFS_DEL_PEER_NI,
&data, err_str, "del");
goto out;
}
for (idx = 0; nids && idx < num_nids; idx++) {
- rc = dispatch_peer_ni_cmd(key_nid, nids[idx],
+ rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
IOC_LIBCFS_DEL_PEER_NI, &data,
err_str, "del");
goto out;
}
- if (LNET_NETTYP(net) == CIBLND ||
- LNET_NETTYP(net) == OPENIBLND ||
- LNET_NETTYP(net) == IIBLND ||
- LNET_NETTYP(net) == VIBLND) {
- snprintf(err_str,
- sizeof(err_str),
- "\"obselete LNet type '%s'\"", libcfs_lnd2str(net));
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
-
gateway_nid = libcfs_str2nid(gw);
if (gateway_nid == LNET_NID_ANY) {
snprintf(err_str,
goto out;
}
- if (LNET_NETTYP(net) == CIBLND ||
- LNET_NETTYP(net) == OPENIBLND ||
- LNET_NETTYP(net) == IIBLND ||
- LNET_NETTYP(net) == VIBLND) {
- snprintf(err_str,
- sizeof(err_str),
- "\"obselete LNet type '%s'\"", libcfs_lnd2str(net));
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
-
gateway_nid = libcfs_str2nid(gw);
if (gateway_nid == LNET_NID_ANY) {
snprintf(err_str,
goto out;
}
- if (LNET_NETTYP(net) == CIBLND ||
- LNET_NETTYP(net) == OPENIBLND ||
- LNET_NETTYP(net) == IIBLND ||
- LNET_NETTYP(net) == VIBLND) {
- snprintf(err_str,
- sizeof(err_str),
- "\"obsolete LNet type '%s'\"",
- libcfs_lnd2str(net));
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
} else {
/* show all routes without filtering on net */
net = LNET_NIDNET(LNET_NID_ANY);
{
int rc;
__u32 ip;
- struct lnet_dlc_intf_descr *intf_descr;
+ struct lnet_dlc_intf_descr *intf_descr, *tmp;
struct ifaddrs *ifaddr = ifa;
struct lustre_lnet_ip_range_descr *ip_range;
int family;
continue;
family = ifaddr->ifa_addr->sa_family;
- if (family == AF_INET) {
+ if (family == AF_INET &&
+ strcmp(ifaddr->ifa_name, "lo") != 0) {
rc = lustre_lnet_add_intf_descr
(intf_list, ifaddr->ifa_name,
strlen(ifaddr->ifa_name));
if (rc != LUSTRE_CFG_RC_NO_ERR)
return rc;
-
- return LUSTRE_CFG_RC_MATCH;
}
}
}
+
+ if (!list_empty(intf_list))
+ return LUSTRE_CFG_RC_MATCH;
+
+ return LUSTRE_CFG_RC_NO_MATCH;
}
/*
* If > 1 interfaces all the interfaces must match for the NI to
* be configured.
*/
- list_for_each_entry(intf_descr, intf_list, intf_on_network) {
+ list_for_each_entry_safe(intf_descr, tmp, intf_list, intf_on_network) {
for (ifaddr = ifa; ifaddr != NULL; ifaddr = ifaddr->ifa_next) {
if (ifaddr->ifa_addr == NULL)
continue;
break;
}
- if (ifaddr == NULL)
- return LUSTRE_CFG_RC_NO_MATCH;
+ if (ifaddr == NULL) {
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
+ continue;
+ }
- if ((ifaddr->ifa_flags & IFF_UP) == 0)
- return LUSTRE_CFG_RC_NO_MATCH;
+ if ((ifaddr->ifa_flags & IFF_UP) == 0) {
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
+ continue;
+ }
ip = ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr;
+ rc = 1;
list_for_each_entry(ip_range, ip_ranges, ipr_entry) {
rc = cfs_ip_addr_match(bswap_32(ip), &ip_range->ipr_expr);
if (rc)
break;
- else
- return LUSTRE_CFG_RC_NO_MATCH;
+ }
+
+ if (!rc) {
+ /* no match for this interface */
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
}
snprintf(err_str, sizeof(err_str), "\"success\"");
- if (ip2nets == NULL ||
- list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+ if (!ip2nets) {
snprintf(err_str,
sizeof(err_str),
"\"incomplete ip2nets information\"");
goto out;
}
+ if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+ snprintf(err_str, sizeof(err_str),
+ "\"no interfaces match ip2nets rules\"");
+ goto out;
+ }
+
rc = lustre_lnet_ioctl_config_ni(&ip2nets->ip2nets_net.nw_intflist,
tunables, global_cpts, nids,
err_str);
list_for_each_entry_safe(intf_descr, tmp,
&nw_descr->nw_intflist,
intf_on_network) {
- if (intf_descr->cpt_expr != NULL)
- cfs_expr_list_free(intf_descr->cpt_expr);
- free(intf_descr);
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
}
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:
int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
struct cYAML **show_rc, struct cYAML **err_rc)
{
+ /*
+ * 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;
}
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;
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)
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;
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);
}
{
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,
{
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);
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);
};
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)