spin_lock_init(&ptable->pt_zombie_lock);
INIT_LIST_HEAD(&ptable->pt_zombie_list);
+ INIT_LIST_HEAD(&ptable->pt_peer_list);
+
for (j = 0; j < LNET_PEER_HASH_SIZE; j++)
INIT_LIST_HEAD(&hash[j]);
ptable->pt_hash = hash; /* sign of initialization */
INIT_LIST_HEAD(&lpni->lpni_rtrq);
INIT_LIST_HEAD(&lpni->lpni_routes);
INIT_LIST_HEAD(&lpni->lpni_hashlist);
- INIT_LIST_HEAD(&lpni->lpni_on_peer_net_list);
+ INIT_LIST_HEAD(&lpni->lpni_peer_nis);
INIT_LIST_HEAD(&lpni->lpni_on_remote_peer_ni_list);
spin_lock_init(&lpni->lpni_lock);
&the_lnet.ln_remote_peer_ni_list);
}
- /* TODO: update flags */
+ CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nid2str(lpni->lpni_nid));
return lpni;
}
if (!lpn)
return NULL;
- INIT_LIST_HEAD(&lpn->lpn_on_peer_list);
+ INIT_LIST_HEAD(&lpn->lpn_peer_nets);
INIT_LIST_HEAD(&lpn->lpn_peer_nis);
lpn->lpn_net_id = net_id;
+ CDEBUG(D_NET, "%p net %s\n", lpn, libcfs_net2str(lpn->lpn_net_id));
+
return lpn;
}
+void
+lnet_destroy_peer_net_locked(struct lnet_peer_net *lpn)
+{
+ struct lnet_peer *lp;
+
+ CDEBUG(D_NET, "%p net %s\n", lpn, libcfs_net2str(lpn->lpn_net_id));
+
+ LASSERT(atomic_read(&lpn->lpn_refcount) == 0);
+ LASSERT(list_empty(&lpn->lpn_peer_nis));
+ LASSERT(list_empty(&lpn->lpn_peer_nets));
+ lp = lpn->lpn_peer;
+ lpn->lpn_peer = NULL;
+ LIBCFS_FREE(lpn, sizeof(*lpn));
+
+ lnet_peer_decref_locked(lp);
+}
+
static struct lnet_peer *
lnet_peer_alloc(lnet_nid_t nid)
{
if (!lp)
return NULL;
- INIT_LIST_HEAD(&lp->lp_on_lnet_peer_list);
+ INIT_LIST_HEAD(&lp->lp_peer_list);
INIT_LIST_HEAD(&lp->lp_peer_nets);
spin_lock_init(&lp->lp_lock);
lp->lp_primary_nid = nid;
+ lp->lp_cpt = lnet_nid_cpt_hash(nid, LNET_CPT_NUMBER);
- /* TODO: update flags */
+ CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nid2str(lp->lp_primary_nid));
return lp;
}
+void
+lnet_destroy_peer_locked(struct lnet_peer *lp)
+{
+ CDEBUG(D_NET, "%p nid %s\n", lp, libcfs_nid2str(lp->lp_primary_nid));
+
+ LASSERT(atomic_read(&lp->lp_refcount) == 0);
+ LASSERT(list_empty(&lp->lp_peer_nets));
+ LASSERT(list_empty(&lp->lp_peer_list));
+ LIBCFS_FREE(lp, sizeof(*lp));
+}
+
+/*
+ * Detach a peer_ni from its peer_net. If this was the last peer_ni on
+ * that peer_net, detach the peer_net from the peer.
+ *
+ * Call with lnet_net_lock/EX held
+ */
static void
-lnet_peer_detach_peer_ni(struct lnet_peer_ni *lpni)
+lnet_peer_detach_peer_ni_locked(struct lnet_peer_ni *lpni)
{
+ struct lnet_peer_table *ptable;
struct lnet_peer_net *lpn;
struct lnet_peer *lp;
- /* TODO: could the below situation happen? accessing an already
- * destroyed peer? */
- if (lpni->lpni_peer_net == NULL ||
- lpni->lpni_peer_net->lpn_peer == NULL)
- return;
-
+ /*
+ * Belts and suspenders: gracefully handle teardown of a
+ * partially connected peer_ni.
+ */
lpn = lpni->lpni_peer_net;
- lp = lpni->lpni_peer_net->lpn_peer;
- CDEBUG(D_NET, "peer %s NID %s\n",
- libcfs_nid2str(lp->lp_primary_nid),
- libcfs_nid2str(lpni->lpni_nid));
+ list_del_init(&lpni->lpni_peer_nis);
+ /*
+ * If there are no lpni's left, we detach lpn from
+ * lp_peer_nets, so it cannot be found anymore.
+ */
+ if (list_empty(&lpn->lpn_peer_nis))
+ list_del_init(&lpn->lpn_peer_nets);
- list_del_init(&lpni->lpni_on_peer_net_list);
- lpni->lpni_peer_net = NULL;
+ /* Update peer NID count. */
+ lp = lpn->lpn_peer;
+ ptable = the_lnet.ln_peer_tables[lp->lp_cpt];
+ lp->lp_nnis--;
+ ptable->pt_peer_nnids--;
- /* if lpn is empty, then remove it from the peer */
- if (list_empty(&lpn->lpn_peer_nis)) {
- list_del_init(&lpn->lpn_on_peer_list);
- lpn->lpn_peer = NULL;
- LIBCFS_FREE(lpn, sizeof(*lpn));
-
- /* if the peer is empty then remove it from the
- * the_lnet.ln_peers */
- if (list_empty(&lp->lp_peer_nets)) {
- list_del_init(&lp->lp_on_lnet_peer_list);
- LIBCFS_FREE(lp, sizeof(*lp));
- }
+ /*
+ * If there are no more peer nets, make the peer unfindable
+ * via the peer_tables.
+ */
+ if (list_empty(&lp->lp_peer_nets)) {
+ list_del_init(&lp->lp_peer_list);
+ ptable->pt_peers--;
}
+ CDEBUG(D_NET, "peer %s NID %s\n",
+ libcfs_nid2str(lp->lp_primary_nid),
+ libcfs_nid2str(lpni->lpni_nid));
}
/* called with lnet_net_lock LNET_LOCK_EX held */
/* decrement the ref count on the peer table */
ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
- LASSERT(atomic_read(&ptable->pt_number) > 0);
- atomic_dec(&ptable->pt_number);
+ LASSERT(ptable->pt_number > 0);
+ ptable->pt_number--;
/*
* The peer_ni can no longer be found with a lookup. But there
spin_unlock(&ptable->pt_zombie_lock);
/* no need to keep this peer_ni on the hierarchy anymore */
- lnet_peer_detach_peer_ni(lpni);
+ lnet_peer_detach_peer_ni_locked(lpni);
- /* decrement reference on peer_ni */
+ /* remove hashlist reference on peer_ni */
lnet_peer_ni_decref_locked(lpni);
return 0;
* This function only allows deletion of the primary NID if it
* is the only NID.
*/
- if (nid == lp->lp_primary_nid && lnet_get_num_peer_nis(lp) != 1) {
+ if (nid == lp->lp_primary_nid && lp->lp_nnis != 1) {
rc = -EBUSY;
goto out;
}
lnet_get_peer_ni_idx_locked(int idx, struct lnet_peer_net **lpn,
struct lnet_peer **lp)
{
+ struct lnet_peer_table *ptable;
struct lnet_peer_ni *lpni;
+ int lncpt;
+ int cpt;
+
+ lncpt = cfs_percpt_number(the_lnet.ln_peer_tables);
+
+ for (cpt = 0; cpt < lncpt; cpt++) {
+ ptable = the_lnet.ln_peer_tables[cpt];
+ if (ptable->pt_peer_nnids > idx)
+ break;
+ idx -= ptable->pt_peer_nnids;
+ }
+ if (cpt >= lncpt)
+ return NULL;
- list_for_each_entry((*lp), &the_lnet.ln_peers, lp_on_lnet_peer_list) {
- list_for_each_entry((*lpn), &((*lp)->lp_peer_nets), lpn_on_peer_list) {
+ list_for_each_entry((*lp), &ptable->pt_peer_list, lp_peer_list) {
+ if ((*lp)->lp_nnis <= idx) {
+ idx -= (*lp)->lp_nnis;
+ continue;
+ }
+ list_for_each_entry((*lpn), &((*lp)->lp_peer_nets),
+ lpn_peer_nets) {
list_for_each_entry(lpni, &((*lpn)->lpn_peer_nis),
- lpni_on_peer_net_list)
+ lpni_peer_nis) {
if (idx-- == 0)
return lpni;
+ }
}
}
struct lnet_peer_net *net = peer_net;
if (!prev) {
- if (!net)
+ if (!net) {
+ if (list_empty(&peer->lp_peer_nets))
+ return NULL;
+
net = list_entry(peer->lp_peer_nets.next,
struct lnet_peer_net,
- lpn_on_peer_list);
+ lpn_peer_nets);
+ }
lpni = list_entry(net->lpn_peer_nis.next, struct lnet_peer_ni,
- lpni_on_peer_net_list);
+ lpni_peer_nis);
return lpni;
}
- if (prev->lpni_on_peer_net_list.next ==
- &prev->lpni_peer_net->lpn_peer_nis) {
+ if (prev->lpni_peer_nis.next == &prev->lpni_peer_net->lpn_peer_nis) {
/*
* if you reached the end of the peer ni list and the peer
* net is specified then there are no more peer nis in that
* we reached the end of this net ni list. move to the
* next net
*/
- if (prev->lpni_peer_net->lpn_on_peer_list.next ==
+ if (prev->lpni_peer_net->lpn_peer_nets.next ==
&peer->lp_peer_nets)
/* no more nets and no more NIs. */
return NULL;
/* get the next net */
- net = list_entry(prev->lpni_peer_net->lpn_on_peer_list.next,
+ net = list_entry(prev->lpni_peer_net->lpn_peer_nets.next,
struct lnet_peer_net,
- lpn_on_peer_list);
+ lpn_peer_nets);
/* get the ni on it */
lpni = list_entry(net->lpn_peer_nis.next, struct lnet_peer_ni,
- lpni_on_peer_net_list);
+ lpni_peer_nis);
return lpni;
}
/* there are more nis left */
- lpni = list_entry(prev->lpni_on_peer_net_list.next,
- struct lnet_peer_ni, lpni_on_peer_net_list);
+ lpni = list_entry(prev->lpni_peer_nis.next,
+ struct lnet_peer_ni, lpni_peer_nis);
return lpni;
}
lnet_peer_get_net_locked(struct lnet_peer *peer, __u32 net_id)
{
struct lnet_peer_net *peer_net;
- list_for_each_entry(peer_net, &peer->lp_peer_nets, lpn_on_peer_list) {
+ list_for_each_entry(peer_net, &peer->lp_peer_nets, lpn_peer_nets) {
if (peer_net->lpn_net_id == net_id)
return peer_net;
}
}
/*
- * Always returns 0, but it the last function called from functions
+ * Attach a peer_ni to a peer_net and peer. This function assumes
+ * peer_ni is not already attached to the peer_net/peer. The peer_ni
+ * may be attached to a different peer, in which case it will be
+ * properly detached first. The whole operation is done atomically.
+ *
+ * Always returns 0. This is the last function called from functions
* that do return an int, so returning 0 here allows the compiler to
* do a tail call.
*/
static int
lnet_peer_attach_peer_ni(struct lnet_peer *lp,
- struct lnet_peer_net *lpn,
- struct lnet_peer_ni *lpni,
- unsigned flags)
+ struct lnet_peer_net *lpn,
+ struct lnet_peer_ni *lpni,
+ unsigned flags)
{
struct lnet_peer_table *ptable;
ptable = the_lnet.ln_peer_tables[lpni->lpni_cpt];
list_add_tail(&lpni->lpni_hashlist, &ptable->pt_hash[hash]);
ptable->pt_version++;
- atomic_inc(&ptable->pt_number);
+ ptable->pt_number++;
+ /* This is the 1st refcount on lpni. */
atomic_inc(&lpni->lpni_refcount);
}
/* Detach the peer_ni from an existing peer, if necessary. */
- if (lpni->lpni_peer_net && lpni->lpni_peer_net->lpn_peer != lp)
- lnet_peer_detach_peer_ni(lpni);
+ if (lpni->lpni_peer_net) {
+ LASSERT(lpni->lpni_peer_net != lpn);
+ LASSERT(lpni->lpni_peer_net->lpn_peer != lp);
+ lnet_peer_detach_peer_ni_locked(lpni);
+ lnet_peer_net_decref_locked(lpni->lpni_peer_net);
+ lpni->lpni_peer_net = NULL;
+ }
/* Add peer_ni to peer_net */
lpni->lpni_peer_net = lpn;
- list_add_tail(&lpni->lpni_on_peer_net_list, &lpn->lpn_peer_nis);
+ list_add_tail(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
+ lnet_peer_net_addref_locked(lpn);
/* Add peer_net to peer */
if (!lpn->lpn_peer) {
lpn->lpn_peer = lp;
- list_add_tail(&lpn->lpn_on_peer_list, &lp->lp_peer_nets);
+ list_add_tail(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+ lnet_peer_addref_locked(lp);
+ }
+
+ /* Add peer to global peer list, if necessary */
+ ptable = the_lnet.ln_peer_tables[lp->lp_cpt];
+ if (list_empty(&lp->lp_peer_list)) {
+ list_add_tail(&lp->lp_peer_list, &ptable->pt_peer_list);
+ ptable->pt_peers++;
}
- /* Add peer to global peer list */
- if (list_empty(&lp->lp_on_lnet_peer_list))
- list_add_tail(&lp->lp_on_lnet_peer_list, &the_lnet.ln_peers);
/* Update peer state */
spin_lock(&lp->lp_lock);
}
spin_unlock(&lp->lp_lock);
+ lp->lp_nnis++;
+ the_lnet.ln_peer_tables[lp->lp_cpt]->pt_peer_nnids++;
lnet_net_unlock(LNET_LOCK_EX);
CDEBUG(D_NET, "peer %s NID %s flags %#x\n",
lnet_destroy_peer_ni_locked(struct lnet_peer_ni *lpni)
{
struct lnet_peer_table *ptable;
+ struct lnet_peer_net *lpn;
+
+ CDEBUG(D_NET, "%p nid %s\n", lpni, libcfs_nid2str(lpni->lpni_nid));
LASSERT(atomic_read(&lpni->lpni_refcount) == 0);
LASSERT(lpni->lpni_rtr_refcount == 0);
LASSERT(list_empty(&lpni->lpni_txq));
LASSERT(lpni->lpni_txqnob == 0);
+ lpn = lpni->lpni_peer_net;
+ lpni->lpni_peer_net = NULL;
lpni->lpni_net = NULL;
/* remove the peer ni from the zombie list */
sizeof(*lpni->lpni_pref.nids) * lpni->lpni_pref_nnids);
}
LIBCFS_FREE(lpni, sizeof(*lpni));
+
+ lnet_peer_net_decref_locked(lpn);
}
struct lnet_peer_ni *
return found ? 0 : -ENOENT;
}
+/* ln_api_mutex is held, which keeps the peer list stable */
int lnet_get_peer_info(__u32 idx, lnet_nid_t *primary_nid, lnet_nid_t *nid,
bool *mr,
struct lnet_peer_ni_credit_info __user *peer_ni_info,
git://git.whamcloud.com / fs / lustre-release.git / commitdiff