#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <libcfs/util/ioctl.h>
#include <lnet/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:
}
}
+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:
* <intf>[<expr>], <intf>[<expr>],..
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 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) {
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);
return rc;
}
-int lustre_lnet_config_peer_nid(char *knid, char **nid, bool mr, int seq_no,
- struct cYAML **err_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);
data.prcfg_mr = mr;
- 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;
+
+ /*
+ * 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:
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;
}
}
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:
goto out;
}
- if (LNET_NETTYP(net) == CIBLND ||
- LNET_NETTYP(net) == OPENIBLND ||
- LNET_NETTYP(net) == IIBLND ||
- LNET_NETTYP(net) == VIBLND) {
- snprintf(err_str,
- sizeof(err_str),
- "\"obselete LNet type '%s'\"", libcfs_lnd2str(net));
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
-
gateway_nid = libcfs_str2nid(gw);
if (gateway_nid == LNET_NID_ANY) {
snprintf(err_str,
goto out;
}
- if (LNET_NETTYP(net) == CIBLND ||
- LNET_NETTYP(net) == OPENIBLND ||
- LNET_NETTYP(net) == IIBLND ||
- LNET_NETTYP(net) == VIBLND) {
- snprintf(err_str,
- sizeof(err_str),
- "\"obselete LNet type '%s'\"", libcfs_lnd2str(net));
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
-
gateway_nid = libcfs_str2nid(gw);
if (gateway_nid == LNET_NID_ANY) {
snprintf(err_str,
goto out;
}
- if (LNET_NETTYP(net) == CIBLND ||
- LNET_NETTYP(net) == OPENIBLND ||
- LNET_NETTYP(net) == IIBLND ||
- LNET_NETTYP(net) == VIBLND) {
- snprintf(err_str,
- sizeof(err_str),
- "\"obsolete LNet type '%s'\"",
- libcfs_lnd2str(net));
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
} else {
/* show all routes without filtering on net */
net = LNET_NIDNET(LNET_NID_ANY);
if (detail) {
if (cYAML_create_number(item, "hop",
- data.cfg_config_u.cfg_route.
- rtr_hop) ==
+ (int) data.cfg_config_u.
+ cfg_route.rtr_hop) ==
NULL)
goto out;
static int socket_intf_query(int request, char *intf,
struct ifreq *ifr)
{
- int rc;
+ int rc = 0;
int sockfd;
if (strlen(intf) >= IFNAMSIZ || ifr == NULL)
strcpy(ifr->ifr_name, intf);
rc = ioctl(sockfd, request, ifr);
if (rc != 0)
- return LUSTRE_CFG_RC_BAD_PARAM;
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
- return 0;
+ close(sockfd);
+
+ return rc;
}
/*
{
int rc;
__u32 ip;
- struct lnet_dlc_intf_descr *intf_descr;
+ struct lnet_dlc_intf_descr *intf_descr, *tmp;
struct ifaddrs *ifaddr = ifa;
struct lustre_lnet_ip_range_descr *ip_range;
int family;
continue;
family = ifaddr->ifa_addr->sa_family;
- if (family == AF_INET) {
+ if (family == AF_INET &&
+ strcmp(ifaddr->ifa_name, "lo") != 0) {
rc = lustre_lnet_add_intf_descr
(intf_list, ifaddr->ifa_name,
strlen(ifaddr->ifa_name));
if (rc != LUSTRE_CFG_RC_NO_ERR)
return rc;
-
- return LUSTRE_CFG_RC_MATCH;
}
}
}
+
+ if (!list_empty(intf_list))
+ return LUSTRE_CFG_RC_MATCH;
+
+ return LUSTRE_CFG_RC_NO_MATCH;
}
/*
* If > 1 interfaces all the interfaces must match for the NI to
* be configured.
*/
- list_for_each_entry(intf_descr, intf_list, intf_on_network) {
+ list_for_each_entry_safe(intf_descr, tmp, intf_list, intf_on_network) {
for (ifaddr = ifa; ifaddr != NULL; ifaddr = ifaddr->ifa_next) {
if (ifaddr->ifa_addr == NULL)
continue;
break;
}
- if (ifaddr == NULL)
- return LUSTRE_CFG_RC_NO_MATCH;
+ if (ifaddr == NULL) {
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
+ continue;
+ }
- if ((ifaddr->ifa_flags & IFF_UP) == 0)
- return LUSTRE_CFG_RC_NO_MATCH;
+ if ((ifaddr->ifa_flags & IFF_UP) == 0) {
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
+ continue;
+ }
ip = ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr;
+ rc = 1;
list_for_each_entry(ip_range, ip_ranges, ipr_entry) {
rc = cfs_ip_addr_match(bswap_32(ip), &ip_range->ipr_expr);
if (rc)
break;
- else
- return LUSTRE_CFG_RC_NO_MATCH;
+ }
+
+ if (!rc) {
+ /* no match for this interface */
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
}
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*)
- (data + sizeof(*conf));
+ conf->lic_bulk;
LIBCFS_IOC_INIT_V2(*conf, lic_cfg_hdr);
conf->lic_cfg_hdr.ioc_len = len;
snprintf(err_str,
LNET_MAX_STR_LEN,
"\"cannot add network: %s\"", strerror(errno));
+ free(data);
return rc;
}
+ free(data);
i++;
}
snprintf(err_str, sizeof(err_str), "\"success\"");
- if (ip2nets == NULL ||
- list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+ if (!ip2nets) {
snprintf(err_str,
sizeof(err_str),
"\"incomplete ip2nets information\"");
goto out;
}
+ /*
+ * call below function to resolve the rules into a list of nids.
+ * The memory is allocated in that function then freed here when
+ * it's no longer needed.
+ */
rc = lustre_lnet_resolve_ip2nets_rule(ip2nets, &nids, &nnids);
if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH) {
snprintf(err_str,
goto out;
}
+ if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
+ snprintf(err_str, sizeof(err_str),
+ "\"no interfaces match ip2nets rules\"");
+ goto free_nids_out;
+ }
+
rc = lustre_lnet_ioctl_config_ni(&ip2nets->ip2nets_net.nw_intflist,
tunables, global_cpts, nids,
err_str);
- if (rc != LUSTRE_CFG_RC_NO_ERR)
- free(nids);
+
+free_nids_out:
+ free(nids);
out:
cYAML_build_error(rc, seq_no, ADD_CMD, "ip2nets", err_str, err_rc);
else
len = sizeof(struct lnet_ioctl_config_ni);
data = calloc(1, len);
+ if (!data) {
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ goto out;
+ }
conf = (struct lnet_ioctl_config_ni*) data;
if (tunables != NULL)
tun = (struct lnet_ioctl_config_lnd_tunables*)
goto out;
}
- if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
- return LUSTRE_CFG_RC_NO_ERR;
+ if (LNET_NETTYP(nw_descr->nw_id) == LOLND) {
+ rc = LUSTRE_CFG_RC_NO_ERR;
+ goto out;
+ }
if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
snprintf(err_str,
list_for_each_entry_safe(intf_descr, tmp,
&nw_descr->nw_intflist,
intf_on_network) {
- if (intf_descr->cpt_expr != NULL)
- cfs_expr_list_free(intf_descr->cpt_expr);
- free(intf_descr);
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
}
__u32 nnids = 0;
struct lnet_dlc_intf_descr *intf_descr, *tmp;
- if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
- return LUSTRE_CFG_RC_NO_ERR;
-
snprintf(err_str, sizeof(err_str), "\"success\"");
if (nw_descr == NULL) {
goto out;
}
+ if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
+ return LUSTRE_CFG_RC_NO_ERR;
+
if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
snprintf(err_str,
sizeof(err_str),
list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist,
intf_on_network) {
- if (intf_descr->cpt_expr != NULL)
- cfs_expr_list_free(intf_descr->cpt_expr);
- free(intf_descr);
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
out:
char *buf;
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;
struct cYAML *root = NULL, *tunables = NULL,
*net_node = NULL, *interfaces = NULL,
*item = NULL, *first_seq = NULL,
- *tmp = 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, new_net = true;
int net_num = 0;
- size_t buf_size = sizeof(*ni_data) + sizeof(*lnd);
+ size_t buf_size = sizeof(*ni_data) + sizeof(*lnd) + sizeof(*stats);
snprintf(err_str, sizeof(err_str), "\"out of memory\"");
rc = -1;
exist = true;
- lnd = (struct lnet_ioctl_config_lnd_tunables *)ni_data->lic_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;
if (detail) {
char *limit;
+ statistics = cYAML_create_object(item, "statistics");
+ if (statistics == NULL)
+ goto out;
+
+ if (cYAML_create_number(statistics, "send_count",
+ stats->send_count)
+ == NULL)
+ goto out;
+
+ if (cYAML_create_number(statistics, "recv_count",
+ stats->recv_count)
+ == NULL)
+ goto out;
+
+ if (cYAML_create_number(statistics, "drop_count",
+ stats->drop_count)
+ == NULL)
+ goto out;
+
tunables = cYAML_create_object(item, "tunables");
if (!tunables)
goto 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)
{
+ /*
+ * 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;
int l_errno = 0;
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);
+ int data_size = sizeof(*peer_info) + sizeof(*lpni_cri) +
+ sizeof(*lpni_stats);
+ char *data = calloc(data_size, 1);
bool new_peer = true;
snprintf(err_str, sizeof(err_str),
do {
for (i = 0;; i++) {
- memset(data, 0, sizeof(*peer_info) + sizeof(*lpni_cri));
+ memset(data, 0, data_size);
LIBCFS_IOC_INIT_V2(*peer_info, prcfg_hdr);
- peer_info->prcfg_hdr.ioc_len = sizeof(*peer_info) +
- sizeof(*lpni_cri);
+ peer_info->prcfg_hdr.ioc_len = data_size;
peer_info->prcfg_idx = i;
rc = l_ioctl(LNET_DEV_ID,
}
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));
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 ?
+ "True" : "False")
+ == NULL)
+ goto out;
tmp = cYAML_create_seq(peer, "peer ni");
if (tmp == NULL)
goto out;
== NULL)
goto out;
- if (cYAML_create_number(peer_ni, "refcount",
- lpni_cri->cr_refcount) == 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, "min_tx_credits",
+ lpni_cri->cr_peer_min_tx_credits)
+ == NULL)
+ goto out;
+
+ if (cYAML_create_number(peer_ni, "tx_q_num_of_buf",
+ lpni_cri->cr_peer_tx_qnob)
+ == NULL)
+ goto out;
+
if (cYAML_create_number(peer_ni, "available_rtr_credits",
lpni_cri->cr_peer_rtr_credits)
== NULL)
== NULL)
goto out;
- if (cYAML_create_number(peer_ni, "tx_q_num_of_buf",
- lpni_cri->cr_peer_tx_qnob)
+ if (cYAML_create_number(peer_ni, "send_count",
+ lpni_stats->send_count)
+ == NULL)
+ goto out;
+
+ if (cYAML_create_number(peer_ni, "recv_count",
+ lpni_stats->recv_count)
+ == NULL)
+ goto out;
+
+ if (cYAML_create_number(peer_ni, "drop_count",
+ lpni_stats->drop_count)
== NULL)
goto out;
+
+ if (cYAML_create_number(peer_ni, "refcount",
+ lpni_cri->cr_refcount) == NULL)
+ goto out;
}
if (l_errno != ENOENT) {
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;
goto out;
}
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
goto out;
cYAML_print_tree(root);
snprintf(err_str, sizeof(err_str), "\"success\"");
+ rc = LUSTRE_CFG_RC_NO_ERR;
out:
if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
cYAML_free_tree(root);
struct cYAML **err_rc)
{
struct lnet_ioctl_lnet_stats data;
- int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ int rc;
int l_errno;
char err_str[LNET_MAX_STR_LEN];
struct cYAML *root = NULL, *stats = NULL;
goto out;
}
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
goto out;
cYAML_print_tree(root);
snprintf(err_str, sizeof(err_str), "\"success\"");
+ rc = LUSTRE_CFG_RC_NO_ERR;
out:
if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
cYAML_free_tree(root);
for (i = 0; i < num; i++) {
if (*sub_array != NULL)
- free(sub_array);
+ free(*sub_array);
sub_array++;
}
- free(array);
+ if (array)
+ free(array);
}
/*
failed:
list_for_each_entry_safe(intf_descr, tmp, &nw_descr->nw_intflist,
intf_on_network) {
- if (intf_descr->cpt_expr != NULL)
- cfs_expr_list_free(intf_descr->cpt_expr);
- free(intf_descr);
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
return rc;
static bool
yaml_extract_cmn_tunables(struct cYAML *tree,
struct lnet_ioctl_config_lnd_cmn_tunables *tunables,
- int *num_global_cpts,
struct cfs_expr_list **global_cpts)
{
struct cYAML *tun, *item, *smp;
+ int rc;
tun = cYAML_get_object_item(tree, "tunables");
if (tun != NULL) {
tunables->lct_max_tx_credits = item->cy_valueint;
smp = cYAML_get_object_item(tun, "CPT");
if (smp != NULL) {
- *num_global_cpts =
- cfs_expr_list_parse(smp->cy_valuestring,
+ rc = cfs_expr_list_parse(smp->cy_valuestring,
strlen(smp->cy_valuestring),
0, UINT_MAX, global_cpts);
+ if (rc != 0)
+ *global_cpts = NULL;
}
return true;
static bool
yaml_extract_tunables(struct cYAML *tree,
struct lnet_ioctl_config_lnd_tunables *tunables,
- int *num_global_cpts,
struct cfs_expr_list **global_cpts,
__u32 net_type)
{
bool rc;
rc = yaml_extract_cmn_tunables(tree, &tunables->lt_cmn,
- num_global_cpts, global_cpts);
+ global_cpts);
if (!rc)
return rc;
{
struct cYAML *net, *intf, *seq_no, *ip2net = NULL, *local_nis = NULL,
*item = NULL;
- int num_entries = 0, num_global_cpts = 0, rc;
+ int num_entries = 0, rc;
struct lnet_dlc_network_descr nw_descr;
struct cfs_expr_list *global_cpts = NULL;
struct lnet_ioctl_config_lnd_tunables tunables;
net = cYAML_get_object_item(tree, "net type");
if (net)
nw_descr.nw_id = libcfs_str2net(net->cy_valuestring);
+ else
+ nw_descr.nw_id = LOLND;
/*
* if neither net nor ip2nets are present, then we can not
}
}
- found = yaml_extract_tunables(tree, &tunables, &num_global_cpts,
- &global_cpts,
+ found = yaml_extract_tunables(tree, &tunables, &global_cpts,
LNET_NETTYP(nw_descr.nw_id));
seq_no = cYAML_get_object_item(tree, "seq_no");
rc = lustre_lnet_config_ni(&nw_descr,
- (num_global_cpts > 0) ? global_cpts: NULL,
+ global_cpts,
(ip2net) ? ip2net->cy_valuestring : NULL,
(found) ? &tunables: NULL,
(seq_no) ? seq_no->cy_valueint : -1,
struct lustre_lnet_ip2nets ip2nets;
struct lustre_lnet_ip_range_descr *ip_range_descr = NULL,
*tmp = NULL;
- int rc = LUSTRE_CFG_RC_NO_ERR, num_global_cpts = 0;
+ int rc = LUSTRE_CFG_RC_NO_ERR;
struct cfs_expr_list *global_cpts = NULL;
struct cfs_expr_list *el, *el_tmp;
struct lnet_ioctl_config_lnd_tunables tunables;
}
}
- found = yaml_extract_tunables(tree, &tunables, &num_global_cpts,
- &global_cpts,
+ found = yaml_extract_tunables(tree, &tunables, &global_cpts,
LNET_NETTYP(ip2nets.ip2nets_net.nw_id));
rc = lustre_lnet_config_ip2nets(&ip2nets,
(found) ? &tunables : NULL,
- (num_global_cpts > 0) ? global_cpts : NULL,
+ global_cpts,
(seq_no) ? seq_no->cy_valueint : -1,
err_rc);
list_for_each_entry_safe(intf_descr, intf_tmp,
&ip2nets.ip2nets_net.nw_intflist,
intf_on_network) {
- if (intf_descr->cpt_expr != NULL)
- cfs_expr_list_free(intf_descr->cpt_expr);
- free(intf_descr);
+ list_del(&intf_descr->intf_on_network);
+ free_intf_descr(intf_descr);
}
list_for_each_entry_safe(ip_range_descr, tmp,
&ip2nets.ip2nets_ip_ranges,
ipr_entry) {
+ list_del(&ip_range_descr->ipr_entry);
list_for_each_entry_safe(el, el_tmp, &ip_range_descr->ipr_expr,
- el_link)
+ el_link) {
+ list_del(&el->el_link);
cfs_expr_list_free(el);
+ }
free(ip_range_descr);
}
static int yaml_copy_peer_nids(struct cYAML *tree, char ***nidsppp)
{
- struct cYAML *nids_entry = NULL, *child;
+ struct cYAML *nids_entry = NULL, *child = NULL, *entry = 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) {
+ nids_entry = cYAML_get_object_item(tree, "peer ni");
+ if (cYAML_is_sequence(nids_entry)) {
+ while (cYAML_get_next_seq_item(nids_entry, &child))
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)
+ 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;
{
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, "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);
{
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, "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);
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);
}
show_rc, err_rc);
}
+static int handle_yaml_config_numa(struct cYAML *tree, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ struct cYAML *seq_no, *range;
+
+ seq_no = cYAML_get_object_item(tree, "seq_no");
+ range = cYAML_get_object_item(tree, "range");
+
+ return lustre_lnet_config_numa_range(range ? range->cy_valueint : -1,
+ seq_no ? seq_no->cy_valueint : -1,
+ err_rc);
+}
+
+static int handle_yaml_del_numa(struct cYAML *tree, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ struct cYAML *seq_no;
+
+ seq_no = cYAML_get_object_item(tree, "seq_no");
+
+ return lustre_lnet_config_numa_range(0, seq_no ? seq_no->cy_valueint : -1,
+ err_rc);
+}
+
+static int handle_yaml_show_numa(struct cYAML *tree, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ struct cYAML *seq_no;
+
+ seq_no = cYAML_get_object_item(tree, "seq_no");
+
+ return lustre_lnet_show_numa_range(seq_no ? seq_no->cy_valueint : -1,
+ show_rc, err_rc);
+}
+
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_ni},
- {"ip2nets", handle_yaml_config_ip2nets},
- {"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 = "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},
- {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},
- {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)
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;
-}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff