LU-10391 lnet: change LNetAddPeer() to take struct lnet_nid

Rather than an array of lnet_nid_t, LNetAddPeer now takes an array of
struct lnet_nid.

The array passed is *always* from struct uuid_nid_data, so that data
structure is changed to store struct lnet_nid.

Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: I0931c1dbbe50fcd7970bba6b68464eea14b1d25e
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/50085
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: jsimmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Reviewed-by: Frank Sehr <fsehr@whamcloud.com>
Reviewed-by: Chris Horn <chris.horn@hpe.com>

diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h
index ca04543..573e08d 100644 (file)
--- a/lnet/include/lnet/api.h
+++ b/lnet/include/lnet/api.h
@@ -163,7 +163,7 @@ int LNetClearLazyPortal(int portal);
 int LNetCtl(unsigned int cmd, void *arg);
 void LNetDebugPeer(struct lnet_processid *id);
 int LNetGetPeerDiscoveryStatus(void);
-int LNetAddPeer(lnet_nid_t *nids, __u32 num_nids);
+int LNetAddPeer(struct lnet_nid *nids, u32 num_nids);
 
 /** @} lnet_misc */
 

diff --git a/lnet/lnet/peer.c b/lnet/lnet/peer.c
index 86c9cc3..15c8b75 100644 (file)
--- a/lnet/lnet/peer.c
+++ b/lnet/lnet/peer.c
@@ -1350,7 +1350,7 @@ lnet_is_discovery_disabled(struct lnet_peer *lp)
 }
 
 int
-LNetAddPeer(lnet_nid_t *nids, __u32 num_nids)
+LNetAddPeer(struct lnet_nid *nids, u32 num_nids)
 {
        struct lnet_nid pnid = LNET_ANY_NID;
        bool mr;
@@ -1370,14 +1370,11 @@ LNetAddPeer(lnet_nid_t *nids, __u32 num_nids)
 
        rc = 0;
        for (i = 0; i < num_nids; i++) {
-               struct lnet_nid nid;
-
-               if (nids[i] == LNET_NID_LO_0)
+               if (nid_is_lo0(&nids[i]))
                        continue;
 
-               lnet_nid4_to_nid(nids[i], &nid);
                if (LNET_NID_IS_ANY(&pnid)) {
-                       lnet_nid4_to_nid(nids[i], &pnid);
+                       pnid = nids[i];
                        rc = lnet_add_peer_ni(&pnid, &LNET_ANY_NID, mr, flags);
                        if (rc == -EALREADY) {
                                struct lnet_peer *lp;
@@ -1393,11 +1390,11 @@ LNetAddPeer(lnet_nid_t *nids, __u32 num_nids)
                                lnet_peer_decref_locked(lp);
                        }
                } else if (lnet_peer_discovery_disabled) {
-                       lnet_nid4_to_nid(nids[i], &nid);
-                       rc = lnet_add_peer_ni(&nid, &LNET_ANY_NID, mr, flags);
+                       rc = lnet_add_peer_ni(&nids[i], &LNET_ANY_NID, mr,
+                                             flags);
                } else {
-                       lnet_nid4_to_nid(nids[i], &nid);
-                       rc = lnet_add_peer_ni(&pnid, &nid, mr, flags);
+                       rc = lnet_add_peer_ni(&pnid, &nids[i], mr,
+                                             flags);
                }
 
                if (rc && rc != -EEXIST)

diff --git a/lustre/obdclass/lustre_peer.c b/lustre/obdclass/lustre_peer.c
index 5cef033..19f30eb 100644 (file)
--- a/lustre/obdclass/lustre_peer.c
+++ b/lustre/obdclass/lustre_peer.c
@@ -43,7 +43,7 @@ struct uuid_nid_data {
        struct list_head        un_list;
        struct obd_uuid         un_uuid;
        int                     un_nid_count;
-       lnet_nid_t              un_nids[MTI_NIDS_MAX];
+       struct lnet_nid         un_nids[MTI_NIDS_MAX];
 };
 
 /* FIXME: This should probably become more elegant than a global linked list */
@@ -64,7 +64,7 @@ int lustre_uuid_to_peer(const char *uuid, struct lnet_nid *peer_nid, int index)
                                break;
 
                        rc = 0;
-                       lnet_nid4_to_nid(data->un_nids[index], peer_nid);
+                       *peer_nid = data->un_nids[index];
                        break;
                }
        }
@@ -75,13 +75,15 @@ EXPORT_SYMBOL(lustre_uuid_to_peer);
 
 /* Add a nid to a niduuid.  Multiple nids can be added to a single uuid;
    LNET will choose the best one. */
