#define D_LNI D_CONSOLE
-struct lnet the_lnet; /* THE state of the network */
+/*
+ * initialize ln_api_mutex statically, since it needs to be used in
+ * discovery_set callback. That module parameter callback can be called
+ * before module init completes. The mutex needs to be ready for use then.
+ */
+struct lnet the_lnet = {
+ .ln_api_mutex = __MUTEX_INITIALIZER(the_lnet.ln_api_mutex),
+}; /* THE state of the network */
EXPORT_SYMBOL(the_lnet);
static char *ip2nets = "";
MODULE_PARM_DESC(lnet_interfaces_max,
"Maximum number of interfaces in a node.");
+unsigned lnet_peer_discovery_disabled = 0;
+static int discovery_set(const char *val, struct kernel_param *kp);
+module_param_call(lnet_peer_discovery_disabled, discovery_set, param_get_int,
+ &lnet_peer_discovery_disabled, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(lnet_peer_discovery_disabled,
+ "Set to 1 to disable peer discovery on this node.");
+
/*
* This sequence number keeps track of how many times DLC was used to
* update the local NIs. It is incremented when a NI is added or
static int lnet_ping(struct lnet_process_id id, signed long timeout,
struct lnet_process_id __user *ids, int n_ids);
+static int lnet_discover(lnet_process_id_t id, __u32 force,
+ lnet_process_id_t __user *ids, int n_ids);
+
+static int
+discovery_set(const char *val, struct kernel_param *kp)
+{
+ int rc;
+ unsigned *discovery = (unsigned *)kp->arg;
+ unsigned long value;
+ struct lnet_ping_buffer *pbuf;
+
+ rc = kstrtoul(val, 0, &value);
+ if (rc) {
+ CERROR("Invalid module parameter value for 'lnet_peer_discovery_disabled'\n");
+ return rc;
+ }
+
+ value = (value) ? 1 : 0;
+
+ /*
+ * The purpose of locking the api_mutex here is to ensure that
+ * the correct value ends up stored properly.
+ */
+ mutex_lock(&the_lnet.ln_api_mutex);
+
+ if (value == *discovery) {
+ mutex_unlock(&the_lnet.ln_api_mutex);
+ return 0;
+ }
+
+ *discovery = value;
+
+ if (the_lnet.ln_state != LNET_STATE_RUNNING) {
+ mutex_unlock(&the_lnet.ln_api_mutex);
+ return 0;
+ }
+
+ /* tell peers that discovery setting has changed */
+ lnet_net_lock(LNET_LOCK_EX);
+ pbuf = the_lnet.ln_ping_target;
+ if (value)
+ pbuf->pb_info.pi_features &= ~LNET_PING_FEAT_DISCOVERY;
+ else
+ pbuf->pb_info.pi_features |= LNET_PING_FEAT_DISCOVERY;
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ lnet_push_update_to_peers(1);
+
+ mutex_unlock(&the_lnet.ln_api_mutex);
+
+ return 0;
+}
+
static int
intf_max_set(const char *val, struct kernel_param *kp)
{
init_waitqueue_head(&the_lnet.ln_eq_waitq);
init_waitqueue_head(&the_lnet.ln_rc_waitq);
mutex_init(&the_lnet.ln_lnd_mutex);
- mutex_init(&the_lnet.ln_api_mutex);
}
static void
CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.hello.incarnation) == 8);
CLASSERT((int)offsetof(struct lnet_hdr, msg.hello.type) == 40);
CLASSERT((int)sizeof(((struct lnet_hdr *)0)->msg.hello.type) == 4);
+
+ /* Checks for struct lnet_ni_status and related constants */
+ CLASSERT(LNET_NI_STATUS_INVALID == 0x00000000);
+ CLASSERT(LNET_NI_STATUS_UP == 0x15aac0de);
+ CLASSERT(LNET_NI_STATUS_DOWN == 0xdeadface);
+
+ /* Checks for struct lnet_ni_status */
+ CLASSERT((int)sizeof(struct lnet_ni_status) == 16);
+ CLASSERT((int)offsetof(struct lnet_ni_status, ns_nid) == 0);
+ CLASSERT((int)sizeof(((struct lnet_ni_status *)0)->ns_nid) == 8);
+ CLASSERT((int)offsetof(struct lnet_ni_status, ns_status) == 8);
+ CLASSERT((int)sizeof(((struct lnet_ni_status *)0)->ns_status) == 4);
+ CLASSERT((int)offsetof(struct lnet_ni_status, ns_unused) == 12);
+ CLASSERT((int)sizeof(((struct lnet_ni_status *)0)->ns_unused) == 4);
+
+ /* Checks for struct lnet_ping_info and related constants */
+ CLASSERT(LNET_PROTO_PING_MAGIC == 0x70696E67);
+ CLASSERT(LNET_PING_FEAT_INVAL == 0);
+ CLASSERT(LNET_PING_FEAT_BASE == 1);
+ CLASSERT(LNET_PING_FEAT_NI_STATUS == 2);
+ CLASSERT(LNET_PING_FEAT_RTE_DISABLED == 4);
+ CLASSERT(LNET_PING_FEAT_MULTI_RAIL == 8);
+ CLASSERT(LNET_PING_FEAT_DISCOVERY == 16);
+ CLASSERT(LNET_PING_FEAT_BITS == 31);
+
+ /* Checks for struct lnet_ping_info */
+ CLASSERT((int)sizeof(struct lnet_ping_info) == 16);
+ CLASSERT((int)offsetof(struct lnet_ping_info, pi_magic) == 0);
+ CLASSERT((int)sizeof(((struct lnet_ping_info *)0)->pi_magic) == 4);
+ CLASSERT((int)offsetof(struct lnet_ping_info, pi_features) == 4);
+ CLASSERT((int)sizeof(((struct lnet_ping_info *)0)->pi_features) == 4);
+ CLASSERT((int)offsetof(struct lnet_ping_info, pi_pid) == 8);
+ CLASSERT((int)sizeof(((struct lnet_ping_info *)0)->pi_pid) == 4);
+ CLASSERT((int)offsetof(struct lnet_ping_info, pi_nnis) == 12);
+ CLASSERT((int)sizeof(((struct lnet_ping_info *)0)->pi_nnis) == 4);
+ CLASSERT((int)offsetof(struct lnet_ping_info, pi_ni) == 16);
+ CLASSERT((int)sizeof(((struct lnet_ping_info *)0)->pi_ni) == 0);
}
static struct lnet_lnd *lnet_find_lnd_by_type(__u32 type)
the_lnet.ln_pid = requested_pid;
INIT_LIST_HEAD(&the_lnet.ln_test_peers);
- INIT_LIST_HEAD(&the_lnet.ln_peers);
INIT_LIST_HEAD(&the_lnet.ln_remote_peer_ni_list);
INIT_LIST_HEAD(&the_lnet.ln_nets);
INIT_LIST_HEAD(&the_lnet.ln_routers);
INIT_LIST_HEAD(&the_lnet.ln_drop_rules);
INIT_LIST_HEAD(&the_lnet.ln_delay_rules);
+ INIT_LIST_HEAD(&the_lnet.ln_dc_request);
+ INIT_LIST_HEAD(&the_lnet.ln_dc_working);
+ INIT_LIST_HEAD(&the_lnet.ln_dc_expired);
+ init_waitqueue_head(&the_lnet.ln_dc_waitq);
rc = lnet_descriptor_setup();
if (rc != 0)
pbuf->pb_info.pi_nnis = nnis;
pbuf->pb_info.pi_pid = the_lnet.ln_pid;
pbuf->pb_info.pi_magic = LNET_PROTO_PING_MAGIC;
- pbuf->pb_info.pi_features = LNET_PING_FEAT_NI_STATUS;
+ pbuf->pb_info.pi_features =
+ LNET_PING_FEAT_NI_STATUS | LNET_PING_FEAT_MULTI_RAIL;
return pbuf;
}
if (!the_lnet.ln_routing)
pbuf->pb_info.pi_features |= LNET_PING_FEAT_RTE_DISABLED;
+ if (!lnet_peer_discovery_disabled)
+ pbuf->pb_info.pi_features |= LNET_PING_FEAT_DISCOVERY;
+
+ /* Ensure only known feature bits have been set. */
+ LASSERT(pbuf->pb_info.pi_features & LNET_PING_FEAT_BITS);
+ LASSERT(!(pbuf->pb_info.pi_features & ~LNET_PING_FEAT_BITS));
+
lnet_ping_target_install_locked(pbuf);
if (the_lnet.ln_ping_target) {
lnet_ping_md_unlink(old_pbuf, &old_ping_md);
lnet_ping_buffer_decref(old_pbuf);
}
+
+ lnet_push_update_to_peers(0);
}
static void
lnet_ping_target_destroy();
}
+/* Resize the push target. */
+int lnet_push_target_resize(void)
+{
+ lnet_process_id_t id = { LNET_NID_ANY, LNET_PID_ANY };
+ lnet_md_t md = { NULL };
+ lnet_handle_me_t meh;
+ lnet_handle_md_t mdh;
+ lnet_handle_md_t old_mdh;
+ struct lnet_ping_buffer *pbuf;
+ struct lnet_ping_buffer *old_pbuf;
+ int nnis = the_lnet.ln_push_target_nnis;
+ int rc;
+
+ if (nnis <= 0) {
+ rc = -EINVAL;
+ goto fail_return;
+ }
+again:
+ pbuf = lnet_ping_buffer_alloc(nnis, GFP_NOFS);
+ if (!pbuf) {
+ rc = -ENOMEM;
+ goto fail_return;
+ }
+
+ rc = LNetMEAttach(LNET_RESERVED_PORTAL, id,
+ LNET_PROTO_PING_MATCHBITS, 0,
+ LNET_UNLINK, LNET_INS_AFTER,
+ &meh);
+ if (rc) {
+ CERROR("Can't create push target ME: %d\n", rc);
+ goto fail_decref_pbuf;
+ }
+
+ /* initialize md content */
+ md.start = &pbuf->pb_info;
+ md.length = LNET_PING_INFO_SIZE(nnis);
+ md.threshold = LNET_MD_THRESH_INF;
+ md.max_size = 0;
+ md.options = LNET_MD_OP_PUT | LNET_MD_TRUNCATE |
+ LNET_MD_MANAGE_REMOTE;
+ md.user_ptr = pbuf;
+ md.eq_handle = the_lnet.ln_push_target_eq;
+
+ rc = LNetMDAttach(meh, md, LNET_RETAIN, &mdh);
+ if (rc) {
+ CERROR("Can't attach push MD: %d\n", rc);
+ goto fail_unlink_meh;
+ }
+ lnet_ping_buffer_addref(pbuf);
+
+ lnet_net_lock(LNET_LOCK_EX);
+ old_pbuf = the_lnet.ln_push_target;
+ old_mdh = the_lnet.ln_push_target_md;
+ the_lnet.ln_push_target = pbuf;
+ the_lnet.ln_push_target_md = mdh;
+ lnet_net_unlock(LNET_LOCK_EX);
+
+ if (old_pbuf) {
+ LNetMDUnlink(old_mdh);
+ lnet_ping_buffer_decref(old_pbuf);
+ }
+
+ if (nnis < the_lnet.ln_push_target_nnis)
+ goto again;
+
+ CDEBUG(D_NET, "nnis %d success\n", nnis);
+
+ return 0;
+
+fail_unlink_meh:
+ LNetMEUnlink(meh);
+fail_decref_pbuf:
+ lnet_ping_buffer_decref(pbuf);
+fail_return:
+ CDEBUG(D_NET, "nnis %d error %d\n", nnis, rc);
+ return rc;
+}
+
+static void lnet_push_target_event_handler(struct lnet_event *ev)
+{
+ struct lnet_ping_buffer *pbuf = ev->md.user_ptr;
+
+ if (pbuf->pb_info.pi_magic == __swab32(LNET_PROTO_PING_MAGIC))
+ lnet_swap_pinginfo(pbuf);
+
+ lnet_peer_push_event(ev);
+ if (ev->unlinked)
+ lnet_ping_buffer_decref(pbuf);
+}
+
+/* Initialize the push target. */
+static int lnet_push_target_init(void)
+{
+ int rc;
+
+ if (the_lnet.ln_push_target)
+ return -EALREADY;
+
+ rc = LNetEQAlloc(0, lnet_push_target_event_handler,
+ &the_lnet.ln_push_target_eq);
+ if (rc) {
+ CERROR("Can't allocated push target EQ: %d\n", rc);
+ return rc;
+ }
+
+ /* Start at the required minimum, we'll enlarge if required. */
+ the_lnet.ln_push_target_nnis = LNET_INTERFACES_MIN;
+
+ rc = lnet_push_target_resize();
+
+ if (rc) {
+ LNetEQFree(the_lnet.ln_push_target_eq);
+ LNetInvalidateEQHandle(&the_lnet.ln_push_target_eq);
+ }
+
+ return rc;
+}
+
+/* Clean up the push target. */
+static void lnet_push_target_fini(void)
+{
+ if (!the_lnet.ln_push_target)
+ return;
+
+ /* Unlink and invalidate to prevent new references. */
+ LNetMDUnlink(the_lnet.ln_push_target_md);
+ LNetInvalidateMDHandle(&the_lnet.ln_push_target_md);
+
+ /* Wait for the unlink to complete. */
+ while (lnet_ping_buffer_numref(the_lnet.ln_push_target) > 1) {
+ CDEBUG(D_NET, "Still waiting for ping data MD to unlink\n");
+ set_current_state(TASK_UNINTERRUPTIBLE);
+ schedule_timeout(cfs_time_seconds(1));
+ }
+
+ lnet_ping_buffer_decref(the_lnet.ln_push_target);
+ the_lnet.ln_push_target = NULL;
+ the_lnet.ln_push_target_nnis = 0;
+
+ LNetEQFree(the_lnet.ln_push_target_eq);
+ LNetInvalidateEQHandle(&the_lnet.ln_push_target_eq);
+}
+
static int
lnet_ni_tq_credits(struct lnet_ni *ni)
{
lnet_assert_wire_constants();
- memset(&the_lnet, 0, sizeof(the_lnet));
-
/* refer to global cfs_cpt_table for now */
the_lnet.ln_cpt_table = cfs_cpt_table;
the_lnet.ln_cpt_number = cfs_cpt_number(cfs_cpt_table);
if (rc != 0)
goto err_stop_ping;
+ rc = lnet_push_target_init();
+ if (rc != 0)
+ goto err_stop_router_checker;
+
+ rc = lnet_peer_discovery_start();
+ if (rc != 0)
+ goto err_destroy_push_target;
+
lnet_fault_init();
lnet_proc_init();
return 0;
+err_destroy_push_target:
+ lnet_push_target_fini();
+err_stop_router_checker:
+ lnet_router_checker_stop();
err_stop_ping:
lnet_ping_target_fini();
err_acceptor_stop:
lnet_fault_fini();
lnet_proc_fini();
+ lnet_peer_discovery_stop();
+ lnet_push_target_fini();
lnet_router_checker_stop();
lnet_ping_target_fini();
memcpy(&tun->lt_cmn, &ni->ni_net->net_tunables, sizeof(tun->lt_cmn));
if (stats) {
- stats->iel_send_count = atomic_read(&ni->ni_stats.send_count);
- stats->iel_recv_count = atomic_read(&ni->ni_stats.recv_count);
+ stats->iel_send_count = lnet_sum_stats(&ni->ni_stats,
+ LNET_STATS_TYPE_SEND);
+ stats->iel_recv_count = lnet_sum_stats(&ni->ni_stats,
+ LNET_STATS_TYPE_RECV);
+ stats->iel_drop_count = lnet_sum_stats(&ni->ni_stats,
+ LNET_STATS_TYPE_DROP);
}
/*
return rc;
}
+int lnet_get_ni_stats(struct lnet_ioctl_element_msg_stats *msg_stats)
+{
+ struct lnet_ni *ni;
+ int cpt;
+ int rc = -ENOENT;
+
+ if (!msg_stats)
+ return -EINVAL;
+
+ cpt = lnet_net_lock_current();
+
+ ni = lnet_get_ni_idx_locked(msg_stats->im_idx);
+
+ if (ni) {
+ lnet_usr_translate_stats(msg_stats, &ni->ni_stats);
+ rc = 0;
+ }
+
+ lnet_net_unlock(cpt);
+
+ return rc;
+}
+
static int lnet_add_net_common(struct lnet_net *net,
struct lnet_ioctl_config_lnd_tunables *tun)
{
__u32 tun_size;
cfg_ni = arg;
+
/* get the tunables if they are available */
if (cfg_ni->lic_cfg_hdr.ioc_len <
- sizeof(*cfg_ni) + sizeof(*stats)+ sizeof(*tun))
+ sizeof(*cfg_ni) + sizeof(*stats) + sizeof(*tun))
return -EINVAL;
stats = (struct lnet_ioctl_element_stats *)
return rc;
}
+ case IOC_LIBCFS_GET_LOCAL_NI_MSG_STATS: {
+ struct lnet_ioctl_element_msg_stats *msg_stats = arg;
+
+ if (msg_stats->im_hdr.ioc_len != sizeof(*msg_stats))
+ return -EINVAL;
+
+ mutex_lock(&the_lnet.ln_api_mutex);
+ rc = lnet_get_ni_stats(msg_stats);
+ mutex_unlock(&the_lnet.ln_api_mutex);
+
+ return rc;
+ }
+
case IOC_LIBCFS_GET_NET: {
size_t total = sizeof(*config) +
sizeof(struct lnet_ioctl_net_config);
return -EINVAL;
mutex_lock(&the_lnet.ln_api_mutex);
- rc = lnet_add_peer_ni_to_peer(cfg->prcfg_prim_nid,
- cfg->prcfg_cfg_nid,
- cfg->prcfg_mr);
+ rc = lnet_add_peer_ni(cfg->prcfg_prim_nid,
+ cfg->prcfg_cfg_nid,
+ cfg->prcfg_mr);
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
return -EINVAL;
mutex_lock(&the_lnet.ln_api_mutex);
- rc = lnet_del_peer_ni_from_peer(cfg->prcfg_prim_nid,
- cfg->prcfg_cfg_nid);
+ rc = lnet_del_peer_ni(cfg->prcfg_prim_nid,
+ cfg->prcfg_cfg_nid);
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
case IOC_LIBCFS_GET_PEER_NI: {
struct lnet_ioctl_peer_cfg *cfg = arg;
- struct lnet_peer_ni_credit_info __user *lpni_cri;
- struct lnet_ioctl_element_stats __user *lpni_stats;
- size_t usr_size = sizeof(*lpni_cri) + sizeof(*lpni_stats);
- if ((cfg->prcfg_hdr.ioc_len != sizeof(*cfg)) ||
- (cfg->prcfg_size != usr_size))
+ if (cfg->prcfg_hdr.ioc_len < sizeof(*cfg))
return -EINVAL;
- lpni_cri = cfg->prcfg_bulk;
- lpni_stats = cfg->prcfg_bulk + sizeof(*lpni_cri);
+ mutex_lock(&the_lnet.ln_api_mutex);
+ rc = lnet_get_peer_info(&cfg->prcfg_prim_nid,
+ &cfg->prcfg_cfg_nid,
+ &cfg->prcfg_count,
+ &cfg->prcfg_mr,
+ &cfg->prcfg_size,
+ (void __user *)cfg->prcfg_bulk);
+ mutex_unlock(&the_lnet.ln_api_mutex);
+ return rc;
+ }
+
+ case IOC_LIBCFS_GET_PEER_LIST: {
+ struct lnet_ioctl_peer_cfg *cfg = arg;
+
+ if (cfg->prcfg_hdr.ioc_len < sizeof(*cfg))
+ return -EINVAL;
mutex_lock(&the_lnet.ln_api_mutex);
- rc = lnet_get_peer_info(cfg->prcfg_count, &cfg->prcfg_prim_nid,
- &cfg->prcfg_cfg_nid, &cfg->prcfg_mr,
- lpni_cri, lpni_stats);
+ rc = lnet_get_peer_list(&cfg->prcfg_count, &cfg->prcfg_size,
+ (lnet_process_id_t __user *)cfg->prcfg_bulk);
mutex_unlock(&the_lnet.ln_api_mutex);
return rc;
}
id.nid = data->ioc_nid;
id.pid = data->ioc_u32[0];
- /* Don't block longer than 2 minutes */
- if (data->ioc_u32[1] > 120 * MSEC_PER_SEC)
- return -EINVAL;
-
- /* If timestamp is negative then disable timeout */
- if ((s32)data->ioc_u32[1] < 0)
- timeout = MAX_SCHEDULE_TIMEOUT;
+ /* If timeout is negative then set default of 3 minutes */
+ if (((s32)data->ioc_u32[1] <= 0) ||
+ data->ioc_u32[1] > (DEFAULT_PEER_TIMEOUT * MSEC_PER_SEC))
+ timeout = msecs_to_jiffies(DEFAULT_PEER_TIMEOUT * MSEC_PER_SEC);
else
timeout = msecs_to_jiffies(data->ioc_u32[1]);
rc = lnet_ping(id, timeout, data->ioc_pbuf1,
data->ioc_plen1 / sizeof(struct lnet_process_id));
+
if (rc < 0)
return rc;
+
data->ioc_count = rc;
return 0;
}
+ case IOC_LIBCFS_PING_PEER: {
+ struct lnet_ioctl_ping_data *ping = arg;
+ struct lnet_peer *lp;
+ signed long timeout;
+
+ /* If timeout is negative then set default of 3 minutes */
+ if (((s32)ping->op_param) <= 0 ||
+ ping->op_param > (DEFAULT_PEER_TIMEOUT * MSEC_PER_SEC))
+ timeout = msecs_to_jiffies(DEFAULT_PEER_TIMEOUT * MSEC_PER_SEC);
+ else
+ timeout = msecs_to_jiffies(ping->op_param);
+
+ rc = lnet_ping(ping->ping_id, timeout,
+ ping->ping_buf,
+ ping->ping_count);
+ if (rc < 0)
+ return rc;
+
+ lp = lnet_find_peer(ping->ping_id.nid);
+ if (lp) {
+ ping->ping_id.nid = lp->lp_primary_nid;
+ ping->mr_info = lnet_peer_is_multi_rail(lp);
+ }
+ ping->ping_count = rc;
+ return 0;
+ }
+
+ case IOC_LIBCFS_DISCOVER: {
+ struct lnet_ioctl_ping_data *discover = arg;
+ struct lnet_peer *lp;
+
+ rc = lnet_discover(discover->ping_id, discover->op_param,
+ discover->ping_buf,
+ discover->ping_count);
+ if (rc < 0)
+ return rc;
+ lp = lnet_find_peer(discover->ping_id.nid);
+ if (lp) {
+ discover->ping_id.nid = lp->lp_primary_nid;
+ discover->mr_info = lnet_peer_is_multi_rail(lp);
+ }
+
+ discover->ping_count = rc;
+ return 0;
+ }
+
default:
ni = lnet_net2ni_addref(data->ioc_net);
if (ni == NULL)
/* initialize md content */
md.start = &pbuf->pb_info;
md.length = LNET_PING_INFO_SIZE(n_ids);
- md.threshold = 2; /*GET/REPLY*/
+ md.threshold = 2; /* GET/REPLY */
md.max_size = 0;
md.options = LNET_MD_TRUNCATE;
md.user_ptr = NULL;
if (rc != 0) {
/* Don't CERROR; this could be deliberate! */
-
rc2 = LNetMDUnlink(mdh);
LASSERT(rc2 == 0);
replied = 1;
rc = event.mlength;
}
-
} while (rc2 <= 0 || !event.unlinked);
if (!replied) {
nob = rc;
LASSERT(nob >= 0 && nob <= LNET_PING_INFO_SIZE(n_ids));
- rc = -EPROTO; /* if I can't parse... */
+ rc = -EPROTO; /* if I can't parse... */
if (nob < 8) {
- /* can't check magic/version */
CERROR("%s: ping info too short %d\n",
libcfs_id2str(id), nob);
goto fail_free_eq;
}
if (nob < LNET_PING_INFO_SIZE(0)) {
- CERROR("%s: Short reply %d(%d min)\n", libcfs_id2str(id),
+ CERROR("%s: Short reply %d(%d min)\n",
+ libcfs_id2str(id),
nob, (int)LNET_PING_INFO_SIZE(0));
goto fail_free_eq;
}
n_ids = pbuf->pb_info.pi_nnis;
if (nob < LNET_PING_INFO_SIZE(n_ids)) {
- CERROR("%s: Short reply %d(%d expected)\n", libcfs_id2str(id),
+ CERROR("%s: Short reply %d(%d expected)\n",
+ libcfs_id2str(id),
nob, (int)LNET_PING_INFO_SIZE(n_ids));
goto fail_free_eq;
}
- rc = -EFAULT; /* If I SEGV... */
+ rc = -EFAULT; /* if I segv in copy_to_user()... */
memset(&tmpid, 0, sizeof(tmpid));
for (i = 0; i < n_ids; i++) {
lnet_ping_buffer_decref(pbuf);
return rc;
}
+
+static int
+lnet_discover(lnet_process_id_t id, __u32 force, lnet_process_id_t __user *ids,
+ int n_ids)
+{
+ struct lnet_peer_ni *lpni;
+ struct lnet_peer_ni *p;
+ struct lnet_peer *lp;
+ lnet_process_id_t *buf;
+ int cpt;
+ int i;
+ int rc;
+ int max_intf = lnet_interfaces_max;
+
+ if (n_ids <= 0 ||
+ id.nid == LNET_NID_ANY ||
+ n_ids > max_intf)
+ return -EINVAL;
+
+ if (id.pid == LNET_PID_ANY)
+ id.pid = LNET_PID_LUSTRE;
+
+ LIBCFS_ALLOC(buf, n_ids * sizeof(*buf));
+ if (!buf)
+ return -ENOMEM;
+
+ cpt = lnet_net_lock_current();
+ lpni = lnet_nid2peerni_locked(id.nid, LNET_NID_ANY, cpt);
+ if (IS_ERR(lpni)) {
+ rc = PTR_ERR(lpni);
+ goto out;
+ }
+
+ /*
+ * Clearing the NIDS_UPTODATE flag ensures the peer will
+ * be discovered, provided discovery has not been disabled.
+ */
+ lp = lpni->lpni_peer_net->lpn_peer;
+ spin_lock(&lp->lp_lock);
+ lp->lp_state &= ~LNET_PEER_NIDS_UPTODATE;
+ /* If the force flag is set, force a PING and PUSH as well. */
+ if (force)
+ lp->lp_state |= LNET_PEER_FORCE_PING | LNET_PEER_FORCE_PUSH;
+ spin_unlock(&lp->lp_lock);
+ rc = lnet_discover_peer_locked(lpni, cpt, true);
+ if (rc)
+ goto out_decref;
+
+ /* Peer may have changed. */
+ lp = lpni->lpni_peer_net->lpn_peer;
+ if (lp->lp_nnis < n_ids)
+ n_ids = lp->lp_nnis;
+
+ i = 0;
+ p = NULL;
+ while ((p = lnet_get_next_peer_ni_locked(lp, NULL, p)) != NULL) {
+ buf[i].pid = id.pid;
+ buf[i].nid = p->lpni_nid;
+ if (++i >= n_ids)
+ break;
+ }
+
+ lnet_net_unlock(cpt);
+
+ rc = -EFAULT;
+ if (copy_to_user(ids, buf, n_ids * sizeof(*buf)))
+ goto out_relock;
+ rc = n_ids;
+out_relock:
+ lnet_net_lock(cpt);
+out_decref:
+ lnet_peer_ni_decref_locked(lpni);
+out:
+ lnet_net_unlock(cpt);
+
+ return rc;
+}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff