#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <sys/ioctl.h>
#include <net/if.h>
#include <libcfs/util/ioctl.h>
static int socket_intf_query(int request, char *intf,
struct ifreq *ifr)
{
- int rc;
+ int rc = 0;
int sockfd;
if (strlen(intf) >= IFNAMSIZ || ifr == NULL)
strcpy(ifr->ifr_name, intf);
rc = ioctl(sockfd, request, ifr);
if (rc != 0)
- return LUSTRE_CFG_RC_BAD_PARAM;
+ rc = LUSTRE_CFG_RC_BAD_PARAM;
- return 0;
+ close(sockfd);
+
+ return rc;
}
/*
len = sizeof(struct lnet_ioctl_config_ni);
data = calloc(1, len);
+ if (!data)
+ return LUSTRE_CFG_RC_OUT_OF_MEM;
conf = (struct lnet_ioctl_config_ni*) data;
if (i == 0 && tunables != NULL)
tun = (struct lnet_ioctl_config_lnd_tunables*)
snprintf(err_str,
LNET_MAX_STR_LEN,
"\"cannot add network: %s\"", strerror(errno));
+ free(data);
return rc;
}
+ free(data);
i++;
}
goto out;
}
+ /*
+ * call below function to resolve the rules into a list of nids.
+ * The memory is allocated in that function then freed here when
+ * it's no longer needed.
+ */
rc = lustre_lnet_resolve_ip2nets_rule(ip2nets, &nids, &nnids);
if (rc != LUSTRE_CFG_RC_NO_ERR && rc != LUSTRE_CFG_RC_MATCH) {
snprintf(err_str,
if (list_empty(&ip2nets->ip2nets_net.nw_intflist)) {
snprintf(err_str, sizeof(err_str),
"\"no interfaces match ip2nets rules\"");
- goto out;
+ goto free_nids_out;
}
rc = lustre_lnet_ioctl_config_ni(&ip2nets->ip2nets_net.nw_intflist,
tunables, global_cpts, nids,
err_str);
- if (rc != LUSTRE_CFG_RC_NO_ERR)
- free(nids);
+
+free_nids_out:
+ free(nids);
out:
cYAML_build_error(rc, seq_no, ADD_CMD, "ip2nets", err_str, err_rc);
else
len = sizeof(struct lnet_ioctl_config_ni);
data = calloc(1, len);
+ if (!data) {
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ goto out;
+ }
conf = (struct lnet_ioctl_config_ni*) data;
if (tunables != NULL)
tun = (struct lnet_ioctl_config_lnd_tunables*)
goto out;
}
- if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
- return LUSTRE_CFG_RC_NO_ERR;
+ if (LNET_NETTYP(nw_descr->nw_id) == LOLND) {
+ rc = LUSTRE_CFG_RC_NO_ERR;
+ goto out;
+ }
if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
snprintf(err_str,
__u32 nnids = 0;
struct lnet_dlc_intf_descr *intf_descr, *tmp;
- if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
- return LUSTRE_CFG_RC_NO_ERR;
-
snprintf(err_str, sizeof(err_str), "\"success\"");
if (nw_descr == NULL) {
goto out;
}
+ if (LNET_NETTYP(nw_descr->nw_id) == LOLND)
+ return LUSTRE_CFG_RC_NO_ERR;
+
if (nw_descr->nw_id == LNET_NIDNET(LNET_NID_ANY)) {
snprintf(err_str,
sizeof(err_str),
if (interfaces == NULL)
goto out;
- for (j = 0; j < LNET_MAX_INTERFACES; j++) {
+ for (j = 0; j < LNET_NUM_INTERFACES; j++) {
if (strlen(ni_data->lic_ni_intf[j]) > 0) {
snprintf(str_buf,
sizeof(str_buf), "%d", j);
goto out;
if (cYAML_create_number(statistics, "send_count",
- stats->send_count)
+ stats->iel_send_count)
== NULL)
goto out;
if (cYAML_create_number(statistics, "recv_count",
- stats->recv_count)
+ stats->iel_recv_count)
== NULL)
goto out;
if (cYAML_create_number(statistics, "drop_count",
- stats->drop_count)
+ stats->iel_drop_count)
== NULL)
goto out;
* TODO: This function is changing in a future patch to accommodate
* PEER_LIST and proper filtering on any nid of the peer
*/
- struct lnet_ioctl_peer_cfg *peer_info;
+ struct lnet_ioctl_peer_cfg peer_info;
struct lnet_peer_ni_credit_info *lpni_cri;
struct lnet_ioctl_element_stats *lpni_stats;
int rc = LUSTRE_CFG_RC_OUT_OF_MEM, ncpt = 0, i = 0, j = 0;
*first_seq = NULL, *peer_root = NULL, *tmp = NULL;
char err_str[LNET_MAX_STR_LEN];
lnet_nid_t prev_primary_nid = LNET_NID_ANY, primary_nid = LNET_NID_ANY;
- int data_size = sizeof(*peer_info) + sizeof(*lpni_cri) +
- sizeof(*lpni_stats);
- char *data = calloc(data_size, 1);
+ int data_size = sizeof(*lpni_cri) + sizeof(*lpni_stats);
+ char *data = malloc(data_size);
bool new_peer = true;
snprintf(err_str, sizeof(err_str),
if (data == NULL)
goto out;
- peer_info = (struct lnet_ioctl_peer_cfg *)data;
-
/* create struct cYAML root object */
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
do {
for (i = 0;; i++) {
memset(data, 0, data_size);
- LIBCFS_IOC_INIT_V2(*peer_info, prcfg_hdr);
- peer_info->prcfg_hdr.ioc_len = data_size;
- peer_info->prcfg_idx = i;
+ memset(&peer_info, 0, sizeof(peer_info));
+ LIBCFS_IOC_INIT_V2(peer_info, prcfg_hdr);
+ peer_info.prcfg_hdr.ioc_len = sizeof(peer_info);
+ peer_info.prcfg_count = i;
+ peer_info.prcfg_bulk = (void *)data;
+ peer_info.prcfg_size = data_size;
rc = l_ioctl(LNET_DEV_ID,
- IOC_LIBCFS_GET_PEER_NI, peer_info);
+ IOC_LIBCFS_GET_PEER_NI, &peer_info);
if (rc != 0) {
l_errno = errno;
break;
}
if (primary_nid != LNET_NID_ANY &&
- primary_nid != peer_info->prcfg_prim_nid)
+ primary_nid != peer_info.prcfg_prim_nid)
continue;
- lpni_cri = (struct lnet_peer_ni_credit_info*)peer_info->prcfg_bulk;
- lpni_stats = (struct lnet_ioctl_element_stats *)
- (peer_info->prcfg_bulk +
- sizeof(*lpni_cri));
+ lpni_cri = peer_info.prcfg_bulk;
+ lpni_stats = peer_info.prcfg_bulk + sizeof(*lpni_cri);
peer = cYAML_create_seq_item(peer_root);
if (peer == NULL)
goto out;
- if (peer_info->prcfg_prim_nid != prev_primary_nid) {
- prev_primary_nid = peer_info->prcfg_prim_nid;
+ if (peer_info.prcfg_prim_nid != prev_primary_nid) {
+ prev_primary_nid = peer_info.prcfg_prim_nid;
new_peer = true;
}
if (new_peer) {
- lnet_nid_t pnid = peer_info->prcfg_prim_nid;
+ lnet_nid_t pnid = peer_info.prcfg_prim_nid;
if (cYAML_create_string(peer, "primary nid",
libcfs_nid2str(pnid))
== NULL)
goto out;
if (cYAML_create_string(peer, "Multi-Rail",
- peer_info->prcfg_mr ?
+ peer_info.prcfg_mr ?
"True" : "False")
== NULL)
goto out;
if (cYAML_create_string(peer_ni, "nid",
libcfs_nid2str
- (peer_info->prcfg_cfg_nid))
+ (peer_info.prcfg_cfg_nid))
== NULL)
goto out;
goto out;
if (cYAML_create_number(peer_ni, "send_count",
- lpni_stats->send_count)
+ lpni_stats->iel_send_count)
== NULL)
goto out;
if (cYAML_create_number(peer_ni, "recv_count",
- lpni_stats->recv_count)
+ lpni_stats->iel_recv_count)
== NULL)
goto out;
if (cYAML_create_number(peer_ni, "drop_count",
- lpni_stats->drop_count)
+ lpni_stats->iel_drop_count)
== NULL)
goto out;
struct cYAML **err_rc)
{
struct lnet_ioctl_numa_range data;
- int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ int rc;
int l_errno;
char err_str[LNET_MAX_STR_LEN];
struct cYAML *root = NULL, *range = NULL;
goto out;
}
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
goto out;
cYAML_print_tree(root);
snprintf(err_str, sizeof(err_str), "\"success\"");
+ rc = LUSTRE_CFG_RC_NO_ERR;
out:
if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
cYAML_free_tree(root);
struct cYAML **err_rc)
{
struct lnet_ioctl_lnet_stats data;
- int rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+ int rc;
int l_errno;
char err_str[LNET_MAX_STR_LEN];
struct cYAML *root = NULL, *stats = NULL;
goto out;
}
+ rc = LUSTRE_CFG_RC_OUT_OF_MEM;
+
root = cYAML_create_object(NULL, NULL);
if (root == NULL)
goto out;
cYAML_print_tree(root);
snprintf(err_str, sizeof(err_str), "\"success\"");
+ rc = LUSTRE_CFG_RC_NO_ERR;
out:
if (show_rc == NULL || rc != LUSTRE_CFG_RC_NO_ERR) {
cYAML_free_tree(root);
net = cYAML_get_object_item(tree, "net type");
if (net)
nw_descr.nw_id = libcfs_str2net(net->cy_valuestring);
+ else
+ nw_descr.nw_id = LOLND;
/*
* if neither net nor ip2nets are present, then we can not
show_rc, err_rc);
}
-int lustre_lnet_send_dbg_task(enum lnet_dbg_task dbg_task,
- struct lnet_dbg_task_info *dbg_info,
- struct cYAML **show_rc,
- struct cYAML **err_rc)
-{
- struct lnet_ioctl_dbg *dbg;
- struct lnet_dbg_task_info *info;
- int rc = LUSTRE_CFG_RC_NO_ERR;
- char err_str[LNET_MAX_STR_LEN];
-
- snprintf(err_str, sizeof(err_str), "\"success\"");
-
- dbg = calloc(1, sizeof(*dbg) + sizeof(*info));
- if (!dbg) {
- snprintf(err_str, sizeof(err_str), "\"out of memory\"");
- rc = LUSTRE_CFG_RC_OUT_OF_MEM;
- goto out;
- }
-
- info = (struct lnet_dbg_task_info *)dbg->dbg_bulk;
-
- LIBCFS_IOC_INIT_V2(*dbg, dbg_hdr);
-
- dbg->dbg_task = dbg_task;
- if (dbg_info)
- memcpy(info, dbg_info, sizeof(*info));
-
- rc = l_ioctl(LNET_DEV_ID, IOC_LIBCFS_DBG, dbg);
- if (rc != 0) {
- rc = -errno;
- snprintf(err_str,
- sizeof(err_str),
- "\"debug task failed %s\"", strerror(errno));
- goto out;
- }
-
-out:
- cYAML_build_error(rc, -1, DBG_CMD,
- "debug", err_str, err_rc);
-
- return rc;
-}
-
git://git.whamcloud.com / fs / lustre-release.git / blobdiff