-int class_add_uuid(const char *uuid, __u64 nid)
+int class_add_uuid(const char *uuid, lnet_nid_t nid4)
 {
        struct uuid_nid_data *data, *entry;
+       struct lnet_nid nid;
        int found = 0;
        int rc;
 
-       LASSERT(nid != 0);  /* valid newconfig NID is never zero */
+       LASSERT(nid4 != 0);  /* valid newconfig NID is never zero */
+       lnet_nid4_to_nid(nid4, &nid);
 
        if (strlen(uuid) > UUID_MAX - 1)
                return -EOVERFLOW;
@@ -101,7 +103,7 @@ int class_add_uuid(const char *uuid, __u64 nid)
 
                        found = 1;
                        for (i = 0; i < entry->un_nid_count; i++)
-                               if (nid == entry->un_nids[i])
+                               if (nid_same(&nid, &entry->un_nids[i]))
                                        break;
 
                        if (i == entry->un_nid_count) {
@@ -117,16 +119,16 @@ int class_add_uuid(const char *uuid, __u64 nid)
 
        if (found) {
                CDEBUG(D_INFO, "found uuid %s %s cnt=%d\n", uuid,
-                      libcfs_nid2str(nid), entry->un_nid_count);
+                      libcfs_nidstr(&nid), entry->un_nid_count);
                rc = LNetAddPeer(entry->un_nids, entry->un_nid_count);
                CDEBUG(D_INFO, "Add peer %s rc = %d\n",
-                      libcfs_nid2str(data->un_nids[0]), rc);
+                      libcfs_nidstr(&data->un_nids[0]), rc);
                OBD_FREE(data, sizeof(*data));
        } else {
-               CDEBUG(D_INFO, "add uuid %s %s\n", uuid, libcfs_nid2str(nid));
+               CDEBUG(D_INFO, "add uuid %s %s\n", uuid, libcfs_nidstr(&nid));
                rc = LNetAddPeer(data->un_nids, data->un_nid_count);
                CDEBUG(D_INFO, "Add peer %s rc = %d\n",
-                      libcfs_nid2str(data->un_nids[0]), rc);
+                      libcfs_nidstr(&data->un_nids[0]), rc);
        }
 
        return 0;
@@ -165,7 +167,7 @@ int class_del_uuid(const char *uuid)
 
                CDEBUG(D_INFO, "del uuid %s %s/%d\n",
                       obd_uuid2str(&data->un_uuid),
-                      libcfs_nid2str(data->un_nids[0]),
+                      libcfs_nidstr(&data->un_nids[0]),
                       data->un_nid_count);
 
                OBD_FREE(data, sizeof(*data));
@@ -199,7 +201,7 @@ int class_add_nids_to_uuid(struct obd_uuid *uuid, lnet_nid_t *nids,
                matched = true;
                CDEBUG(D_NET, "Updating UUID '%s'\n", obd_uuid2str(uuid));
                for (i = 0; i < nid_count; i++)
-                       entry->un_nids[i] = nids[i];
+                       lnet_nid4_to_nid(nids[i], &entry->un_nids[i]);
                entry->un_nid_count = nid_count;
                break;
        }
@@ -207,7 +209,7 @@ int class_add_nids_to_uuid(struct obd_uuid *uuid, lnet_nid_t *nids,
        if (matched) {
                rc = LNetAddPeer(entry->un_nids, entry->un_nid_count);
                CDEBUG(D_INFO, "Add peer %s rc = %d\n",
-                      libcfs_nid2str(entry->un_nids[0]), rc);
+                      libcfs_nidstr(&entry->un_nids[0]), rc);
        }
 
        RETURN(0);
@@ -215,26 +217,28 @@ int class_add_nids_to_uuid(struct obd_uuid *uuid, lnet_nid_t *nids,
 EXPORT_SYMBOL(class_add_nids_to_uuid);
 
 /* check if @nid exists in nid list of @uuid */
-int class_check_uuid(struct obd_uuid *uuid, __u64 nid)
+int class_check_uuid(struct obd_uuid *uuid, lnet_nid_t nid4)
 {
        struct uuid_nid_data *entry;
+       struct lnet_nid nid;
        int found = 0;
 
        ENTRY;
 
+       lnet_nid4_to_nid(nid4, &nid);
        CDEBUG(D_INFO, "check if uuid %s has %s.\n",
-              obd_uuid2str(uuid), libcfs_nid2str(nid));
+              obd_uuid2str(uuid), libcfs_nidstr(&nid));
 
        spin_lock(&g_uuid_lock);
        list_for_each_entry(entry, &g_uuid_list, un_list) {
                int i;
 
                if (!obd_uuid_equals(&entry->un_uuid, uuid))
-                        continue;
+                       continue;
 
                /* found the uuid, check if it has @nid */
                for (i = 0; i < entry->un_nid_count; i++) {
-                       if (entry->un_nids[i] == nid) {
+                       if (nid_same(&entry->un_nids[i], &nid)) {
                                found = 1;
                                break;
                        }