LU-13806 lnet: Ensure proper peer, peer NI, peer net hierarchy

[fs/lustre-release.git] / lnet / lnet / peer.c

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index 04765cf..20ae558 100644 (file)
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lnet/lnet/peer.c
  */
@@ -169,7 +168,7 @@ lnet_peer_ni_alloc(lnet_nid_t nid)
        INIT_LIST_HEAD(&lpni->lpni_on_remote_peer_ni_list);
        INIT_LIST_HEAD(&lpni->lpni_rtr_pref_nids);
        LNetInvalidateMDHandle(&lpni->lpni_recovery_ping_mdh);
-       atomic_set(&lpni->lpni_refcount, 1);
+       kref_init(&lpni->lpni_kref);
        lpni->lpni_sel_priority = LNET_MAX_SELECTION_PRIORITY;
 
        spin_lock_init(&lpni->lpni_lock);
@@ -1439,7 +1438,10 @@ lnet_peer_attach_peer_ni(struct lnet_peer *lp,
 
        /* Add peer_ni to peer_net */
        lpni->lpni_peer_net = lpn;
-       list_add_tail(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
+       if (lp->lp_primary_nid == lpni->lpni_nid)
+               list_add(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
+       else
+               list_add_tail(&lpni->lpni_peer_nis, &lpn->lpn_peer_nis);
        lnet_update_peer_net_healthv(lpni);
        lnet_peer_net_addref_locked(lpn);
 
@@ -1447,7 +1449,10 @@ lnet_peer_attach_peer_ni(struct lnet_peer *lp,
        if (!lpn->lpn_peer) {
                new_lpn = true;
                lpn->lpn_peer = lp;
-               list_add_tail(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+               if (lp->lp_primary_nid == lpni->lpni_nid)
+                       list_add(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+               else
+                       list_add_tail(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
                lnet_peer_addref_locked(lp);
        }
 
@@ -1688,10 +1693,14 @@ lnet_peer_set_primary_nid(struct lnet_peer *lp, lnet_nid_t nid, unsigned flags)
 
        if (lp->lp_primary_nid == nid)
                goto out;
+
+       lp->lp_primary_nid = nid;
+
        rc = lnet_peer_add_nid(lp, nid, flags);
-       if (rc)
+       if (rc) {
+               lp->lp_primary_nid = old;
                goto out;
-       lp->lp_primary_nid = nid;
+       }
 out:
        CDEBUG(D_NET, "peer %s NID %s: %d\n",
               libcfs_nid2str(old), libcfs_nid2str(nid), rc);
@@ -1873,14 +1882,16 @@ lnet_del_peer_ni(lnet_nid_t prim_nid, lnet_nid_t nid)
 }
 
 void
-lnet_destroy_peer_ni_locked(struct lnet_peer_ni *lpni)
+lnet_destroy_peer_ni_locked(struct kref *ref)
 {
+       struct lnet_peer_ni *lpni = container_of(ref, struct lnet_peer_ni,
+                                                lpni_kref);
        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(kref_read(&lpni->lpni_kref) == 0);
        LASSERT(list_empty(&lpni->lpni_txq));
        LASSERT(lpni->lpni_txqnob == 0);
        LASSERT(list_empty(&lpni->lpni_peer_nis));
@@ -2138,7 +2149,7 @@ static void lnet_peer_discovery_complete(struct lnet_peer *lp)
        spin_lock(&lp->lp_lock);
        list_splice_init(&lp->lp_dc_pendq, &pending_msgs);
        spin_unlock(&lp->lp_lock);
-       wake_up_all(&lp->lp_dc_waitq);
+       wake_up(&lp->lp_dc_waitq);
 
        if (lp->lp_rtr_refcount > 0)
                lnet_router_discovery_complete(lp);
@@ -2791,6 +2802,7 @@ static void lnet_discovery_event_handler(struct lnet_event *event)
 static int lnet_peer_merge_data(struct lnet_peer *lp,
                                struct lnet_ping_buffer *pbuf)
 {
+       struct lnet_peer_net *lpn;
        struct lnet_peer_ni *lpni;
        lnet_nid_t *curnis = NULL;
        struct lnet_ni_status *addnis = NULL;
@@ -2919,6 +2931,28 @@ static int lnet_peer_merge_data(struct lnet_peer *lp,
                                goto out;
                }
        }
+
+       /* The peer net for the primary NID should be the first entry in the
+        * peer's lp_peer_nets list, and the peer NI for the primary NID should
+        * be the first entry in its peer net's lpn_peer_nis list.
+        */
+       lpni = lnet_find_peer_ni_locked(pbuf->pb_info.pi_ni[1].ns_nid);
+       if (!lpni) {
+               CERROR("Internal error: Failed to lookup peer NI for primary NID: %s\n",
+                      libcfs_nid2str(pbuf->pb_info.pi_ni[1].ns_nid));
+               goto out;
+       }
+
+       lnet_peer_ni_decref_locked(lpni);
+
+       lpn = lpni->lpni_peer_net;
+       if (lpn->lpn_peer_nets.prev != &lp->lp_peer_nets)
+               list_move(&lpn->lpn_peer_nets, &lp->lp_peer_nets);
+
+       if (lpni->lpni_peer_nis.prev != &lpni->lpni_peer_net->lpn_peer_nis)
+               list_move(&lpni->lpni_peer_nis,
+                         &lpni->lpni_peer_net->lpn_peer_nis);
+
        /*
         * Errors other than -ENOMEM are due to peers having been
         * configured with DLC. Ignore these because DLC overrides
@@ -3803,7 +3837,7 @@ lnet_debug_peer(lnet_nid_t nid)
                aliveness = (lnet_is_peer_ni_alive(lp)) ? "up" : "down";
 
        CDEBUG(D_WARNING, "%-24s %4d %5s %5d %5d %5d %5d %5d %ld\n",
-              libcfs_nid2str(lp->lpni_nid), atomic_read(&lp->lpni_refcount),
+              libcfs_nid2str(lp->lpni_nid), kref_read(&lp->lpni_kref),
               aliveness, lp->lpni_net->net_tunables.lct_peer_tx_credits,
               lp->lpni_rtrcredits, lp->lpni_minrtrcredits,
               lp->lpni_txcredits, lp->lpni_mintxcredits, lp->lpni_txqnob);
@@ -3859,7 +3893,7 @@ int lnet_get_peer_ni_info(__u32 peer_index, __u64 *nid,
                                         lnet_is_peer_ni_alive(lp) ? "up" : "down");
 
                        *nid = lp->lpni_nid;
-                       *refcount = atomic_read(&lp->lpni_refcount);
+                       *refcount = kref_read(&lp->lpni_kref);
                        *ni_peer_tx_credits =
                                lp->lpni_net->net_tunables.lct_peer_tx_credits;
                        *peer_tx_credits = lp->lpni_txcredits;
@@ -3945,7 +3979,7 @@ int lnet_get_peer_info(struct lnet_ioctl_peer_cfg *cfg, void __user *bulk)
                        snprintf(lpni_info->cr_aliveness, LNET_MAX_STR_LEN,
                                lnet_is_peer_ni_alive(lpni) ? "up" : "down");
 
-               lpni_info->cr_refcount = atomic_read(&lpni->lpni_refcount);
+               lpni_info->cr_refcount = kref_read(&lpni->lpni_kref);
                lpni_info->cr_ni_peer_tx_credits = (lpni->lpni_net != NULL) ?
                        lpni->lpni_net->net_tunables.lct_peer_tx_credits : 0;
                lpni_info->cr_peer_tx_credits = lpni->lpni_txcredits;