#include <ifaddrs.h>
#include <rdma/rdma_user_cm.h>
#include "liblnetconfig.h"
-
-#define CONFIG_CMD "configure"
-#define UNCONFIG_CMD "unconfigure"
-#define ADD_CMD "add"
-#define DEL_CMD "del"
-#define SHOW_CMD "show"
-#define DBG_CMD "dbg"
-#define MANAGE_CMD "manage"
-
-#define MAX_NUM_IPS 128
-
-#define modparam_path "/sys/module/lnet/parameters/"
-#define o2ib_modparam_path "/sys/module/ko2iblnd/parameters/"
-#define gni_nid_path "/proc/cray_xt/"
+#include <glob.h>
+#include <libcfs/util/param.h>
#ifndef HAVE_USRSPC_RDMA_PS_TCP
#define RDMA_PS_TCP 0x0106
}
}
-int tokenize_nidstr(char *nidstr, char *out[LNET_MAX_STR_LEN], char *err_str)
-{
- int bracket = 0, num_str = 0;
- char *strstart, *chptr;
-
- if (!nidstr) {
- snprintf(err_str, LNET_MAX_STR_LEN, "supplied nidstr is NULL");
- return LUSTRE_CFG_RC_BAD_PARAM;
- }
-
- /* comma-separated nidranges -> space-separated nidranges */
- chptr = &nidstr[0];
- strstart = chptr;
- while (true) {
- if (*chptr == '\0') {
- out[num_str] = strstart;
- num_str++;
- break;
- }
-
- if (*chptr == '[')
- bracket++;
- else if (*chptr == ']')
- bracket--;
-
- if (bracket < 0) {
- snprintf(err_str, LNET_MAX_STR_LEN,
- "Mismatched brackets in nidstring \"%s\"",
- nidstr);
- return LUSTRE_CFG_RC_BAD_PARAM;
- }
-
- if (bracket == 0 && *chptr == ',') {
- out[num_str] = strstart;
- *chptr = '\0';
- num_str++;
- strstart = chptr + 1;
- }
-
- chptr++;
- }
-
- if (bracket != 0) {
- snprintf(err_str, LNET_MAX_STR_LEN,
- "Mismatched brackets in nidstring \"%s\"", nidstr);
- return LUSTRE_CFG_RC_BAD_PARAM;
- }
-
- return num_str;
-}
-
int lustre_lnet_parse_nidstr(char *nidstr, lnet_nid_t *lnet_nidlist,
int max_nids, char *err_str)
{
}
num_nids = cfs_expand_nidlist(&nidlist, lnet_nidlist, max_nids);
+ cfs_free_nidlist(&nidlist);
if (num_nids == -1) {
snprintf(err_str, LNET_MAX_STR_LEN,
struct libcfs_ioctl_data data;
unsigned int opc;
int rc;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"Success\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"Success\"";
LIBCFS_IOC_INIT(data);
return rc;
}
-int lustre_lnet_config_peer_nidlist(char *pnidstr, lnet_nid_t *lnet_nidlist,
- int num_nids, bool is_mr, int seq_no,
- struct cYAML **err_rc)
+static int
+lustre_lnet_mod_peer_nidlist(lnet_nid_t pnid, lnet_nid_t *lnet_nidlist,
+ int cmd, int num_nids, bool is_mr, int seq_no,
+ struct cYAML **err_rc)
{
int rc = LUSTRE_CFG_RC_NO_ERR;
char err_str[LNET_MAX_STR_LEN];
lnet_nid_t *lnet_nidlist2 = NULL;
- lnet_nid_t pnid;
+ int ioc_cmd = (cmd == LNETCTL_ADD_CMD) ? IOC_LIBCFS_ADD_PEER_NI :
+ IOC_LIBCFS_DEL_PEER_NI;
+ char *cmd_str = (cmd == LNETCTL_ADD_CMD) ? ADD_CMD : DEL_CMD;
- if (pnidstr) {
- pnid = libcfs_str2nid(pnidstr);
- if (pnid == LNET_NID_ANY) {
- snprintf(err_str, LNET_MAX_STR_LEN,
- "bad primary NID: '%s'", pnidstr);
- rc = LUSTRE_CFG_RC_MISSING_PARAM;
- goto out;
- }
-
- num_nids++;
-
- lnet_nidlist2 = calloc(sizeof(*lnet_nidlist2), num_nids);
- if (!lnet_nidlist2) {
- snprintf(err_str, LNET_MAX_STR_LEN, "out of memory");
- rc = LUSTRE_CFG_RC_OUT_OF_MEM;
- goto out;
- }
- lnet_nidlist2[0] = pnid;
- memcpy(&lnet_nidlist2[1], lnet_nidlist, sizeof(*lnet_nidlist) *
- (num_nids - 1));
+ num_nids++;
+ lnet_nidlist2 = calloc(sizeof(*lnet_nidlist2), num_nids);
+ if (!lnet_nidlist2) {
+ snprintf(err_str, LNET_MAX_STR_LEN, "out of memory");
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ goto out;
}
+ lnet_nidlist2[0] = pnid;
+ memcpy(&lnet_nidlist2[1], lnet_nidlist, sizeof(*lnet_nidlist) *
+ (num_nids - 1));
- rc = lustre_lnet_handle_peer_nidlist((pnidstr) ? lnet_nidlist2 :
- lnet_nidlist,
- num_nids, is_mr,
- IOC_LIBCFS_ADD_PEER_NI, ADD_CMD,
- err_str);
+ rc = lustre_lnet_handle_peer_nidlist(lnet_nidlist2,
+ num_nids, is_mr, ioc_cmd,
+ cmd_str, err_str);
out:
if (lnet_nidlist2)
free(lnet_nidlist2);
- cYAML_build_error(rc, seq_no, ADD_CMD, "peer_ni", err_str, err_rc);
+ cYAML_build_error(rc, seq_no, cmd_str, "peer_ni", err_str, err_rc);
return rc;
}
-int lustre_lnet_del_peer_nidlist(char *pnidstr, lnet_nid_t *lnet_nidlist,
- int num_nids, int seq_no,
- struct cYAML **err_rc)
+static void
+replace_sep(char *str, char sep, char newsep)
{
- int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
- lnet_nid_t *lnet_nidlist2 = NULL;
- lnet_nid_t pnid;
+ int bracket = 0;
+ int i;
+ if (!str)
+ return;
+ for (i = 0; i < strlen(str); i++) {
+ /* don't replace ',' within [] */
+ if (str[i] == '[')
+ bracket++;
+ else if (str[i] == ']')
+ bracket--;
+ else if (str[i] == sep && bracket == 0)
+ str[i] = newsep;
+ }
+}
- if (!pnidstr) {
- snprintf(err_str, sizeof(err_str),
- "\"Primary nid is not provided\"");
- rc = LUSTRE_CFG_RC_MISSING_PARAM;
+int lustre_lnet_modify_peer(char *prim_nid, char *nids, bool is_mr,
+ int cmd, int seq_no, struct cYAML **err_rc)
+{
+ int num_nids, rc;
+ char err_str[LNET_MAX_STR_LEN] = "Error";
+ lnet_nid_t lnet_nidlist[LNET_MAX_NIDS_PER_PEER];
+ lnet_nid_t pnid = LNET_NID_ANY;
+
+ if (!prim_nid) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, LNET_MAX_STR_LEN,
+ "--prim_nid must be specified");
goto out;
}
- pnid = libcfs_str2nid(pnidstr);
+ pnid = libcfs_str2nid(prim_nid);
if (pnid == LNET_NID_ANY) {
rc = LUSTRE_CFG_RC_BAD_PARAM;
- snprintf(err_str, sizeof(err_str),
- "bad key NID: '%s'",
- pnidstr);
+ snprintf(err_str, LNET_MAX_STR_LEN,
+ "badly formatted primary NID: %s", prim_nid);
goto out;
}
- num_nids++;
- lnet_nidlist2 = calloc(sizeof(*lnet_nidlist2), num_nids);
- if (!lnet_nidlist2) {
- snprintf(err_str, sizeof(err_str),
- "out of memory");
- rc = LUSTRE_CFG_RC_OUT_OF_MEM;
- goto out;
+ num_nids = 0;
+ if (nids) {
+ /*
+ * if there is no primary nid we need to make the first nid in the
+ * nids list the primary nid
+ */
+ replace_sep(nids, ',', ' ');
+ rc = lustre_lnet_parse_nidstr(nids, lnet_nidlist,
+ LNET_MAX_NIDS_PER_PEER, err_str);
+ if (rc < 0)
+ goto out;
+
+ num_nids = rc;
}
- lnet_nidlist2[0] = pnid;
- memcpy(&lnet_nidlist2[1], lnet_nidlist, sizeof(*lnet_nidlist) *
- (num_nids - 1));
- rc = lustre_lnet_handle_peer_nidlist(lnet_nidlist2, num_nids, false,
- IOC_LIBCFS_DEL_PEER_NI, DEL_CMD,
- err_str);
+ rc = lustre_lnet_mod_peer_nidlist(pnid, lnet_nidlist,
+ cmd, num_nids, is_mr,
+ -1, err_rc);
+
out:
- if (lnet_nidlist2)
- free(lnet_nidlist2);
+ if (rc != LUSTRE_CFG_RC_NO_ERR)
+ cYAML_build_error(rc, -1, "peer",
+ cmd == LNETCTL_ADD_CMD ? "add" : "del",
+ err_str, err_rc);
- cYAML_build_error(rc, seq_no, DEL_CMD, "peer_ni", err_str, err_rc);
return rc;
}
int sen, int seq_no, struct cYAML **err_rc,
int cmd)
{
- int rc, num_nids, num_nidstrs, nid_idx, str_idx;
+ int rc, num_nids, idx;
__u32 rnet;
- char err_str[LNET_MAX_STR_LEN];
- char *nidstrarray[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"generic error\"";
struct lnet_ioctl_config_data data;
lnet_nid_t lnet_nidlist[LNET_MAX_NIDS_PER_PEER];
- memset(err_str, 0, LNET_MAX_STR_LEN);
- snprintf(err_str, LNET_MAX_STR_LEN, "\"generic error\"");
-
if (nw == NULL || nidstr == NULL) {
snprintf(err_str, LNET_MAX_STR_LEN,
"\"missing mandatory parameter:'%s'\"",
}
rnet = libcfs_str2net(nw);
- if (rnet == LNET_NIDNET(LNET_NID_ANY)) {
+ if (rnet == LNET_NET_ANY) {
snprintf(err_str, LNET_MAX_STR_LEN,
"\"cannot parse remote net %s\"", nw);
rc = LUSTRE_CFG_RC_BAD_PARAM;
goto out;
}
- rc = tokenize_nidstr(nidstr, &nidstrarray[0], err_str);
+ replace_sep(nidstr, ',', ' ');
+ rc = lustre_lnet_parse_nidstr(nidstr, lnet_nidlist,
+ LNET_MAX_NIDS_PER_PEER, err_str);
if (rc < 0)
goto out;
- num_nidstrs = rc;
-
- for (str_idx = 0; str_idx < num_nidstrs; str_idx++) {
- rc = lustre_lnet_parse_nidstr(nidstrarray[str_idx],
- lnet_nidlist,
- LNET_MAX_NIDS_PER_PEER, err_str);
- if (rc < 0)
- goto out;
-
- num_nids = rc;
+ num_nids = rc;
+ for (idx = 0; idx < num_nids; idx++) {
LIBCFS_IOC_INIT_V2(data, cfg_hdr);
data.cfg_net = rnet;
if (cmd == LNETCTL_ADD_CMD) {
data.cfg_config_u.cfg_route.rtr_sensitivity = sen;
}
- for (nid_idx = 0; nid_idx < num_nids; nid_idx++) {
- data.cfg_nid = lnet_nidlist[nid_idx];
+ data.cfg_nid = lnet_nidlist[idx];
- if (cmd == LNETCTL_ADD_CMD)
- rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE,
- &data);
- else
- rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE,
- &data);
+ if (cmd == LNETCTL_ADD_CMD)
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_ADD_ROUTE,
+ &data);
+ else
+ rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DEL_ROUTE,
+ &data);
- if (rc != 0 && errno != EEXIST &&
- errno != EHOSTUNREACH) {
- rc = -errno;
- snprintf(err_str, LNET_MAX_STR_LEN,
- "route operation failed: %s",
- strerror(errno));
- goto out;
- }
+ if (rc != 0 && errno != EEXIST &&
+ errno != EHOSTUNREACH) {
+ rc = -errno;
+ snprintf(err_str, LNET_MAX_STR_LEN,
+ "route operation failed: %s",
+ strerror(errno));
+ goto out;
+ } else if (errno == EEXIST) {
+ /*
+ * continue chugging along if one of the
+ * routes already exists
+ */
+ rc = 0;
}
}
int sen, int seq_no, struct cYAML **err_rc)
{
int rc;
- char err_str[LNET_MAX_STR_LEN];
- memset(err_str, 0, LNET_MAX_STR_LEN);
- snprintf(err_str, LNET_MAX_STR_LEN, "\"generic error\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"generic error\"";
if (hops == -1) {
hops = LNET_UNDEFINED_HOPS;
lnet_nid_t gateway_nid;
int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
int l_errno = 0;
- __u32 net = LNET_NIDNET(LNET_NID_ANY);
+ __u32 net = LNET_NET_ANY;
int i;
struct cYAML *root = NULL, *route = NULL, *item = NULL;
struct cYAML *first_seq = NULL;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
bool exist = false;
- snprintf(err_str, sizeof(err_str),
- "\"out of memory\"");
-
if (nw != NULL) {
net = libcfs_str2net(nw);
- if (net == LNET_NIDNET(LNET_NID_ANY)) {
+ if (net == LNET_NET_ANY) {
snprintf(err_str,
sizeof(err_str),
"\"cannot parse net '%s'\"", nw);
} else {
/* show all routes without filtering on net */
- net = LNET_NIDNET(LNET_NID_ANY);
+ net = LNET_NET_ANY;
}
if (gw != NULL) {
}
/* filter on provided data */
- if (net != LNET_NIDNET(LNET_NID_ANY) &&
+ if (net != LNET_NET_ANY &&
net != data.cfg_net)
continue;
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;
}
if (*nids == NULL) {
snprintf(err_str, str_len,
"\"out of memory\"");
- err_str[str_len - 1] = '\0';
return LUSTRE_CFG_RC_OUT_OF_MEM;
}
/*
if (rc) {
snprintf(err_str, str_len,
"\"cannot read gni nid\"");
- err_str[str_len - 1] = '\0';
goto failed;
}
gni_num = atoi(val);
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);
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);
if (rc < 0) {
snprintf(err_str, str_len,
"\"failed to get interface addresses: %d\"", -errno);
- err_str[str_len - 1] = '\0';
return -errno;
}
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,
- err_str, sizeof(err_str));
+ err_str, str_len);
if (rc != LUSTRE_CFG_RC_NO_ERR) {
*nids = NULL;
*nnids = 0;
LIBCFS_IOC_INIT_V2(*conf, lic_cfg_hdr);
conf->lic_cfg_hdr.ioc_len = len;
conf->lic_nid = nids[i];
- strncpy(conf->lic_ni_intf[0], intf_descr->intf_name,
+ strncpy(conf->lic_ni_intf, intf_descr->intf_name,
LNET_MAX_STR_LEN);
if (intf_descr->cpt_expr != NULL)
lnet_nid_t *nids = NULL;
__u32 nnids = 0;
int rc;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"success\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
if (!ip2nets) {
snprintf(err_str,
struct lnet_ioctl_config_lnd_tunables *tun = NULL;
char buf[LNET_MAX_STR_LEN];
int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
lnet_nid_t *nids = NULL;
__u32 nnids = 0;
size_t len;
struct lnet_dlc_intf_descr *intf_descr, *tmp;
__u32 *cpt_array;
- snprintf(err_str, sizeof(err_str), "\"success\"");
-
if (ip2net == NULL && (nw_descr == NULL || nw_descr->nw_id == 0 ||
(list_empty(&nw_descr->nw_intflist) &&
LNET_NETTYP(nw_descr->nw_id) != GNILND))) {
goto out;
}
- if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
+ if (nw_descr->nw_id == LNET_NET_ANY) {
snprintf(err_str,
sizeof(err_str),
"\"cannot parse net '%s'\"",
{
struct lnet_ioctl_config_ni data;
int rc = LUSTRE_CFG_RC_NO_ERR, i;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
lnet_nid_t *nids = NULL;
__u32 nnids = 0;
struct lnet_dlc_intf_descr *intf_descr, *tmp;
- snprintf(err_str, sizeof(err_str), "\"success\"");
-
if (nw_descr == NULL || nw_descr->nw_id == 0) {
snprintf(err_str,
sizeof(err_str),
if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
return LUSTRE_CFG_RC_NO_ERR;
- if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
+ if (nw_descr->nw_id == LNET_NET_ANY) {
snprintf(err_str,
sizeof(err_str),
"\"cannot parse net '%s'\"",
{
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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
LIBCFS_IOC_INIT_V2(data, rh_hdr);
data.rh_type = type;
return NULL;
}
+static int
+create_local_udsp_info(struct lnet_ioctl_construct_udsp_info *udsp_info,
+ struct cYAML *net_node)
+{
+ char tmp[LNET_MAX_STR_LEN];
+ struct cYAML *udsp_net;
+ bool created = false;
+ struct cYAML *pref;
+ int i;
+
+ /* add the UDSP info */
+ udsp_net = cYAML_create_object(net_node, "udsp info");
+ if (!udsp_net)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ if (!cYAML_create_number(udsp_net, "net priority",
+ (int) udsp_info->cud_net_priority))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ if (!cYAML_create_number(udsp_net, "nid priority",
+ (int)udsp_info->cud_nid_priority))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ pref = udsp_net;
+
+ for (i = 0; i < LNET_MAX_SHOW_NUM_NID; i++) {
+ memset(tmp, 0, LNET_MAX_STR_LEN);
+ if (udsp_info->cud_pref_rtr_nid[i] == 0)
+ break;
+ if (!created) {
+ pref = cYAML_create_object(udsp_net,
+ "Preferred gateway NIDs");
+ if (!pref)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+ created = true;
+ }
+ snprintf(tmp, sizeof(tmp), "NID-%d", i);
+ if (!cYAML_create_string(pref, tmp,
+ libcfs_nid2str(udsp_info->cud_pref_rtr_nid[i])))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+ }
+
+ return LUSTRE_CFG_RC_NO_ERR;
+}
+
+static int
+create_remote_udsp_info(struct lnet_ioctl_construct_udsp_info *udsp_info,
+ struct cYAML *nid_node)
+{
+ char tmp[LNET_MAX_STR_LEN];
+ struct cYAML *udsp_nid;
+ bool created = false;
+ struct cYAML *pref;
+ int i;
+
+ /* add the UDSP info */
+ udsp_nid = cYAML_create_object(nid_node, "udsp info");
+ if (!udsp_nid)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ if (!cYAML_create_number(udsp_nid, "net priority",
+ (int) udsp_info->cud_net_priority))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ if (!cYAML_create_number(udsp_nid, "nid priority",
+ (int) udsp_info->cud_nid_priority))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+
+ pref = udsp_nid;
+ for (i = 0; i < LNET_MAX_SHOW_NUM_NID; i++) {
+ memset(tmp, 0, LNET_MAX_STR_LEN);
+ if (udsp_info->cud_pref_rtr_nid[i] == 0)
+ break;
+ if (!created) {
+ pref = cYAML_create_object(udsp_nid,
+ "Preferred gateway NIDs");
+ if (!pref)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+ created = true;
+ }
+ snprintf(tmp, sizeof(tmp), "NID-%d", i);
+ if (!cYAML_create_string(pref, tmp,
+ libcfs_nid2str(udsp_info->cud_pref_rtr_nid[i])))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+ }
+
+ pref = udsp_nid;
+ created = false;
+ for (i = 0; i < LNET_MAX_SHOW_NUM_NID; i++) {
+ memset(tmp, 0, LNET_MAX_STR_LEN);
+ if (udsp_info->cud_pref_nid[i] == 0)
+ break;
+ if (!created) {
+ pref = cYAML_create_object(udsp_nid,
+ "Preferred source NIDs");
+ if (!pref)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+ created = true;
+ }
+ snprintf(tmp, sizeof(tmp), "NID-%d", i);
+ if (!cYAML_create_string(pref, tmp,
+ libcfs_nid2str(udsp_info->cud_pref_nid[i])))
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
+ }
+
+ return LUSTRE_CFG_RC_NO_ERR;
+}
+
int lustre_lnet_show_net(char *nw, int detail, int seq_no,
struct cYAML **show_rc, struct cYAML **err_rc,
bool backup)
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);
+ struct lnet_ioctl_construct_udsp_info udsp_info;
+ __u32 net = LNET_NET_ANY;
+ __u32 prev_net = LNET_NET_ANY;
int rc = LUSTRE_CFG_RC_OUT_OF_MEM, i, j;
int l_errno = 0;
struct cYAML *root = NULL, *tunables = 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];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
bool exist = false, new_net = true;
int net_num = 0;
size_t buf_size = sizeof(*ni_data) + sizeof(*lnd) + sizeof(*stats);
- snprintf(err_str, sizeof(err_str), "\"out of memory\"");
-
buf = calloc(1, buf_size);
if (buf == NULL)
goto out;
if (nw != NULL) {
net = libcfs_str2net(nw);
- if (net == LNET_NIDNET(LNET_NID_ANY)) {
+ if (net == LNET_NET_ANY) {
snprintf(err_str,
sizeof(err_str),
"\"cannot parse net '%s'\"", nw);
rc_net = LNET_NIDNET(ni_data->lic_nid);
/* filter on provided data */
- if (net != LNET_NIDNET(LNET_NID_ANY) &&
+ if (net != LNET_NET_ANY &&
net != rc_net)
continue;
/* don't add interfaces unless there is at least one
* interface */
- if (strlen(ni_data->lic_ni_intf[0]) > 0) {
+ if (strlen(ni_data->lic_ni_intf) > 0) {
interfaces = cYAML_create_object(item, "interfaces");
if (interfaces == NULL)
goto out;
- for (j = 0; j < LNET_INTERFACES_NUM; j++) {
- if (strlen(ni_data->lic_ni_intf[j]) > 0) {
- snprintf(str_buf,
- sizeof(str_buf), "%d", j);
- if (cYAML_create_string(interfaces,
- str_buf,
- ni_data->lic_ni_intf[j]) ==
- NULL)
- goto out;
- }
- }
+ snprintf(str_buf, sizeof(str_buf), "%d", 0);
+ if (cYAML_create_string(interfaces, str_buf,
+ ni_data->lic_ni_intf) == NULL)
+ goto out;
}
if (detail) {
== NULL)
goto out;
+ if (detail < 4)
+ goto continue_without_udsp_info;
+
+ LIBCFS_IOC_INIT_V2(udsp_info, cud_hdr);
+ udsp_info.cud_nid = ni_data->lic_nid;
+ udsp_info.cud_peer = false;
+ rc = l_ioctl(LNET_DEV_ID,
+ IOC_LIBCFS_GET_CONST_UDSP_INFO,
+ &udsp_info);
+ if (rc != 0) {
+ l_errno = errno;
+ goto continue_without_udsp_info;
+ }
+
+ rc = create_local_udsp_info(&udsp_info, item);
+ if (rc) {
+ l_errno = errno;
+ goto out;
+ }
+
+continue_without_udsp_info:
if (detail < 2)
goto continue_without_msg_stats;
hstats.hlni_local_error)
== NULL)
goto out;
+ if (cYAML_create_number(yhstats, "ping_count",
+ hstats.hlni_ping_count)
+ == NULL)
+ goto out;
+ if (cYAML_create_number(yhstats, "next_ping",
+ hstats.hlni_next_ping)
+ == NULL)
+ goto out;
continue_without_msg_stats:
tunables = cYAML_create_object(item, "tunables");
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,...]" */
pos = str_buf;
limit = str_buf + str_buf_len - 3;
{
struct lnet_ioctl_config_data data;
int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"success\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
LIBCFS_IOC_INIT_V2(data, cfg_hdr);
data.cfg_config_u.cfg_buffers.buf_enable = (enable) ? 1 : 0;
{
struct lnet_ioctl_set_value data;
int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"success\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
LIBCFS_IOC_INIT_V2(data, sv_hdr);
data.sv_value = val;
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 err_str[LNET_MAX_STR_LEN] = "\"success\"";
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,
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 err_str[LNET_MAX_STR_LEN] = "\"success\"";
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,
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 err_str[LNET_MAX_STR_LEN] = "\"success\"";
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,
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 err_str[LNET_MAX_STR_LEN] = "\"success\"";
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,
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 err_str[LNET_MAX_STR_LEN] = "\"success\"";
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,
return rc;
}
-int lustre_lnet_config_max_intf(int max, int seq_no, struct cYAML **err_rc)
+int lustre_lnet_config_response_tracking(int val, 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];
+ char val_str[LNET_MAX_STR_LEN];
- snprintf(err_str, sizeof(err_str), "\"success\"");
+ if (val < 0 || val > 3) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, sizeof(err_str),
+ "\"Valid values are: 0, 1, 2, or 3\"");
+ } else {
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val_str, sizeof(val_str), "%d", val);
+
+ rc = write_sysfs_file(modparam_path, "lnet_response_tracking",
+ val_str, 1, strlen(val_str) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure response tracking: %s\"",
+ strerror(errno));
+ }
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "response_tracking", err_str,
+ err_rc);
+
+ return rc;
+}
+
+int lustre_lnet_config_recovery_limit(int val, int seq_no,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_NO_ERR;
+ char err_str[LNET_MAX_STR_LEN];
+ char val_str[LNET_MAX_STR_LEN];
+
+ if (val < 0) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, sizeof(err_str),
+ "\"Must be greater than or equal to 0\"");
+ } else {
+ snprintf(err_str, sizeof(err_str), "\"success\"");
+
+ snprintf(val_str, sizeof(val_str), "%d", val);
+
+ rc = write_sysfs_file(modparam_path, "lnet_recovery_limit",
+ val_str, 1, strlen(val_str) + 1);
+ if (rc)
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot configure recovery limit: %s\"",
+ strerror(errno));
+ }
+
+ cYAML_build_error(rc, seq_no, ADD_CMD, "recovery_limit", 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;
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
+ char val[LNET_MAX_STR_LEN];
snprintf(val, sizeof(val), "%d", max);
int lustre_lnet_config_discovery(int enable, int seq_no, struct cYAML **err_rc)
{
int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
char val[LNET_MAX_STR_LEN];
- snprintf(err_str, sizeof(err_str), "\"success\"");
-
snprintf(val, sizeof(val), "%u", (enable) ? 0 : 1);
rc = write_sysfs_file(modparam_path, "lnet_peer_discovery_disabled", val,
struct cYAML **err_rc)
{
int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
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,
{
struct lnet_ioctl_config_data data;
int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"success\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"success\"";
/* -1 indicates to ignore changes to this field */
if (tiny < -1 || small < -1 || large < -1) {
*type_node = NULL, *item = NULL, *cpt = NULL,
*first_seq = NULL, *buffers = NULL;
int i, j;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
char node_name[LNET_MAX_STR_LEN];
bool exist = false;
- snprintf(err_str, sizeof(err_str), "\"out of memory\"");
-
buf = calloc(1, sizeof(*data) + sizeof(*pool_cfg));
if (buf == NULL)
goto out;
struct lnet_ioctl_element_stats *lpni_stats;
struct lnet_ioctl_element_msg_stats *msg_stats;
struct lnet_ioctl_peer_ni_hstats *hstats;
+ struct lnet_ioctl_construct_udsp_info udsp_info;
lnet_nid_t *nidp;
int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
int i, j, k;
*first_seq = NULL, *peer_root = NULL, *tmp = NULL,
*msg_statistics = NULL, *statistics = NULL,
*yhstats;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
struct lnet_process_id *list = NULL;
void *data = NULL;
void *lpni_data;
bool exist = false;
- snprintf(err_str, sizeof(err_str),
- "\"out of memory\"");
-
/* create struct cYAML root object */
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
if (backup)
continue;
+ if (detail < 4)
+ goto continue_without_udsp_info;
+
+ LIBCFS_IOC_INIT_V2(udsp_info, cud_hdr);
+ udsp_info.cud_nid = *nidp;
+ udsp_info.cud_peer = true;
+ rc = l_ioctl(LNET_DEV_ID,
+ IOC_LIBCFS_GET_CONST_UDSP_INFO,
+ &udsp_info);
+ if (rc != 0) {
+ l_errno = errno;
+ goto continue_without_udsp_info;
+ }
+
+ rc = create_remote_udsp_info(&udsp_info, peer_ni);
+ if (rc) {
+ l_errno = errno;
+ goto out;
+ }
+
+continue_without_udsp_info:
if (cYAML_create_string(peer_ni, "state",
lpni_cri->cr_aliveness)
== NULL)
hstats->hlpni_network_timeout)
== NULL)
goto out;
+ if (cYAML_create_number(yhstats, "ping_count",
+ hstats->hlpni_ping_count)
+ == NULL)
+ goto out;
+
+ if (cYAML_create_number(yhstats, "next_ping",
+ hstats->hlpni_next_ping)
+ == NULL)
+ goto out;
+
}
}
int i = 0;
int l_errno = 0;
struct cYAML *root = NULL, *list_root = NULL, *first_seq = NULL;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
struct lnet_process_id *list = NULL;
- snprintf(err_str, sizeof(err_str),
- "\"out of memory\"");
-
memset(&peer_info, 0, sizeof(peer_info));
/* create struct cYAML root object */
struct lnet_ioctl_set_value data;
int rc;
int l_errno = 0;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
LIBCFS_IOC_INIT_V2(data, sv_hdr);
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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "lnet_recovery_interval", val,
1, sizeof(val));
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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "lnet_health_sensitivity", val,
1, sizeof(val));
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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "router_sensitivity_percentage", val,
1, sizeof(val));
err_rc, l_errno);
}
+int lustre_lnet_show_lnd_timeout(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ char val[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
+ int lnd_to = -1;
+ int l_errno = 0;
+ int rc;
+ int fd;
+ glob_t path;
+
+ rc = cfs_get_param_paths(&path, "lnet_lnd_timeout");
+ if (rc < 0) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get LND timeout: %d\"", rc);
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "lnd_timeout", lnd_to, show_rc,
+ err_rc, l_errno);
+ }
+
+ fd = open(path.gl_pathv[0], O_RDONLY);
+ if (fd < 0) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"error opening %s\"", path.gl_pathv[0]);
+ goto failed;
+ }
+
+ rc = read(fd, val, sizeof(val));
+ if (rc < 0)
+ l_errno = -errno;
+
+ close(fd);
+
+ if (rc < 0) {
+ snprintf(err_str, sizeof(err_str),
+ "\"error reading %s\"", path.gl_pathv[0]);
+ goto failed;
+ }
+
+ lnd_to = atoi(val);
+
+failed:
+ cfs_free_param_data(&path);
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "lnd_timeout", lnd_to, 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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "lnet_transaction_timeout", val,
1, sizeof(val));
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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "lnet_retry_count", val,
1, sizeof(val));
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");
+ char err_str[LNET_MAX_STR_LEN] = "failed to print recovery queue\n";
LIBCFS_IOC_INIT_V2(nid_list, rlst_hdr);
nid_list.rlst_type = type;
seq_no, show_rc, err_rc);
}
-int lustre_lnet_show_max_intf(int seq_no, struct cYAML **show_rc,
- struct cYAML **err_rc)
+int lustre_lnet_show_response_tracking(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
{
int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
char val[LNET_MAX_STR_LEN];
- int max_intf = -1, l_errno = 0;
+ int rsp_tracking = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
+
+ rc = read_sysfs_file(modparam_path, "lnet_response_tracking", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get lnet_response_tracking value: %d\"", rc);
+ } else {
+ rsp_tracking = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "response_tracking", rsp_tracking,
+ show_rc, err_rc, l_errno);
+}
+
+int lustre_lnet_show_recovery_limit(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 recov_limit = -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_limit", val,
+ 1, sizeof(val));
+ if (rc) {
+ l_errno = -errno;
+ snprintf(err_str, sizeof(err_str),
+ "\"cannot get lnet_recovery_limit value: %d\"", rc);
+ } else {
+ recov_limit = atoi(val);
+ }
+
+ return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
+ "recovery_limit", recov_limit,
+ show_rc, err_rc, l_errno);
+}
+
+int lustre_lnet_show_max_intf(int seq_no, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ char val[LNET_MAX_STR_LEN];
+ int max_intf = -1, l_errno = 0;
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
+
rc = read_sysfs_file(modparam_path, "lnet_interfaces_max", val,
1, sizeof(val));
if (rc) {
}
return build_global_yaml_entry(err_str, sizeof(err_str), seq_no,
- "max_intf", max_intf, show_rc,
+ "max_interfaces", max_intf, show_rc,
err_rc, l_errno);
}
int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
char val[LNET_MAX_STR_LEN];
int discovery = -1, l_errno = 0;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"out of memory\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "lnet_peer_discovery_disabled", val,
1, sizeof(val));
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\"");
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
rc = read_sysfs_file(modparam_path, "lnet_drop_asym_route", val,
1, sizeof(val));
struct lnet_counters *cntrs;
int rc;
int l_errno;
- char err_str[LNET_MAX_STR_LEN];
+ char err_str[LNET_MAX_STR_LEN] = "\"out of memory\"";
struct cYAML *root = NULL, *stats = NULL;
- snprintf(err_str, sizeof(err_str), "\"out of memory\"");
-
LIBCFS_IOC_INIT_V2(data, st_hdr);
rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_GET_LNET_STATS, &data);
struct cYAML **err_rc, int cmd)
{
int rc, num_nids = 0, seqn;
- bool mr_value;
+ bool mr_value = false;
char *nidstr = NULL, *prim_nidstr;
char err_str[LNET_MAX_STR_LEN];
struct cYAML *seq_no, *prim_nid, *mr, *peer_nis;
lnet_nid_t lnet_nidlist[LNET_MAX_NIDS_PER_PEER];
+ lnet_nid_t pnid = LNET_NID_ANY;
seq_no = cYAML_get_object_item(tree, "seq_no");
seqn = seq_no ? seq_no->cy_valueint : -1;
prim_nid = cYAML_get_object_item(tree, "primary nid");
- prim_nidstr = prim_nid ? prim_nid->cy_valuestring : NULL;
-
peer_nis = cYAML_get_object_item(tree, "peer ni");
- if (!(prim_nid || peer_nis)) {
+ if (!prim_nid) {
rc = LUSTRE_CFG_RC_BAD_PARAM;
snprintf(err_str, LNET_MAX_STR_LEN,
- "Neither \"primary nid\" nor \"peer ni\" are defined");
+ "\"primary nid\" must be specified");
+ goto failed;
+ }
+
+ prim_nidstr = prim_nid->cy_valuestring;
+
+ /* if the provided primary NID is bad, no need to go any further */
+ pnid = libcfs_str2nid(prim_nidstr);
+ if (pnid == LNET_NID_ANY) {
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
+ snprintf(err_str, LNET_MAX_STR_LEN,
+ "badly formatted primary NID: %s", prim_nidstr);
goto failed;
}
goto failed;
}
}
+ }
- rc = lustre_lnet_config_peer_nidlist(prim_nidstr, lnet_nidlist,
- num_nids, mr_value, seqn,
- err_rc);
- } else
- rc = lustre_lnet_del_peer_nidlist(prim_nidstr, lnet_nidlist,
- num_nids, seqn, err_rc);
+ rc = lustre_lnet_mod_peer_nidlist(pnid, lnet_nidlist, cmd,
+ num_nids, mr_value, seqn,
+ err_rc);
failed:
if (nidstr)
show_rc, err_rc);
}
+static int handle_yaml_del_udsp(struct cYAML *tree, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ struct cYAML *seq_no, *idx;
+
+ seq_no = cYAML_get_object_item(tree, "seq_no");
+ idx = cYAML_get_object_item(tree, "idx");
+
+ return lustre_lnet_del_udsp(idx ? idx->cy_valueint : -1,
+ seq_no ? seq_no->cy_valueint : -1,
+ err_rc);
+}
+
+static int handle_yaml_config_udsp(struct cYAML *tree, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ struct cYAML *seq_no, *src, *rte, *dst, *prio, *idx;
+ union lnet_udsp_action action;
+
+ seq_no = cYAML_get_object_item(tree, "seq_no");
+ src = cYAML_get_object_item(tree, "src");
+ rte = cYAML_get_object_item(tree, "rte");
+ dst = cYAML_get_object_item(tree, "dst");
+ prio = cYAML_get_object_item(tree, "priority");
+ idx = cYAML_get_object_item(tree, "idx");
+
+ action.udsp_priority = prio ? prio->cy_valueint : -1;
+
+ return lustre_lnet_add_udsp(src ? src->cy_valuestring : NULL,
+ dst ? dst->cy_valuestring : NULL,
+ rte ? rte->cy_valuestring : NULL,
+ prio ? "priority" : "",
+ &action,
+ idx ? idx->cy_valueint : -1,
+ seq_no ? seq_no->cy_valueint : -1,
+ err_rc);
+}
+
+static int handle_yaml_show_udsp(struct cYAML *tree, struct cYAML **show_rc,
+ struct cYAML **err_rc)
+{
+ struct cYAML *seq_no;
+ struct cYAML *idx;
+
+ seq_no = cYAML_get_object_item(tree, "seq_no");
+ idx = cYAML_get_object_item(tree, "idx");
+
+ return lustre_lnet_show_udsp(idx ? idx->cy_valueint : -1,
+ 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, *retry, *tto, *seq_no,
- *sen, *recov, *rsen, *drop_asym_route;
+ *sen, *recov, *rsen, *drop_asym_route, *rsp_tracking,
+ *recov_limit;
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
- max_intf = cYAML_get_object_item(tree, "max_intf");
+ max_intf = cYAML_get_object_item(tree, "max_interfaces");
+ if (!max_intf) /* try legacy name */
+ max_intf = cYAML_get_object_item(tree, "max_intf");
if (max_intf)
rc = lustre_lnet_config_max_intf(max_intf->cy_valueint,
seq_no ? seq_no->cy_valueint
: -1,
err_rc);
+ rsp_tracking = cYAML_get_object_item(tree, "response_tracking");
+ if (rsp_tracking)
+ rc = lustre_lnet_config_response_tracking(rsp_tracking->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
+ recov_limit = cYAML_get_object_item(tree, "recovery_limit");
+ if (recov_limit)
+ rc = lustre_lnet_config_recovery_limit(recov_limit->cy_valueint,
+ seq_no ? seq_no->cy_valueint
+ : -1,
+ err_rc);
+
return rc;
}
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
- max_intf = cYAML_get_object_item(tree, "max_intf");
+ max_intf = cYAML_get_object_item(tree, "max_interfaces");
+ if (!max_intf) /* try legacy name */
+ max_intf = cYAML_get_object_item(tree, "max_intf");
if (max_intf)
rc = lustre_lnet_config_max_intf(LNET_INTERFACES_MAX_DEFAULT,
seq_no ? seq_no->cy_valueint
struct cYAML **err_rc)
{
struct cYAML *max_intf, *numa, *discovery, *retry, *tto, *seq_no,
- *sen, *recov, *rsen, *drop_asym_route;
+ *sen, *recov, *rsen, *drop_asym_route, *rsp_tracking,
+ *recov_limit;
int rc = 0;
seq_no = cYAML_get_object_item(tree, "seq_no");
- max_intf = cYAML_get_object_item(tree, "max_intf");
+ max_intf = cYAML_get_object_item(tree, "max_interfaces");
+ if (!max_intf) /* try legacy name */
+ max_intf = cYAML_get_object_item(tree, "max_intf");
if (max_intf)
rc = lustre_lnet_show_max_intf(seq_no ? seq_no->cy_valueint
: -1,
: -1,
show_rc, err_rc);
+ rsp_tracking = cYAML_get_object_item(tree, "response_tracking");
+ if (rsp_tracking)
+ rc = lustre_lnet_show_response_tracking(seq_no ?
+ seq_no->cy_valueint :
+ -1,
+ show_rc, err_rc);
+
+ recov_limit = cYAML_get_object_item(tree, "recovery_limit");
+ if (recov_limit)
+ rc = lustre_lnet_show_recovery_limit(seq_no ?
+ seq_no->cy_valueint :
+ -1,
+ show_rc, err_rc);
+
return rc;
}
{ .name = "numa", .cb = handle_yaml_config_numa },
{ .name = "ping", .cb = handle_yaml_no_op },
{ .name = "discover", .cb = handle_yaml_no_op },
+ { .name = "udsp", .cb = handle_yaml_config_udsp },
{ .name = NULL } };
static struct lookup_cmd_hdlr_tbl lookup_del_tbl[] = {
{ .name = "numa", .cb = handle_yaml_del_numa },
{ .name = "ping", .cb = handle_yaml_no_op },
{ .name = "discover", .cb = handle_yaml_no_op },
+ { .name = "udsp", .cb = handle_yaml_del_udsp },
{ .name = NULL } };
static struct lookup_cmd_hdlr_tbl lookup_show_tbl[] = {
{ .name = "numa", .cb = handle_yaml_show_numa },
{ .name = "ping", .cb = handle_yaml_no_op },
{ .name = "discover", .cb = handle_yaml_no_op },
+ { .name = "udsp", .cb = handle_yaml_show_udsp },
{ .name = NULL } };
static struct lookup_cmd_hdlr_tbl lookup_exec_tbl[] = {
git://git.whamcloud.com / fs / lustre-release.git / blobdiff