*
* LGPL HEADER END
*
- * Copyright (c) 2014, 2016, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
*
* Author:
* Amir Shehata <amir.shehata@intel.com>
#include <fcntl.h>
#include <ifaddrs.h>
#include "liblnetconfig.h"
-#include "cyaml.h"
#define CONFIG_CMD "configure"
#define UNCONFIG_CMD "unconfigure"
#define DEL_CMD "del"
#define SHOW_CMD "show"
#define DBG_CMD "dbg"
-#define MANAGE_CMD "manage"
+#define MANAGE_CMD "manage"
+
+#define MAX_NUM_IPS 128
#define modparam_path "/sys/module/lnet/parameters/"
+#define gni_nid_path "/proc/cray_xt/"
const char *gmsg_stat_names[] = {"sent_stats", "received_stats",
"dropped_stats"};
}
}
+static char *get_next_delimiter_in_nid(char *str, char sep)
+{
+ char *at, *comma;
+
+ /* first find the '@' */
+ at = strchr(str, '@');
+ if (!at)
+ return str;
+
+ /* now that you found the at find the sep after */
+ comma = strchr(at, sep);
+ return comma;
+}
+
int lustre_lnet_parse_nids(char *nids, char **array, int size,
char ***out_array)
{
if (nids == NULL || strlen(nids) == 0)
return size;
- /* count the number or new nids, by counting the number of commas */
+ /* count the number or new nids, by counting the number of comma*/
while (comma) {
- comma = strchr(comma, ',');
+ comma = get_next_delimiter_in_nid(comma, ',');
if (comma) {
comma++;
num_nids++;
start = (size > 0) ? size: 0;
finish = (size > 0) ? size + num_nids : num_nids;
for (i = start; i < finish; i++) {
- comma = strchr(comma, ',');
+ comma = get_next_delimiter_in_nid(comma, ',');
if (!comma)
/*
* the length of the string to be parsed out is
int lustre_lnet_config_lib_init(void)
{
- return register_ioc_dev(LNET_DEV_ID, LNET_DEV_PATH,
- LNET_DEV_MAJOR, LNET_DEV_MINOR);
+ return register_ioc_dev(LNET_DEV_ID, LNET_DEV_PATH);
}
void lustre_lnet_config_lib_uninit(void)
return rc;
}
-static lnet_nid_t *allocate_create_nid_array(char **nids, __u32 num_nids,
- char *err_str)
-{
- lnet_nid_t *array = NULL;
- __u32 i;
-
- if (!nids || num_nids == 0) {
- snprintf(err_str, LNET_MAX_STR_LEN, "no NIDs to add");
- return NULL;
- }
-
- array = calloc(sizeof(*array) * num_nids, 1);
- if (array == NULL) {
- snprintf(err_str, LNET_MAX_STR_LEN, "out of memory");
- return NULL;
- }
-
- for (i = 0; i < num_nids; i++) {
- array[i] = libcfs_str2nid(nids[i]);
- if (array[i] == LNET_NID_ANY) {
- free(array);
- snprintf(err_str, LNET_MAX_STR_LEN,
- "bad NID: '%s'",
- nids[i]);
- return NULL;
- }
- }
-
- return array;
-}
-
static int dispatch_peer_ni_cmd(lnet_nid_t pnid, lnet_nid_t nid, __u32 cmd,
struct lnet_ioctl_peer_cfg *data,
char *err_str, char *cmd_str)
LNET_MAX_STR_LEN,
"\"cannot %s peer ni: %s\"",
(cmd_str) ? cmd_str : "add", strerror(errno));
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
}
return rc;
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;
+ struct lnet_process_id id;
char err_str[LNET_MAX_STR_LEN] = {0};
char *sep, *token, *end;
char buf[6];
int i;
bool flag = false;
- len = (sizeof(lnet_process_id_t) * LNET_INTERFACES_MAX_DEFAULT);
+ len = (sizeof(struct lnet_process_id) * LNET_INTERFACES_MAX_DEFAULT);
data = calloc(1, len);
if (data == NULL)
return rc;
}
-int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids,
- bool mr, int seq_no, struct cYAML **err_rc)
+static void lustre_lnet_clean_ip2nets(struct lustre_lnet_ip2nets *ip2nets)
{
- struct lnet_ioctl_peer_cfg data;
- lnet_nid_t prim_nid = LNET_NID_ANY;
- int rc = LUSTRE_CFG_RC_NO_ERR;
- int idx = 0;
- bool nid0_used = false;
- char err_str[LNET_MAX_STR_LEN] = {0};
- lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str);
+ struct lustre_lnet_ip_range_descr *ipr, *tmp;
+ struct cfs_expr_list *el, *el_tmp;
- if (pnid) {
- prim_nid = libcfs_str2nid(pnid);
- if (prim_nid == LNET_NID_ANY) {
- snprintf(err_str, sizeof(err_str),
- "bad key NID: '%s'",
- pnid);
- rc = LUSTRE_CFG_RC_MISSING_PARAM;
- goto out;
+ list_for_each_entry_safe(ipr, tmp,
+ &ip2nets->ip2nets_ip_ranges,
+ ipr_entry) {
+ list_del(&ipr->ipr_entry);
+ list_for_each_entry_safe(el, el_tmp, &ipr->ipr_expr,
+ el_link) {
+ list_del(&el->el_link);
+ cfs_expr_list_free(el);
}
- } 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;
+ free(ipr);
+ }
+}
+
+/*
+ * returns an rc < 0 if there is an error
+ * otherwise it returns the number IPs generated
+ * it also has out params: net - network name
+ */
+static int lnet_expr2ips(char *nidstr, __u32 *ip_list,
+ struct lustre_lnet_ip2nets *ip2nets,
+ __u32 *net, char *err_str)
+{
+ struct lustre_lnet_ip_range_descr *ipr;
+ char *comp1, *comp2;
+ int ip_idx = MAX_NUM_IPS - 1;
+ int ip_range_len, rc = LUSTRE_CFG_RC_NO_ERR;
+ __u32 net_type;
+ char ip_range[LNET_MAX_STR_LEN];
+
+ /* separate the two components of the NID */
+ comp1 = nidstr;
+ comp2 = strchr(nidstr, '@');
+ if (comp2 == NULL) {
+ snprintf(err_str,
+ LNET_MAX_STR_LEN,
+ "\"cannot parse NID %s\"", nidstr);
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
goto out;
- } else {
- prim_nid = LNET_NID_ANY;
}
- snprintf(err_str, sizeof(err_str), "\"Success\"");
+ /* length of the expected ip-range */
+ ip_range_len = comp2 - comp1;
+ if (ip_range_len >= LNET_MAX_STR_LEN) {
+ snprintf(err_str,
+ LNET_MAX_STR_LEN,
+ "\"too long ip_range '%s'\"", nidstr);
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ goto out;
+ }
- LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
- data.prcfg_mr = mr;
+ /* move beyond '@' */
+ comp2++;
/*
- * if prim_nid is not specified use the first nid in the list of
- * nids provided as the prim_nid. NOTE: on entering 'if' we must
- * have at least 1 NID
+ * if the net component is either o2ib or tcp then we expect
+ * an IP range which could only be a single IP address.
+ * Parse that.
*/
- if (prim_nid == LNET_NID_ANY) {
- nid0_used = true;
- prim_nid = nids[0];
+ *net = libcfs_str2net(comp2);
+ net_type = LNET_NETTYP(*net);
+ /* expression support is for o2iblnd and socklnd only */
+ if (net_type != O2IBLND && net_type != SOCKLND)
+ return LUSTRE_CFG_RC_SKIP;
+
+ strncpy(ip_range, comp1, ip_range_len);
+ ip_range[ip_range_len] = '\0';
+ ip2nets->ip2nets_net.nw_id = *net;
+
+ rc = lustre_lnet_add_ip_range(&ip2nets->ip2nets_ip_ranges, ip_range);
+ if (rc != LUSTRE_CFG_RC_NO_ERR) {
+ snprintf(err_str,
+ LNET_MAX_STR_LEN,
+ "\"cannot parse ip_range '%.100s'\"", ip_range);
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ goto out;
+ }
+
+ /*
+ * Generate all the IP Addresses from the parsed range. For sanity
+ * we allow only a max of MAX_NUM_IPS nids to be configured for
+ * a single peer.
+ */
+ list_for_each_entry(ipr, &ip2nets->ip2nets_ip_ranges, ipr_entry)
+ ip_idx = cfs_ip_addr_range_gen(ip_list, MAX_NUM_IPS,
+ &ipr->ipr_expr);
+
+ if (ip_idx == MAX_NUM_IPS - 1) {
+ snprintf(err_str, LNET_MAX_STR_LEN,
+ "no NIDs provided for configuration");
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_NO_MATCH;
+ goto out;
+ } else if (ip_idx == -1) {
+ rc = LUSTRE_CFG_RC_LAST_ELEM;
+ } else {
+ rc = ip_idx;
}
- /* Create the prim_nid first */
- rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
- IOC_LIBCFS_ADD_PEER_NI,
- &data, err_str, "add");
+out:
+ return rc;
+}
- if (rc != 0)
+static int lustre_lnet_handle_peer_ip2nets(char **nid, int num_nids, bool mr,
+ bool range, __u32 cmd,
+ char *cmd_type, char *err_str)
+{
+ __u32 net = LNET_NIDNET(LNET_NID_ANY);
+ int ip_idx;
+ int i, j, rc = LUSTRE_CFG_RC_NO_ERR;
+ __u32 ip_list[MAX_NUM_IPS];
+ struct lustre_lnet_ip2nets ip2nets;
+ struct lnet_ioctl_peer_cfg data;
+ lnet_nid_t peer_nid;
+ lnet_nid_t prim_nid = LNET_NID_ANY;
+
+ /* initialize all lists */
+ INIT_LIST_HEAD(&ip2nets.ip2nets_ip_ranges);
+ INIT_LIST_HEAD(&ip2nets.ip2nets_net.network_on_rule);
+ INIT_LIST_HEAD(&ip2nets.ip2nets_net.nw_intflist);
+
+ /* each nid entry is an expression */
+ for (i = 0; i < num_nids; i++) {
+ if (!range && i == 0)
+ prim_nid = libcfs_str2nid(nid[0]);
+ else if (range)
+ prim_nid = LNET_NID_ANY;
+
+ rc = lnet_expr2ips(nid[i], ip_list, &ip2nets, &net, err_str);
+ if (rc == LUSTRE_CFG_RC_SKIP)
+ continue;
+ else if (rc == LUSTRE_CFG_RC_LAST_ELEM)
+ rc = -1;
+ else if (rc < LUSTRE_CFG_RC_NO_ERR)
+ goto out;
+
+ ip_idx = rc;
+
+ for (j = MAX_NUM_IPS - 1; j > ip_idx; j--) {
+ peer_nid = LNET_MKNID(net, ip_list[j]);
+ if (peer_nid == LNET_NID_ANY) {
+ snprintf(err_str,
+ LNET_MAX_STR_LEN,
+ "\"cannot parse NID\"");
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ goto out;
+ }
+
+ LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
+ data.prcfg_mr = mr;
+
+ if (prim_nid == LNET_NID_ANY && j == MAX_NUM_IPS - 1) {
+ prim_nid = peer_nid;
+ peer_nid = LNET_NID_ANY;
+ }
+
+ if (!range && num_nids > 1 && i == 0 &&
+ cmd == IOC_LIBCFS_DEL_PEER_NI)
+ continue;
+ else if (!range && i == 0)
+ peer_nid = LNET_NID_ANY;
+
+ /*
+ * If prim_nid is not provided then the first nid in the
+ * list becomes the prim_nid. First time round the loop
+ * use LNET_NID_ANY for the first parameter, then use
+ * nid[0] as the key nid after wards
+ */
+ rc = dispatch_peer_ni_cmd(prim_nid, peer_nid, cmd,
+ &data, err_str, cmd_type);
+ if (rc != 0)
+ goto out;
+
+ /*
+ * we just deleted the entire peer using the
+ * primary_nid. So don't bother iterating through
+ * the rest of the nids
+ */
+ if (prim_nid != LNET_NID_ANY &&
+ peer_nid == LNET_NID_ANY &&
+ cmd == IOC_LIBCFS_DEL_PEER_NI)
+ goto next_nid;
+ }
+next_nid:
+ lustre_lnet_clean_ip2nets(&ip2nets);
+ }
+
+out:
+ lustre_lnet_clean_ip2nets(&ip2nets);
+ return rc;
+}
+
+int lustre_lnet_config_peer_nid(char *pnid, char **nid, int num_nids,
+ bool mr, bool ip2nets, int seq_no,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN] = {0};
+ char **nid_array = NULL;
+
+ snprintf(err_str, sizeof(err_str), "\"Success\"");
+
+ if (ip2nets) {
+ rc = lustre_lnet_handle_peer_ip2nets(nid, num_nids, mr,
+ ip2nets, IOC_LIBCFS_ADD_PEER_NI,
+ ADD_CMD, err_str);
goto out;
+ }
- /* add the rest of the nids to the key nid if any are available */
- for (idx = nid0_used ? 1 : 0 ; nids && idx < num_nids; idx++) {
- /*
- * If prim_nid is not provided then the first nid in the
- * list becomes the prim_nid. First time round the loop use
- * LNET_NID_ANY for the first parameter, then use nid[0]
- * as the key nid after wards
- */
- rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
- IOC_LIBCFS_ADD_PEER_NI, &data,
- err_str, "add");
+ if (pnid) {
+ if (libcfs_str2nid(pnid) == LNET_NID_ANY) {
+ snprintf(err_str, sizeof(err_str),
+ "bad primary NID: '%s'",
+ pnid);
+ rc = LUSTRE_CFG_RC_MISSING_PARAM;
+ goto out;
+ }
+
+ num_nids++;
- if (rc != 0)
+ nid_array = calloc(sizeof(*nid_array), num_nids);
+ if (!nid_array) {
+ snprintf(err_str, sizeof(err_str),
+ "out of memory");
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
goto out;
+ }
+ nid_array[0] = pnid;
+ memcpy(&nid_array[1], nid, sizeof(*nid) * (num_nids - 1));
}
+ rc = lustre_lnet_handle_peer_ip2nets((pnid) ? nid_array : nid,
+ num_nids, mr, ip2nets,
+ IOC_LIBCFS_ADD_PEER_NI, ADD_CMD,
+ err_str);
+ if (rc)
+ goto out;
+
out:
- if (nids != NULL)
- free(nids);
+ if (nid_array)
+ free(nid_array);
+
cYAML_build_error(rc, seq_no, ADD_CMD, "peer_ni", err_str, err_rc);
return rc;
}
int lustre_lnet_del_peer_nid(char *pnid, char **nid, int num_nids,
- int seq_no, struct cYAML **err_rc)
+ bool ip2nets, int seq_no, struct cYAML **err_rc)
{
- struct lnet_ioctl_peer_cfg data;
- lnet_nid_t prim_nid;
int rc = LUSTRE_CFG_RC_NO_ERR;
- int idx = 0;
char err_str[LNET_MAX_STR_LEN] = {0};
- lnet_nid_t *nids = allocate_create_nid_array(nid, num_nids, err_str);
+ char **nid_array = NULL;
+
+ snprintf(err_str, sizeof(err_str), "\"Success\"");
+
+ if (ip2nets) {
+ rc = lustre_lnet_handle_peer_ip2nets(nid, num_nids, false,
+ ip2nets, IOC_LIBCFS_DEL_PEER_NI,
+ DEL_CMD, err_str);
+ goto out;
+ }
if (pnid == NULL) {
snprintf(err_str, sizeof(err_str),
"\"Primary nid is not provided\"");
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
- } else {
- prim_nid = libcfs_str2nid(pnid);
- if (prim_nid == LNET_NID_ANY) {
+ } else if (!ip2nets) {
+ if (libcfs_str2nid(pnid) == LNET_NID_ANY) {
rc = LUSTRE_CFG_RC_BAD_PARAM;
snprintf(err_str, sizeof(err_str),
"bad key NID: '%s'",
}
}
- snprintf(err_str, sizeof(err_str), "\"Success\"");
-
- LIBCFS_IOC_INIT_V2(data, prcfg_hdr);
- if (!nids || nids[0] == LNET_NID_ANY) {
- rc = dispatch_peer_ni_cmd(prim_nid, LNET_NID_ANY,
- IOC_LIBCFS_DEL_PEER_NI,
- &data, err_str, "del");
+ num_nids++;
+ nid_array = calloc(sizeof(*nid_array), num_nids);
+ if (!nid_array) {
+ snprintf(err_str, sizeof(err_str),
+ "out of memory");
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
goto out;
}
+ nid_array[0] = pnid;
+ memcpy(&nid_array[1], nid, sizeof(*nid) * (num_nids - 1));
- for (idx = 0; nids && idx < num_nids; idx++) {
- rc = dispatch_peer_ni_cmd(prim_nid, nids[idx],
- IOC_LIBCFS_DEL_PEER_NI, &data,
- err_str, "del");
-
- if (rc != 0)
- goto out;
- }
+ rc = lustre_lnet_handle_peer_ip2nets(nid_array, num_nids, false,
+ ip2nets, IOC_LIBCFS_DEL_PEER_NI,
+ DEL_CMD, err_str);
+ if (rc)
+ goto out;
out:
- if (nids != NULL)
- free(nids);
+ if (nid_array)
+ free(nid_array);
+
cYAML_build_error(rc, seq_no, DEL_CMD, "peer_ni", err_str, err_rc);
return rc;
}
int lustre_lnet_config_route(char *nw, char *gw, int hops, int prio,
- int seq_no, struct cYAML **err_rc)
+ int sen, int seq_no, struct cYAML **err_rc)
{
struct lnet_ioctl_config_data data;
lnet_nid_t gateway_nid;
int rc = LUSTRE_CFG_RC_NO_ERR;
+ int ip_idx, i;
+ __u32 rnet = LNET_NIDNET(LNET_NID_ANY);
__u32 net = LNET_NIDNET(LNET_NID_ANY);
char err_str[LNET_MAX_STR_LEN];
+ __u32 ip_list[MAX_NUM_IPS];
+ struct lustre_lnet_ip2nets ip2nets;
+
+ /* initialize all lists */
+ INIT_LIST_HEAD(&ip2nets.ip2nets_ip_ranges);
+ INIT_LIST_HEAD(&ip2nets.ip2nets_net.network_on_rule);
+ INIT_LIST_HEAD(&ip2nets.ip2nets_net.nw_intflist);
snprintf(err_str, sizeof(err_str), "\"Success\"");
if (nw == NULL || gw == NULL) {
snprintf(err_str,
sizeof(err_str),
- "\"missing mandatory parameter(s): '%s'\"",
+ "\"missing mandatory parameter in route config:'%s'\"",
(nw == NULL && gw == NULL) ? "network, gateway" :
(nw == NULL) ? "network" : "gateway");
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
}
- net = libcfs_str2net(nw);
- if (net == LNET_NIDNET(LNET_NID_ANY)) {
+ rnet = libcfs_str2net(nw);
+ if (rnet == LNET_NIDNET(LNET_NID_ANY)) {
snprintf(err_str,
sizeof(err_str),
- "\"cannot parse net %s\"", nw);
- rc = LUSTRE_CFG_RC_BAD_PARAM;
- goto out;
- }
-
- gateway_nid = libcfs_str2nid(gw);
- if (gateway_nid == LNET_NID_ANY) {
- snprintf(err_str,
- sizeof(err_str),
- "\"cannot parse gateway NID '%s'\"", gw);
+ "\"cannot parse remote net %s\"", nw);
rc = LUSTRE_CFG_RC_BAD_PARAM;
goto out;
}
goto out;
}
- LIBCFS_IOC_INIT_V2(data, cfg_hdr);
- data.cfg_net = net;
- data.cfg_config_u.cfg_route.rtr_hop = hops;
- data.cfg_config_u.cfg_route.rtr_priority = prio;
- data.cfg_nid = gateway_nid;
-
- rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE, &data);
- if (rc != 0) {
- rc = -errno;
+ if (sen == -1) {
+ sen = 1;
+ } else if (sen < 1) {
snprintf(err_str,
sizeof(err_str),
- "\"cannot add route: %s\"", strerror(errno));
+ "\"invalid health sensitivity %d, must be 1 or greater\"",
+ sen );
+ rc = LUSTRE_CFG_RC_OUT_OF_RANGE_PARAM;
goto out;
}
+ rc = lnet_expr2ips(gw, ip_list,
+ &ip2nets, &net, err_str);
+ if (rc == LUSTRE_CFG_RC_LAST_ELEM)
+ rc = -1;
+ else if (rc < LUSTRE_CFG_RC_NO_ERR)
+ goto out;
+
+ ip_idx = rc;
+
+ LIBCFS_IOC_INIT_V2(data, cfg_hdr);
+ data.cfg_net = rnet;
+ data.cfg_config_u.cfg_route.rtr_hop = hops;
+ data.cfg_config_u.cfg_route.rtr_priority = prio;
+ data.cfg_config_u.cfg_route.rtr_sensitivity = sen;
+
+ for (i = MAX_NUM_IPS - 1; i > ip_idx; i--) {
+ gateway_nid = LNET_MKNID(net, ip_list[i]);
+ if (gateway_nid == LNET_NID_ANY) {
+ snprintf(err_str,
+ LNET_MAX_STR_LEN,
+ "\"cannot form gateway NID: %u\"",
+ ip_list[i]);
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ goto out;
+ }
+ data.cfg_nid = gateway_nid;
+
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE, &data);
+ if (rc != 0 && errno != EEXIST && errno != EHOSTUNREACH) {
+ rc = -errno;
+ snprintf(err_str,
+ sizeof(err_str),
+ "\"cannot add route: %s\"", strerror(errno));
+ goto out;
+ }
+ }
out:
cYAML_build_error(rc, seq_no, ADD_CMD, "route", err_str, err_rc);
struct lnet_ioctl_config_data data;
lnet_nid_t gateway_nid;
int rc = LUSTRE_CFG_RC_NO_ERR;
+ __u32 rnet = LNET_NIDNET(LNET_NID_ANY);
__u32 net = LNET_NIDNET(LNET_NID_ANY);
char err_str[LNET_MAX_STR_LEN];
+ int ip_idx, i;
+ __u32 ip_list[MAX_NUM_IPS];
+ struct lustre_lnet_ip2nets ip2nets;
+
+ /* initialize all lists */
+ INIT_LIST_HEAD(&ip2nets.ip2nets_ip_ranges);
+ INIT_LIST_HEAD(&ip2nets.ip2nets_net.network_on_rule);
+ INIT_LIST_HEAD(&ip2nets.ip2nets_net.nw_intflist);
snprintf(err_str, sizeof(err_str), "\"Success\"");
if (nw == NULL || gw == NULL) {
snprintf(err_str,
sizeof(err_str),
- "\"missing mandatory parameter(s): '%s'\"",
+ "\"missing mandatory parameter in route delete: '%s'\"",
(nw == NULL && gw == NULL) ? "network, gateway" :
(nw == NULL) ? "network" : "gateway");
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
}
- net = libcfs_str2net(nw);
- if (net == LNET_NIDNET(LNET_NID_ANY)) {
+ rnet = libcfs_str2net(nw);
+ if (rnet == LNET_NIDNET(LNET_NID_ANY)) {
snprintf(err_str,
sizeof(err_str),
- "\"cannot parse net '%s'\"", nw);
+ "\"cannot parse remote net '%s'\"", nw);
rc = LUSTRE_CFG_RC_BAD_PARAM;
goto out;
}
- gateway_nid = libcfs_str2nid(gw);
- if (gateway_nid == LNET_NID_ANY) {
- snprintf(err_str,
- sizeof(err_str),
- "\"cannot parse gateway NID '%s'\"", gw);
- rc = LUSTRE_CFG_RC_BAD_PARAM;
+ rc = lnet_expr2ips(gw, ip_list,
+ &ip2nets, &net, err_str);
+ if (rc == LUSTRE_CFG_RC_LAST_ELEM)
+ rc = -1;
+ else if (rc < LUSTRE_CFG_RC_NO_ERR)
goto out;
- }
+
+ ip_idx = rc;
LIBCFS_IOC_INIT_V2(data, cfg_hdr);
- data.cfg_net = net;
- data.cfg_nid = gateway_nid;
+ data.cfg_net = rnet;
- rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE, &data);
- if (rc != 0) {
- rc = -errno;
- snprintf(err_str,
- sizeof(err_str),
- "\"cannot delete route: %s\"", strerror(errno));
- goto out;
- }
+ for (i = MAX_NUM_IPS - 1; i > ip_idx; i--) {
+ gateway_nid = LNET_MKNID(net, ip_list[i]);
+ if (gateway_nid == LNET_NID_ANY) {
+ snprintf(err_str,
+ LNET_MAX_STR_LEN,
+ "\"cannot form gateway NID: %u\"",
+ ip_list[i]);
+ err_str[LNET_MAX_STR_LEN - 1] = '\0';
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ goto out;
+ }
+ data.cfg_nid = gateway_nid;
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE, &data);
+ if (rc != 0) {
+ rc = -errno;
+ snprintf(err_str,
+ sizeof(err_str),
+ "\"cannot delete route: %s\"", strerror(errno));
+ goto out;
+ }
+ }
out:
cYAML_build_error(rc, seq_no, DEL_CMD, "route", err_str, err_rc);
int lustre_lnet_show_route(char *nw, char *gw, int hops, int prio, int detail,
int seq_no, struct cYAML **show_rc,
- struct cYAML **err_rc)
+ struct cYAML **err_rc, bool backup)
{
struct lnet_ioctl_config_data data;
lnet_nid_t gateway_nid;
cfg_route.rtr_priority) == NULL)
goto out;
- if (cYAML_create_string(item, "state",
+ if (cYAML_create_number(item, "health_sensitivity",
+ data.cfg_config_u.
+ cfg_route.rtr_sensitivity) == NULL)
+ goto out;
+
+ if (!backup &&
+ cYAML_create_string(item, "state",
data.cfg_config_u.cfg_route.
rtr_flags ?
"up" : "down") == NULL)
return rc;
}
+static int lustre_lnet_queryip(struct lnet_dlc_intf_descr *intf, __u32 *ip)
+{
+ struct ifreq ifr;
+ int rc;
+
+ memset(&ifr, 0, sizeof(ifr));
+ rc = socket_intf_query(SIOCGIFFLAGS, intf->intf_name, &ifr);
+ if (rc != 0)
+ return LUSTRE_CFG_RC_BAD_PARAM;
+
+ if ((ifr.ifr_flags & IFF_UP) == 0)
+ return LUSTRE_CFG_RC_BAD_PARAM;
+
+ memset(&ifr, 0, sizeof(ifr));
+ rc = socket_intf_query(SIOCGIFADDR, intf->intf_name, &ifr);
+ if (rc != 0)
+ return LUSTRE_CFG_RC_BAD_PARAM;
+
+ *ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
+ *ip = bswap_32(*ip);
+
+ return LUSTRE_CFG_RC_NO_ERR;
+}
+
/*
* 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)
+ lnet_nid_t **nids, __u32 *nnids,
+ char *err_str, size_t str_len)
{
int i = 0, count = 0, rc;
- struct ifreq ifr;
- __u32 ip;
struct lnet_dlc_intf_descr *intf;
+ char val[LNET_MAX_STR_LEN];
+ __u32 ip;
+ int gni_num;
+ char *endp;
+ unsigned int num;
- if (nw == NULL || nids == NULL)
+
+ if (nw == NULL || nids == NULL) {
+ snprintf(err_str, str_len,
+ "\"unexpected parameters to lustre_lnet_intf2nids()\"");
+ err_str[str_len - 1] = '\0';
return LUSTRE_CFG_RC_BAD_PARAM;
+ }
- list_for_each_entry(intf, &nw->nw_intflist, intf_on_network)
- count++;
+ if (LNET_NETTYP(nw->nw_id) == GNILND) {
+ count = 1;
+ } else {
+ list_for_each_entry(intf, &nw->nw_intflist, intf_on_network)
+ count++;
+ }
*nids = calloc(count, sizeof(lnet_nid_t));
- if (*nids == NULL)
+ if (*nids == NULL) {
+ snprintf(err_str, str_len,
+ "\"out of memory\"");
+ err_str[str_len - 1] = '\0';
return LUSTRE_CFG_RC_OUT_OF_MEM;
-
- list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) {
- memset(&ifr, 0, sizeof(ifr));
- rc = socket_intf_query(SIOCGIFFLAGS, intf->intf_name, &ifr);
- if (rc != 0)
- goto failed;
-
- if ((ifr.ifr_flags & IFF_UP) == 0) {
- rc = LUSTRE_CFG_RC_BAD_PARAM;
+ }
+ /*
+ * special case the GNI interface since it doesn't have an IP
+ * address. The assumption is that there can only be one GNI
+ * interface in the system. No interface name is provided.
+ */
+ if (LNET_NETTYP(nw->nw_id) == GNILND) {
+ rc = read_sysfs_file(gni_nid_path, "nid", val,
+ 1, sizeof(val));
+ if (rc) {
+ snprintf(err_str, str_len,
+ "\"cannot read gni nid\"");
+ err_str[str_len - 1] = '\0';
goto failed;
}
+ gni_num = atoi(val);
- memset(&ifr, 0, sizeof(ifr));
- rc = socket_intf_query(SIOCGIFADDR, intf->intf_name, &ifr);
- if (rc != 0)
- goto failed;
+ (*nids)[i] = LNET_MKNID(nw->nw_id, gni_num);
- ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr;
- ip = bswap_32(ip);
- (*nids)[i] = LNET_MKNID(nw->nw_id, ip);
- i++;
+ goto out;
+ }
+
+ /* look at the other interfaces */
+ list_for_each_entry(intf, &nw->nw_intflist, intf_on_network) {
+ if (LNET_NETTYP(nw->nw_id) == PTL4LND) {
+ /* handle LNDs with numeric interface name */
+ num = strtoul(intf->intf_name, &endp, 0);
+ if (endp == intf->intf_name || *endp != '\0') {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, str_len,
+ "\"couldn't query intf %s\"",
+ intf->intf_name);
+ err_str[str_len - 1] = '\0';
+ goto failed;
+ }
+ (*nids)[i] = LNET_MKNID(nw->nw_id, num);
+ i++;
+ } else {
+ /* handle LNDs with ip interface name */
+ rc = lustre_lnet_queryip(intf, &ip);
+ if (rc != LUSTRE_CFG_RC_NO_ERR) {
+ snprintf(err_str, str_len,
+ "\"couldn't query intf %s\"",
+ intf->intf_name);
+ err_str[str_len - 1] = '\0';
+ goto failed;
+ }
+ (*nids)[i] = LNET_MKNID(nw->nw_id, ip);
+ i++;
+ }
}
+out:
*nnids = count;
return 0;
return LUSTRE_CFG_RC_MATCH;
}
-int lustre_lnet_resolve_ip2nets_rule(struct lustre_lnet_ip2nets *ip2nets,
- lnet_nid_t **nids, __u32 *nnids)
+static int lustre_lnet_resolve_ip2nets_rule(struct lustre_lnet_ip2nets *ip2nets,
+ lnet_nid_t **nids, __u32 *nnids,
+ char *err_str, size_t str_len)
{
struct ifaddrs *ifa;
int rc = LUSTRE_CFG_RC_NO_ERR;
rc = getifaddrs(&ifa);
- if (rc < 0)
+ if (rc < 0) {
+ snprintf(err_str, str_len,
+ "\"failed to get interface addresses: %d\"", -errno);
+ err_str[str_len - 1] = '\0';
return -errno;
+ }
rc = lustre_lnet_match_ip_to_intf(ifa,
&ip2nets->ip2nets_net.nw_intflist,
&ip2nets->ip2nets_ip_ranges);
if (rc != LUSTRE_CFG_RC_MATCH) {
+ snprintf(err_str, str_len,
+ "\"couldn't match ip to existing interfaces\"");
+ err_str[str_len - 1] = '\0';
freeifaddrs(ifa);
return rc;
}
- rc = lustre_lnet_intf2nids(&ip2nets->ip2nets_net, nids, nnids);
+ rc = lustre_lnet_intf2nids(&ip2nets->ip2nets_net, nids, nnids,
+ err_str, sizeof(err_str));
if (rc != LUSTRE_CFG_RC_NO_ERR) {
*nids = NULL;
*nnids = 0;
* 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\"");
+ rc = lustre_lnet_resolve_ip2nets_rule(ip2nets, &nids, &nnids, err_str,
+ sizeof(err_str));
+ if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH)
goto out;
- }
if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
snprintf(err_str, sizeof(err_str),
snprintf(err_str, sizeof(err_str), "\"success\"");
if (ip2net == NULL && (nw_descr == NULL || nw_descr->nw_id == 0 ||
- list_empty(&nw_descr->nw_intflist))) {
+ (list_empty(&nw_descr->nw_intflist) &&
+ LNET_NETTYP(nw_descr->nw_id) != GNILND))) {
snprintf(err_str,
sizeof(err_str),
- "\"missing mandatory parameters\"");
+ "\"missing mandatory parameters in NI config: '%s'\"",
+ (nw_descr == NULL) ? "network , interface" :
+ (nw_descr->nw_id == 0) ? "network" : "interface");
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
}
goto out;
}
- if (list_empty(&nw_descr->nw_intflist)) {
+ /*
+ * special case the GNI since no interface name is expected
+ */
+ if (list_empty(&nw_descr->nw_intflist) &&
+ (LNET_NETTYP(nw_descr->nw_id) != GNILND)) {
snprintf(err_str,
sizeof(err_str),
"\"no interface name provided\"");
goto out;
}
- rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids);
+ rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids,
+ err_str, sizeof(err_str));
if (rc != 0) {
- snprintf(err_str, sizeof(err_str),
- "\"bad parameter\"");
rc = LUSTRE_CFG_RC_BAD_PARAM;
goto out;
}
snprintf(err_str, sizeof(err_str), "\"success\"");
- if (nw_descr == NULL || nw_descr->nw_id == 0 ||
- list_empty(&nw_descr->nw_intflist)) {
+ if (nw_descr == NULL || nw_descr->nw_id == 0) {
snprintf(err_str,
sizeof(err_str),
- "\"missing mandatory parameter\"");
+ "\"missing mandatory parameter in deleting NI: '%s'\"",
+ (nw_descr == NULL) ? "network , interface" :
+ (nw_descr->nw_id == 0) ? "network" : "interface");
rc = LUSTRE_CFG_RC_MISSING_PARAM;
goto out;
}
goto out;
}
- rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids);
+ rc = lustre_lnet_intf2nids(nw_descr, &nids, &nnids,
+ err_str, sizeof(err_str));
if (rc != 0) {
- snprintf(err_str, sizeof(err_str),
- "\"bad parameter\"");
rc = LUSTRE_CFG_RC_BAD_PARAM;
goto out;
}
return rc;
}
+static int
+lustre_lnet_config_healthv(int value, bool all, lnet_nid_t nid,
+ enum lnet_health_type type, char *name,
+ int seq_no, struct cYAML **err_rc)
+{
+ struct lnet_ioctl_reset_health_cfg data;
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ LIBCFS_IOC_INIT_V2(data, rh_hdr);
+ data.rh_type = type;
+ data.rh_all = all;
+ data.rh_value = value;
+ data.rh_nid = nid;
+
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_SET_HEALHV, &data);
+ if (rc != 0) {
+ rc = -errno;
+ snprintf(err_str,
+ sizeof(err_str), "Can not configure health value: %s",
+ strerror(errno));
+ }
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, name, err_str, err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_config_ni_healthv(int value, bool all, char *ni_nid, int seq_no,
+ struct cYAML **err_rc)
+{
+ lnet_nid_t nid;
+ if (ni_nid)
+ nid = libcfs_str2nid(ni_nid);
+ else
+ nid = LNET_NID_ANY;
+ return lustre_lnet_config_healthv(value, all, nid,
+ LNET_HEALTH_TYPE_LOCAL_NI,
+ "ni healthv", seq_no, err_rc);
+}
+
+int lustre_lnet_config_peer_ni_healthv(int value, bool all, char *lpni_nid,
+ int seq_no, struct cYAML **err_rc)
+{
+ lnet_nid_t nid;
+ if (lpni_nid)
+ nid = libcfs_str2nid(lpni_nid);
+ else
+ nid = LNET_NID_ANY;
+ return lustre_lnet_config_healthv(value, all, nid,
+ LNET_HEALTH_TYPE_PEER_NI,
+ "peer_ni healthv", seq_no, err_rc);
+}
+
static bool
add_msg_stats_to_yaml_blk(struct cYAML *yaml,
struct lnet_ioctl_comm_count *counts)
}
int lustre_lnet_show_net(char *nw, int detail, int seq_no,
- struct cYAML **show_rc, struct cYAML **err_rc)
+ struct cYAML **show_rc, struct cYAML **err_rc,
+ bool backup)
{
char *buf;
struct lnet_ioctl_config_ni *ni_data;
struct lnet_ioctl_config_lnd_tunables *lnd;
struct lnet_ioctl_element_stats *stats;
struct lnet_ioctl_element_msg_stats msg_stats;
+ struct lnet_ioctl_local_ni_hstats hstats;
__u32 net = LNET_NIDNET(LNET_NID_ANY);
__u32 prev_net = LNET_NIDNET(LNET_NID_ANY);
int rc = LUSTRE_CFG_RC_OUT_OF_MEM, i, j;
struct cYAML *root = NULL, *tunables = NULL,
*net_node = NULL, *interfaces = NULL,
*item = NULL, *first_seq = NULL,
- *tmp = NULL, *statistics = NULL;
+ *tmp = NULL, *statistics = NULL,
+ *yhstats = NULL;
int str_buf_len = LNET_MAX_SHOW_NUM_CPT * 2;
char str_buf[str_buf_len];
char *pos;
net != rc_net)
continue;
+ /* if we're backing up don't store lo */
+ if (backup && LNET_NETTYP(rc_net) == LOLND)
+ continue;
+
/* default rc to -1 in case we hit the goto */
rc = -1;
exist = true;
if (first_seq == NULL)
first_seq = item;
- if (cYAML_create_string(item, "nid",
+ if (!backup &&
+ cYAML_create_string(item, "nid",
libcfs_nid2str(ni_data->lic_nid)) == NULL)
goto out;
- if (cYAML_create_string(item,
+ if (!backup &&
+ cYAML_create_string(item,
"status",
(ni_data->lic_status ==
LNET_NI_STATUS_UP) ?
char *limit;
int k;
+ if (backup)
+ goto continue_without_msg_stats;
+
statistics = cYAML_create_object(item, "statistics");
if (statistics == NULL)
goto out;
goto out;
}
+ LIBCFS_IOC_INIT_V2(hstats, hlni_hdr);
+ hstats.hlni_nid = ni_data->lic_nid;
+ /* grab health stats */
+ rc = l_ioctl(LNET_DEV_ID,
+ IOC_LIBCFS_GET_LOCAL_HSTATS,
+ &hstats);
+ if (rc != 0) {
+ l_errno = errno;
+ goto continue_without_msg_stats;
+ }
+ yhstats = cYAML_create_object(item, "health stats");
+ if (!yhstats)
+ goto out;
+ if (cYAML_create_number(yhstats, "health value",
+ hstats.hlni_health_value)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "interrupts",
+ hstats.hlni_local_interrupt)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "dropped",
+ hstats.hlni_local_dropped)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "aborted",
+ hstats.hlni_local_aborted)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "no route",
+ hstats.hlni_local_no_route)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "timeouts",
+ hstats.hlni_local_timeout)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "error",
+ hstats.hlni_local_error)
+ == NULL)
+ goto out;
+
continue_without_msg_stats:
tunables = cYAML_create_object(item, "tunables");
if (!tunables)
if (rc != LUSTRE_CFG_RC_NO_ERR)
goto out;
- tunables = cYAML_create_object(item, "lnd tunables");
- if (tunables == NULL)
- goto out;
-
rc = lustre_ni_show_tunables(tunables, LNET_NETTYP(rc_net),
&lnd->lt_tun);
- if (rc != LUSTRE_CFG_RC_NO_ERR)
+ if (rc != LUSTRE_CFG_RC_NO_ERR &&
+ rc != LUSTRE_CFG_RC_NO_MATCH)
goto out;
- if (cYAML_create_number(item, "tcp bonding",
- ni_data->lic_tcp_bonding)
- == NULL)
- goto out;
+ if (rc != LUSTRE_CFG_RC_NO_MATCH) {
+ tunables = cYAML_create_object(item,
+ "lnd tunables");
+ if (tunables == NULL)
+ goto out;
+ }
- if (cYAML_create_number(item, "dev cpt",
+ if (!backup &&
+ cYAML_create_number(item, "dev cpt",
ni_data->lic_dev_cpt) == NULL)
goto out;
+ if (!backup &&
+ cYAML_create_number(item, "tcp bonding",
+ ni_data->lic_tcp_bonding)
+ == NULL)
+ goto out;
+
/* out put the CPTs in the format: "[x,x,x,...]" */
limit = str_buf + str_buf_len - 3;
pos += snprintf(pos, limit - pos, "\"[");
return rc;
}
+int lustre_lnet_config_recov_intrv(int intrv, int seq_no, struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+ char val[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val, sizeof(val), "%d", intrv);
+
+ rc = write_sysfs_file(modparam_path, "lnet_recovery_interval", val,
+ 1, strlen(val) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure recovery interval: %s\"",
+ strerror(errno));
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "recovery_interval", err_str, err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_config_rtr_sensitivity(int sen, int seq_no, struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+ char val[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val, sizeof(val), "%d", sen);
+
+ rc = write_sysfs_file(modparam_path, "router_sensitivity_percentage", val,
+ 1, strlen(val) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure router health sensitivity: %s\"",
+ strerror(errno));
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "router_sensitivity", err_str, err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_config_hsensitivity(int sen, int seq_no, struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+ char val[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val, sizeof(val), "%d", sen);
+
+ rc = write_sysfs_file(modparam_path, "lnet_health_sensitivity", val,
+ 1, strlen(val) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure health sensitivity: %s\"",
+ strerror(errno));
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "health_sensitivity", err_str, err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_config_transaction_to(int timeout, int seq_no, struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+ char val[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val, sizeof(val), "%d", timeout);
+
+ rc = write_sysfs_file(modparam_path, "lnet_transaction_timeout", val,
+ 1, strlen(val) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure transaction timeout: %s\"",
+ strerror(errno));
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "transaction_timeout", err_str, err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_config_retry_count(int count, int seq_no, struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+ char val[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val, sizeof(val), "%d", count);
+
+ rc = write_sysfs_file(modparam_path, "lnet_retry_count", val,
+ 1, strlen(val) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure retry count: %s\"",
+ strerror(errno));
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "retry_count", err_str, err_rc);
+
+ return rc;
+}
+
int lustre_lnet_config_max_intf(int max, int seq_no, struct cYAML **err_rc)
{
int rc = LUSTRE_CFG_RC_NO_ERR;
}
+int lustre_lnet_config_drop_asym_route(int drop, 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", (drop) ? 1 : 0);
+
+ rc = write_sysfs_file(modparam_path, "lnet_drop_asym_route", val,
+ 1, strlen(val) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure drop asym route: %s\"",
+ strerror(errno));
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "drop_asym_route",
+ err_str, err_rc);
+
+ return rc;
+
+}
+
int lustre_lnet_config_numa_range(int range, int seq_no, struct cYAML **err_rc)
{
return ioctl_set_value(range, IOC_LIBCFS_SET_NUMA_RANGE,
}
int lustre_lnet_show_routing(int seq_no, struct cYAML **show_rc,
- struct cYAML **err_rc)
+ struct cYAML **err_rc, bool backup)
{
struct lnet_ioctl_config_data *data;
struct lnet_ioctl_pool_cfg *pool_cfg = NULL;
if (root == NULL)
goto out;
- pools_node = cYAML_create_seq(root, "routing");
+ if (backup)
+ pools_node = cYAML_create_object(root, "routing");
+ else
+ pools_node = cYAML_create_seq(root, "routing");
if (pools_node == NULL)
goto out;
pool_cfg = (struct lnet_ioctl_pool_cfg *)data->cfg_bulk;
+ if (backup)
+ goto calculate_buffers;
+
snprintf(node_name, sizeof(node_name), "cpt[%d]", i);
item = cYAML_create_seq_item(pools_node);
if (item == NULL)
if (cpt == NULL)
goto out;
+calculate_buffers:
/* create the tree and print */
for (j = 0; j < LNET_NRBPOOLS; j++) {
- type_node = cYAML_create_object(cpt, pools[j]);
- if (type_node == NULL)
- goto out;
- if (cYAML_create_number(type_node, "npages",
+ if (!backup) {
+ type_node = cYAML_create_object(cpt, pools[j]);
+ if (type_node == NULL)
+ goto out;
+ }
+ if (!backup &&
+ cYAML_create_number(type_node, "npages",
pool_cfg->pl_pools[j].pl_npages)
== NULL)
goto out;
- if (cYAML_create_number(type_node, "nbuffers",
+ if (!backup &&
+ cYAML_create_number(type_node, "nbuffers",
pool_cfg->pl_pools[j].
pl_nbuffers) == NULL)
goto out;
- if (cYAML_create_number(type_node, "credits",
+ if (!backup &&
+ cYAML_create_number(type_node, "credits",
pool_cfg->pl_pools[j].
pl_credits) == NULL)
goto out;
- if (cYAML_create_number(type_node, "mincredits",
+ if (!backup &&
+ cYAML_create_number(type_node, "mincredits",
pool_cfg->pl_pools[j].
pl_mincredits) == NULL)
goto out;
}
if (pool_cfg != NULL) {
+ if (backup) {
+ if (cYAML_create_number(pools_node, "enable",
+ pool_cfg->pl_routing) ==
+ NULL)
+ goto out;
+
+ goto add_buffer_section;
+ }
+
item = cYAML_create_seq_item(pools_node);
if (item == NULL)
goto out;
goto out;
}
+add_buffer_section:
/* create a buffers entry in the show. This is necessary so that
* if the YAML output is used to configure a node, the buffer
* configuration takes hold */
}
int lustre_lnet_show_peer(char *knid, int detail, int seq_no,
- struct cYAML **show_rc, struct cYAML **err_rc)
+ struct cYAML **show_rc, struct cYAML **err_rc,
+ bool backup)
{
/*
* TODO: This function is changing in a future patch to accommodate
struct lnet_peer_ni_credit_info *lpni_cri;
struct lnet_ioctl_element_stats *lpni_stats;
struct lnet_ioctl_element_msg_stats *msg_stats;
+ struct lnet_ioctl_peer_ni_hstats *hstats;
lnet_nid_t *nidp;
int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
int i, j, k;
__u32 size;
struct cYAML *root = NULL, *peer = NULL, *peer_ni = NULL,
*first_seq = NULL, *peer_root = NULL, *tmp = NULL,
- *msg_statistics = NULL, *statistics = NULL;
+ *msg_statistics = NULL, *statistics = NULL,
+ *yhstats;
char err_str[LNET_MAX_STR_LEN];
- lnet_process_id_t *list = NULL;
+ struct lnet_process_id *list = NULL;
void *data = NULL;
void *lpni_data;
+ bool exist = false;
snprintf(err_str, sizeof(err_str),
"\"out of memory\"");
goto out;
count = 1000;
- size = count * sizeof(lnet_process_id_t);
+ size = count * sizeof(struct lnet_process_id);
list = malloc(size);
if (list == NULL) {
l_errno = ENOMEM;
l_errno = ENOMEM;
goto out;
}
+
for (i = 0; i < count; i++) {
for (;;) {
memset(&peer_info, 0, sizeof(peer_info));
goto out;
}
}
+ exist = true;
peer = cYAML_create_seq_item(peer_root);
if (peer == NULL)
* requested
*/
if (detail >= 3) {
- if (cYAML_create_number(peer, "peer state",
+ if (!backup &&
+ cYAML_create_number(peer, "peer state",
peer_info.prcfg_state)
== NULL)
goto out;
lpni_cri = (void*)nidp + sizeof(nidp);
lpni_stats = (void *)lpni_cri + sizeof(*lpni_cri);
msg_stats = (void *)lpni_stats + sizeof(*lpni_stats);
- lpni_data = (void *)msg_stats + sizeof(*msg_stats);
+ hstats = (void *)msg_stats + sizeof(*msg_stats);
+ lpni_data = (void *)hstats + sizeof(*hstats);
peer_ni = cYAML_create_seq_item(tmp);
if (peer_ni == NULL)
== NULL)
goto out;
+ if (backup)
+ continue;
+
if (cYAML_create_string(peer_ni, "state",
lpni_cri->cr_aliveness)
== NULL)
goto out;
}
+ yhstats = cYAML_create_object(peer_ni, "health stats");
+ if (!yhstats)
+ goto out;
+ if (cYAML_create_number(yhstats, "health value",
+ hstats->hlpni_health_value)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "dropped",
+ hstats->hlpni_remote_dropped)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "timeout",
+ hstats->hlpni_remote_timeout)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "error",
+ hstats->hlpni_remote_error)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "network timeout",
+ hstats->hlpni_network_timeout)
+ == NULL)
+ goto out;
}
}
out:
free(list);
free(data);
- if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
+ if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR || !exist) {
cYAML_free_tree(root);
} else if (show_rc != NULL && *show_rc != NULL) {
struct cYAML *show_node;
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;
+ struct lnet_process_id *list = NULL;
snprintf(err_str, sizeof(err_str),
"\"out of memory\"");
goto out;
count = 1000;
- size = count * sizeof(lnet_process_id_t);
+ size = count * sizeof(struct lnet_process_id);
list = malloc(size);
if (list == NULL) {
l_errno = ENOMEM;
data.sv_value, show_rc, err_rc, l_errno);
}
+int lustre_lnet_show_recov_intrv(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 intrv = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+ rc = read_sysfs_file(modparam_path, "lnet_recovery_interval", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get recovery interval: %d\"", rc);
+ } else {
+ intrv = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "recovery_interval", intrv, show_rc,
+ err_rc, l_errno);
+}
+
+int lustre_lnet_show_hsensitivity(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ char val[LNET_MAX_STR_LEN];
+ int sen = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+ rc = read_sysfs_file(modparam_path, "lnet_health_sensitivity", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get health sensitivity: %d\"", rc);
+ } else {
+ sen = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "health_sensitivity", sen, show_rc,
+ err_rc, l_errno);
+}
+
+int lustre_lnet_show_rtr_sensitivity(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ char val[LNET_MAX_STR_LEN];
+ int sen = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+ rc = read_sysfs_file(modparam_path, "router_sensitivity_percentage", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get router sensitivity percentage: %d\"", rc);
+ } else {
+ sen = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "router_sensitivity", sen, show_rc,
+ err_rc, l_errno);
+}
+
+int lustre_lnet_show_transaction_to(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ char val[LNET_MAX_STR_LEN];
+ int tto = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+ rc = read_sysfs_file(modparam_path, "lnet_transaction_timeout", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get transaction timeout: %d\"", rc);
+ } else {
+ tto = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "transaction_timeout", tto, show_rc,
+ err_rc, l_errno);
+}
+
+int lustre_lnet_show_retry_count(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ char val[LNET_MAX_STR_LEN];
+ int retry_count = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+ rc = read_sysfs_file(modparam_path, "lnet_retry_count", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get retry count: %d\"", rc);
+ } else {
+ retry_count = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "retry_count", retry_count, show_rc,
+ err_rc, l_errno);
+}
+
+int show_recovery_queue(enum lnet_health_type type, char *name, int seq_no,
+ struct cYAML **show_rc, struct cYAML **err_rc)
+{
+ struct lnet_ioctl_recovery_list nid_list;
+ struct cYAML *root = NULL, *nids = NULL;
+ int rc, i;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "failed to print recovery queue\n");
+
+ LIBCFS_IOC_INIT_V2(nid_list, rlst_hdr);
+ nid_list.rlst_type = type;
+
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_RECOVERY_QUEUE, &nid_list);
+ if (rc) {
+ rc = errno;
+ goto out;
+ }
+
+ if (nid_list.rlst_num_nids == 0)
+ goto out;
+
+ root = cYAML_create_object(NULL, NULL);
+ if (root == NULL)
+ goto out;
+
+ nids = cYAML_create_object(root, name);
+ if (nids == NULL)
+ goto out;
+
+ rc = -EINVAL;
+
+ for (i = 0; i < nid_list.rlst_num_nids; i++) {
+ char nidenum[LNET_MAX_STR_LEN];
+ snprintf(nidenum, sizeof(nidenum), "nid-%d", i);
+ if (!cYAML_create_string(nids, nidenum,
+ libcfs_nid2str(nid_list.rlst_nid_array[i])))
+ goto out;
+ }
+
+ snprintf(err_str, sizeof(err_str), "success\n");
+
+ rc = 0;
+
+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 net node, if one doesn't exist
+ * then insert one. Otherwise add to the one there
+ */
+ show_node = cYAML_get_object_item(*show_rc, name);
+ if (show_node != NULL && cYAML_is_sequence(show_node)) {
+ cYAML_insert_child(show_node, nids);
+ free(nids);
+ free(root);
+ } else if (show_node == NULL) {
+ cYAML_insert_sibling((*show_rc)->cy_child,
+ nids);
+ free(root);
+ } else {
+ cYAML_free_tree(root);
+ }
+ } else {
+ *show_rc = root;
+ }
+
+ cYAML_build_error(rc, seq_no, SHOW_CMD, name, err_str, err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_show_local_ni_recovq(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ return show_recovery_queue(LNET_HEALTH_TYPE_LOCAL_NI, "local NI recovery",
+ seq_no, show_rc, err_rc);
+}
+
+int lustre_lnet_show_peer_ni_recovq(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ return show_recovery_queue(LNET_HEALTH_TYPE_PEER_NI, "peer NI recovery",
+ seq_no, show_rc, err_rc);
+}
+
int lustre_lnet_show_max_intf(int seq_no, struct cYAML **show_rc,
struct cYAML **err_rc)
{
err_rc, l_errno);
}
+int lustre_lnet_show_drop_asym_route(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 drop_asym_route = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN];
+
+ snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+
+ rc = read_sysfs_file(modparam_path, "lnet_drop_asym_route", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get drop asym route setting: %d\"", rc);
+ } else {
+ drop_asym_route = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "drop_asym_route", drop_asym_route,
+ show_rc, err_rc, l_errno);
+}
+
int lustre_lnet_show_numa_range(int seq_no, struct cYAML **show_rc,
struct cYAML **err_rc)
{
struct cYAML **err_rc)
{
struct lnet_ioctl_lnet_stats data;
+ struct lnet_counters *cntrs;
int rc;
int l_errno;
char err_str[LNET_MAX_STR_LEN];
LIBCFS_IOC_INIT_V2(data, st_hdr);
rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_LNET_STATS, &data);
- if (rc != 0) {
+ if (rc) {
l_errno = errno;
snprintf(err_str,
sizeof(err_str),
rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ cntrs = &data.st_cntrs;
+
root = cYAML_create_object(NULL, NULL);
- if (root == NULL)
+ if (!root)
goto out;
stats = cYAML_create_object(root, "statistics");
- if (stats == NULL)
+ if (!stats)
goto out;
- if (cYAML_create_number(stats, "msgs_alloc",
- data.st_cntrs.msgs_alloc) == NULL)
+ if (!cYAML_create_number(stats, "msgs_alloc",
+ cntrs->lct_common.lcc_msgs_alloc))
goto out;
- if (cYAML_create_number(stats, "msgs_max",
- data.st_cntrs.msgs_max) == NULL)
+ if (!cYAML_create_number(stats, "msgs_max",
+ cntrs->lct_common.lcc_msgs_max))
goto out;
- if (cYAML_create_number(stats, "errors",
- data.st_cntrs.errors) == NULL)
+ if (!cYAML_create_number(stats, "rst_alloc",
+ cntrs->lct_health.lch_rst_alloc))
goto out;
- if (cYAML_create_number(stats, "send_count",
- data.st_cntrs.send_count) == NULL)
+ if (!cYAML_create_number(stats, "errors",
+ cntrs->lct_common.lcc_errors))
goto out;
- if (cYAML_create_number(stats, "recv_count",
- data.st_cntrs.recv_count) == NULL)
+ if (!cYAML_create_number(stats, "send_count",
+ cntrs->lct_common.lcc_send_count))
goto out;
- if (cYAML_create_number(stats, "route_count",
- data.st_cntrs.route_count) == NULL)
+ if (!cYAML_create_number(stats, "resend_count",
+ cntrs->lct_health.lch_resend_count))
goto out;
- if (cYAML_create_number(stats, "drop_count",
- data.st_cntrs.drop_count) == NULL)
+ if (!cYAML_create_number(stats, "response_timeout_count",
+ cntrs->lct_health.lch_response_timeout_count))
goto out;
- if (cYAML_create_number(stats, "send_length",
- data.st_cntrs.send_length) == NULL)
+ if (!cYAML_create_number(stats, "local_interrupt_count",
+ cntrs->lct_health.lch_local_interrupt_count))
goto out;
- if (cYAML_create_number(stats, "recv_length",
- data.st_cntrs.recv_length) == NULL)
+ if (!cYAML_create_number(stats, "local_dropped_count",
+ cntrs->lct_health.lch_local_dropped_count))
goto out;
- if (cYAML_create_number(stats, "route_length",
- data.st_cntrs.route_length) == NULL)
+ if (!cYAML_create_number(stats, "local_aborted_count",
+ cntrs->lct_health.lch_local_aborted_count))
goto out;
- if (cYAML_create_number(stats, "drop_length",
- data.st_cntrs.drop_length) == NULL)
+ if (!cYAML_create_number(stats, "local_no_route_count",
+ cntrs->lct_health.lch_local_no_route_count))
goto out;
- if (show_rc == NULL)
+ if (!cYAML_create_number(stats, "local_timeout_count",
+ cntrs->lct_health.lch_local_timeout_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "local_error_count",
+ cntrs->lct_health.lch_local_error_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "remote_dropped_count",
+ cntrs->lct_health.lch_remote_dropped_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "remote_error_count",
+ cntrs->lct_health.lch_remote_error_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "remote_timeout_count",
+ cntrs->lct_health.lch_remote_timeout_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "network_timeout_count",
+ cntrs->lct_health.lch_network_timeout_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "recv_count",
+ cntrs->lct_common.lcc_recv_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "route_count",
+ cntrs->lct_common.lcc_route_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "drop_count",
+ cntrs->lct_common.lcc_drop_count))
+ goto out;
+
+ if (!cYAML_create_number(stats, "send_length",
+ cntrs->lct_common.lcc_send_length))
+ goto out;
+
+ if (!cYAML_create_number(stats, "recv_length",
+ cntrs->lct_common.lcc_recv_length))
+ goto out;
+
+ if (!cYAML_create_number(stats, "route_length",
+ cntrs->lct_common.lcc_route_length))
+ goto out;
+
+ if (!cYAML_create_number(stats, "drop_length",
+ cntrs->lct_common.lcc_drop_length))
+ goto out;
+
+ if (!show_rc)
cYAML_print_tree(root);
snprintf(err_str, sizeof(err_str), "\"success\"");
static int handle_yaml_config_route(struct cYAML *tree, struct cYAML **show_rc,
struct cYAML **err_rc)
{
- struct cYAML *net, *gw, *hop, *prio, *seq_no;
+ struct cYAML *net, *gw, *hop, *prio, *sen, *seq_no;
net = cYAML_get_object_item(tree, "net");
gw = cYAML_get_object_item(tree, "gateway");
hop = cYAML_get_object_item(tree, "hop");
prio = cYAML_get_object_item(tree, "priority");
+ sen = cYAML_get_object_item(tree, "health_sensitivity");
seq_no = cYAML_get_object_item(tree, "seq_no");
return lustre_lnet_config_route((net) ? net->cy_valuestring : NULL,
(gw) ? gw->cy_valuestring : NULL,
(hop) ? hop->cy_valueint : -1,
(prio) ? prio->cy_valueint : -1,
+ (sen) ? sen->cy_valueint : -1,
(seq_no) ? seq_no->cy_valueint : -1,
err_rc);
}
return rc;
}
-static int yaml_copy_peer_nids(struct cYAML *tree, char ***nidsppp, bool del)
+static int yaml_copy_peer_nids(struct cYAML *nids_entry, char ***nidsppp,
+ char *prim_nid, bool del)
{
- struct cYAML *nids_entry = NULL, *child = NULL, *entry = NULL,
- *prim_nid = NULL;
+ struct cYAML *child = NULL, *entry = NULL;
char **nids = NULL;
int num = 0, rc = LUSTRE_CFG_RC_NO_ERR;
- 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");
if (!entry || !entry->cy_valuestring)
continue;
- if ((strcmp(entry->cy_valuestring, prim_nid->cy_valuestring)
+ if (prim_nid &&
+ (strcmp(entry->cy_valuestring, prim_nid)
== 0) && del) {
/*
* primary nid is present in the list of
if (num == 0)
return LUSTRE_CFG_RC_MISSING_PARAM;
- nids = calloc(sizeof(*nids) * num, 1);
- if (nids == NULL)
+ nids = calloc(sizeof(*nids), num);
+ if (!nids)
return LUSTRE_CFG_RC_OUT_OF_MEM;
/* now grab all the nids */
if (!entry || !entry->cy_valuestring)
continue;
- nids[num] = calloc(strlen(entry->cy_valuestring) + 1, 1);
+ nids[num] = strdup(entry->cy_valuestring);
if (!nids[num]) {
rc = LUSTRE_CFG_RC_OUT_OF_MEM;
goto failed;
}
- strncpy(nids[num], entry->cy_valuestring,
- strlen(entry->cy_valuestring));
num++;
}
rc = num;
{
char **nids = NULL;
int num, rc;
- struct cYAML *seq_no, *prim_nid, *non_mr;
-
- num = yaml_copy_peer_nids(tree, &nids, false);
- if (num < 0)
- return num;
+ struct cYAML *seq_no, *prim_nid, *mr, *ip2nets, *peer_nis;
+ char err_str[LNET_MAX_STR_LEN];
+ bool mr_value;
seq_no = cYAML_get_object_item(tree, "seq_no");
prim_nid = cYAML_get_object_item(tree, "primary nid");
- non_mr = cYAML_get_object_item(tree, "non_mr");
+ mr = cYAML_get_object_item(tree, "Multi-Rail");
+ ip2nets = cYAML_get_object_item(tree, "ip2nets");
+ peer_nis = cYAML_get_object_item(tree, "peer ni");
+
+ if (ip2nets && (prim_nid || peer_nis)) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, sizeof(err_str),
+ "ip2nets can not be specified along side prim_nid"
+ " or peer ni fields");
+ cYAML_build_error(rc, (seq_no) ? seq_no->cy_valueint : -1,
+ ADD_CMD, "peer", err_str, err_rc);
+ return rc;
+ }
+
+ if (!mr)
+ mr_value = true;
+ else {
+ if (!mr->cy_valuestring || !strcmp(mr->cy_valuestring, "True"))
+ mr_value = true;
+ else if (!strcmp(mr->cy_valuestring, "False"))
+ mr_value = false;
+ else {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, sizeof(err_str), "Bad MR value");
+ cYAML_build_error(rc, (seq_no) ? seq_no->cy_valueint : -1,
+ ADD_CMD, "peer", err_str, err_rc);
+ return rc;
+ }
+ }
+
+ num = yaml_copy_peer_nids((ip2nets) ? ip2nets : peer_nis, &nids,
+ (prim_nid) ? prim_nid->cy_valuestring : NULL,
+ false);
+
+ if (num < 0) {
+ snprintf(err_str, sizeof(err_str),
+ "error copying nids from YAML block");
+ cYAML_build_error(num, (seq_no) ? seq_no->cy_valueint : -1,
+ ADD_CMD, "peer", err_str, err_rc);
+ return num;
+ }
rc = lustre_lnet_config_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL,
- nids, num,
- (non_mr) ? false : true,
+ nids, num, mr_value,
+ (ip2nets) ? true : false,
(seq_no) ? seq_no->cy_valueint : -1,
err_rc);
{
char **nids = NULL;
int num, rc;
- struct cYAML *seq_no, *prim_nid;
-
- num = yaml_copy_peer_nids(tree, &nids, true);
- if (num < 0)
- return num;
+ struct cYAML *seq_no, *prim_nid, *ip2nets, *peer_nis;
+ char err_str[LNET_MAX_STR_LEN];
seq_no = cYAML_get_object_item(tree, "seq_no");
prim_nid = cYAML_get_object_item(tree, "primary nid");
+ ip2nets = cYAML_get_object_item(tree, "ip2nets");
+ peer_nis = cYAML_get_object_item(tree, "peer ni");
+
+ if (ip2nets && (prim_nid || peer_nis)) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, sizeof(err_str),
+ "ip2nets can not be specified along side prim_nid"
+ " or peer ni fields");
+ cYAML_build_error(rc, (seq_no) ? seq_no->cy_valueint : -1,
+ DEL_CMD, "peer", err_str, err_rc);
+ return rc;
+ }
+
+ num = yaml_copy_peer_nids((ip2nets) ? ip2nets : peer_nis , &nids,
+ (prim_nid) ? prim_nid->cy_valuestring : NULL,
+ true);
+ if (num < 0) {
+ snprintf(err_str, sizeof(err_str),
+ "error copying nids from YAML block");
+ cYAML_build_error(num, (seq_no) ? seq_no->cy_valueint : -1,
+ ADD_CMD, "peer", err_str, err_rc);
+ return num;
+ }
rc = lustre_lnet_del_peer_nid((prim_nid) ? prim_nid->cy_valuestring : NULL,
- nids, num,
+ nids, num, (ip2nets) ? true : false,
(seq_no) ? seq_no->cy_valueint : -1,
err_rc);
(prio) ? prio->cy_valueint : -1,
(detail) ? detail->cy_valueint : 0,
(seq_no) ? seq_no->cy_valueint : -1,
- show_rc,
- err_rc);
+ show_rc, err_rc, false);
}
static int handle_yaml_show_net(struct cYAML *tree, struct cYAML **show_rc,
return lustre_lnet_show_net((net) ? net->cy_valuestring : NULL,
(detail) ? detail->cy_valueint : 0,
(seq_no) ? seq_no->cy_valueint : -1,
- show_rc,
- err_rc);
+ show_rc, err_rc, false);
}
static int handle_yaml_show_routing(struct cYAML *tree, struct cYAML **show_rc,
seq_no = cYAML_get_object_item(tree, "seq_no");
return lustre_lnet_show_routing((seq_no) ? seq_no->cy_valueint : -1,
- show_rc, err_rc);
+ show_rc, err_rc, false);
}
static int handle_yaml_show_peers(struct cYAML *tree, struct cYAML **show_rc,
return lustre_lnet_show_peer((nid) ? nid->cy_valuestring : NULL,
(detail) ? detail->cy_valueint : 0,
(seq_no) ? seq_no->cy_valueint : -1,
- show_rc, err_rc);
+ show_rc, err_rc, false);
}
static int handle_yaml_show_stats(struct cYAML *tree, struct cYAML **show_rc,
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);
+}
+
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;
+ struct cYAML *max_intf, *numa, *discovery, *retry, *tto, *seq_no,
+ *sen, *recov, *rsen, *drop_asym_route;
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
: -1,
err_rc);
+ drop_asym_route = cYAML_get_object_item(tree, "drop_asym_route");
+ if (drop_asym_route)
+ rc = lustre_lnet_config_drop_asym_route(
+ drop_asym_route->cy_valueint,
+ seq_no ? seq_no->cy_valueint : -1,
+ err_rc);
+
+ retry = cYAML_get_object_item(tree, "retry_count");
+ if (retry)
+ rc = lustre_lnet_config_retry_count(retry->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
+ tto = cYAML_get_object_item(tree, "transaction_timeout");
+ if (tto)
+ rc = lustre_lnet_config_transaction_to(tto->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
+ sen = cYAML_get_object_item(tree, "health_sensitivity");
+ if (sen)
+ rc = lustre_lnet_config_hsensitivity(sen->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
+ recov = cYAML_get_object_item(tree, "recovery_interval");
+ if (recov)
+ rc = lustre_lnet_config_recov_intrv(recov->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
+ rsen = cYAML_get_object_item(tree, "router_sensitivity");
+ if (rsen)
+ rc = lustre_lnet_config_rtr_sensitivity(rsen->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
return rc;
}
struct cYAML **show_rc,
struct cYAML **err_rc)
{
- struct cYAML *max_intf, *numa, *discovery, *seq_no;
+ struct cYAML *max_intf, *numa, *discovery, *seq_no, *drop_asym_route;
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
: -1,
err_rc);
+ /* asymmetrical route messages are accepted by default */
+ drop_asym_route = cYAML_get_object_item(tree, "drop_asym_route");
+ if (drop_asym_route)
+ rc = lustre_lnet_config_drop_asym_route(
+ 0, seq_no ? seq_no->cy_valueint : -1, err_rc);
+
return rc;
}
struct cYAML **show_rc,
struct cYAML **err_rc)
{
- struct cYAML *max_intf, *numa, *discovery, *seq_no;
+ struct cYAML *max_intf, *numa, *discovery, *retry, *tto, *seq_no,
+ *sen, *recov, *rsen, *drop_asym_route;
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
: -1,
show_rc, err_rc);
+ drop_asym_route = cYAML_get_object_item(tree, "drop_asym_route");
+ if (drop_asym_route)
+ rc = lustre_lnet_show_drop_asym_route(
+ seq_no ? seq_no->cy_valueint : -1,
+ show_rc, err_rc);
+
+ retry = cYAML_get_object_item(tree, "retry_count");
+ if (retry)
+ rc = lustre_lnet_show_retry_count(seq_no ? seq_no->cy_valueint
+ : -1,
+ show_rc, err_rc);
+
+ tto = cYAML_get_object_item(tree, "transaction_timeout");
+ if (tto)
+ rc = lustre_lnet_show_transaction_to(seq_no ? seq_no->cy_valueint
+ : -1,
+ show_rc, err_rc);
+
+ sen = cYAML_get_object_item(tree, "health_sensitivity");
+ if (sen)
+ rc = lustre_lnet_show_hsensitivity(seq_no ? seq_no->cy_valueint
+ : -1,
+ show_rc, err_rc);
+
+ recov = cYAML_get_object_item(tree, "recovery_interval");
+ if (recov)
+ rc = lustre_lnet_show_recov_intrv(seq_no ? seq_no->cy_valueint
+ : -1,
+ show_rc, err_rc);
+
+ rsen = cYAML_get_object_item(tree, "router_sensitivity");
+ if (rsen)
+ rc = lustre_lnet_show_hsensitivity(seq_no ? seq_no->cy_valueint
+ : -1,
+ show_rc, err_rc);
+
return rc;
}
{ .name = "buffers", .cb = handle_yaml_config_buffers },
{ .name = "statistics", .cb = handle_yaml_no_op },
{ .name = "global", .cb = handle_yaml_config_global_settings},
+ { .name = "numa", .cb = handle_yaml_config_numa },
{ .name = "ping", .cb = handle_yaml_no_op },
{ .name = "discover", .cb = handle_yaml_no_op },
{ .name = NULL } };
{ .name = "buffers", .cb = handle_yaml_no_op },
{ .name = "statistics", .cb = handle_yaml_no_op },
{ .name = "global", .cb = handle_yaml_del_global_settings},
+ { .name = "numa", .cb = handle_yaml_del_numa },
{ .name = "ping", .cb = handle_yaml_no_op },
{ .name = "discover", .cb = handle_yaml_no_op },
{ .name = NULL } };
{ .name = "buffers", .cb = handle_yaml_show_routing },
{ .name = "statistics", .cb = handle_yaml_show_stats },
{ .name = "global", .cb = handle_yaml_show_global_settings},
+ { .name = "numa", .cb = handle_yaml_show_numa },
{ .name = "ping", .cb = handle_yaml_no_op },
{ .name = "discover", .cb = handle_yaml_no_op },
{ .name = NULL } };
{ .name = "buffers", .cb = handle_yaml_no_op },
{ .name = "statistics", .cb = handle_yaml_no_op },
{ .name = "global", .cb = handle_yaml_no_op },
+ { .name = "numa", .cb = handle_yaml_no_op },
{ .name = "ping", .cb = handle_yaml_ping },
{ .name = "discover", .cb = handle_yaml_discover },
{ .name = NULL } };
git://git.whamcloud.com / fs / lustre-release.git / blobdiff