LU-10391 lnet: convert LNetGetID to return an large-addr pid

LNetGetID now returns a 'struct processid' containing an
large-address nid.

Various places still convert it to a 4-byte-addr nid for use.

Test-Parameters: trivial
Test-Parameters: serverversion=2.12 serverdistro=el7.9 testlist=runtests
Test-Parameters: clientversion=2.12 testlist=runtests
Signed-off-by: Mr NeilBrown <neilb@suse.de>
Change-Id: Id1dfcd33ad11609fc18fe6779dff39bc9f1ff03a
Reviewed-on: https://review.whamcloud.com/43607
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lnet/include/lnet/api.h b/lnet/include/lnet/api.h
index 4990f8a..89be9c6 100644 (file)
--- a/lnet/include/lnet/api.h
+++ b/lnet/include/lnet/api.h
@@ -74,7 +74,7 @@ int LNetNIFini(void);
  *
  * \see LNetMEAttach
  * @{ */
-int LNetGetId(unsigned int index, struct lnet_process_id *id);
+int LNetGetId(unsigned int index, struct lnet_processid *id);
 int LNetDist(lnet_nid_t nid, lnet_nid_t *srcnid, __u32 *order);
 lnet_nid_t LNetPrimaryNID(lnet_nid_t nid);
 bool LNetIsPeerLocal(lnet_nid_t nid);

diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c
index 204227b..1cd27eb 100644 (file)
--- a/lnet/lnet/api-ni.c
+++ b/lnet/lnet/api-ni.c
@@ -261,7 +261,7 @@ static void lnet_set_lnd_timeout(void)
  */
 static atomic_t lnet_dlc_seq_no = ATOMIC_INIT(0);
 
-static int lnet_ping(struct lnet_process_id id, lnet_nid_t src_nid,
+static int lnet_ping(struct lnet_process_id id, struct lnet_nid *src_nid,
                     signed long timeout, struct lnet_process_id __user *ids,
                     int n_ids);
 
@@ -3935,7 +3935,8 @@ LNetCtl(unsigned int cmd, void *arg)
 {
        struct libcfs_ioctl_data *data = arg;
        struct lnet_ioctl_config_data *config;
-       struct lnet_process_id    id = {0};
+       struct lnet_process_id    id4 = {};
+       struct lnet_processid     id = {};
        struct lnet_ni           *ni;
        struct lnet_nid           nid;
        int                       rc;
@@ -3946,7 +3947,7 @@ LNetCtl(unsigned int cmd, void *arg)
        switch (cmd) {
        case IOC_LIBCFS_GET_NI:
                rc = LNetGetId(data->ioc_count, &id);
-               data->ioc_nid = id.nid;
+               data->ioc_nid = lnet_nid_to_nid4(&id.nid);
                return rc;
 
        case IOC_LIBCFS_FAIL_NID:
@@ -4325,8 +4326,8 @@ LNetCtl(unsigned int cmd, void *arg)
        case IOC_LIBCFS_PING: {
                signed long timeout;
 
-               id.nid = data->ioc_nid;
-               id.pid = data->ioc_u32[0];
+               id4.nid = data->ioc_nid;
+               id4.pid = data->ioc_u32[0];
 
                /* If timeout is negative then set default of 3 minutes */
                if (((s32)data->ioc_u32[1] <= 0) ||
@@ -4335,7 +4336,7 @@ LNetCtl(unsigned int cmd, void *arg)
                else
                        timeout = nsecs_to_jiffies(data->ioc_u32[1] * NSEC_PER_MSEC);
 
-               rc = lnet_ping(id, LNET_NID_ANY, timeout, data->ioc_pbuf1,
+               rc = lnet_ping(id4, &LNET_ANY_NID, timeout, data->ioc_pbuf1,
                               data->ioc_plen1 / sizeof(struct lnet_process_id));
 
                if (rc < 0)
@@ -4347,9 +4348,9 @@ LNetCtl(unsigned int cmd, void *arg)
 
        case IOC_LIBCFS_PING_PEER: {
                struct lnet_ioctl_ping_data *ping = arg;
+               struct lnet_nid src_nid = LNET_ANY_NID;
                struct lnet_peer *lp;
                signed long timeout;
-               lnet_nid_t src_nid = LNET_NID_ANY;
 
                /* Check if the supplied ping data supports source nid
                 * NB: This check is sufficient if lnet_ioctl_ping_data has
@@ -4360,7 +4361,7 @@ LNetCtl(unsigned int cmd, void *arg)
                 * compatibility scheme.
                 */
                if (ping->ping_hdr.ioc_len >= sizeof(struct lnet_ioctl_ping_data))
-                       src_nid = ping->ping_src;
+                       lnet_nid4_to_nid(ping->ping_src, &src_nid);
 
                /* If timeout is negative then set default of 3 minutes */
                if (((s32)ping->op_param) <= 0 ||
@@ -4369,7 +4370,7 @@ LNetCtl(unsigned int cmd, void *arg)
                else
                        timeout = nsecs_to_jiffies(ping->op_param * NSEC_PER_MSEC);
 
-               rc = lnet_ping(ping->ping_id, src_nid, timeout,
+               rc = lnet_ping(ping->ping_id, &src_nid, timeout,
                               ping->ping_buf,
                               ping->ping_count);
                if (rc < 0)
@@ -4577,7 +4578,7 @@ EXPORT_SYMBOL(LNetIsPeerLocal);
  * \retval -ENOENT If no interface has been found.
  */
 int
-LNetGetId(unsigned int index, struct lnet_process_id *id)
+LNetGetId(unsigned int index, struct lnet_processid *id)
 {
        struct lnet_ni   *ni;
        struct lnet_net  *net;
@@ -4596,7 +4597,7 @@ LNetGetId(unsigned int index, struct lnet_process_id *id)
                        if (index-- != 0)
                                continue;
 
-                       id->nid = lnet_nid_to_nid4(&ni->ni_nid);
+                       id->nid = ni->ni_nid;
                        id->pid = the_lnet.ln_pid;
                        rc = 0;
                        break;
@@ -4635,7 +4636,7 @@ lnet_ping_event_handler(struct lnet_event *event)
                complete(&pd->completion);
 }
 
-static int lnet_ping(struct lnet_process_id id, lnet_nid_t src_nid,
+static int lnet_ping(struct lnet_process_id id, struct lnet_nid *src_nid,
                     signed long timeout, struct lnet_process_id __user *ids,
                     int n_ids)
 {
@@ -4683,7 +4684,7 @@ static int lnet_ping(struct lnet_process_id id, lnet_nid_t src_nid,
                goto fail_ping_buffer_decref;
        }
 
-       rc = LNetGet(src_nid, pd.mdh, id,
+       rc = LNetGet(lnet_nid_to_nid4(src_nid), pd.mdh, id,
                     LNET_RESERVED_PORTAL,
                     LNET_PROTO_PING_MATCHBITS, 0, false);
 

diff --git a/lnet/selftest/console.c b/lnet/selftest/console.c
index d2863b0..25de1f2 100644 (file)
--- a/lnet/selftest/console.c
+++ b/lnet/selftest/console.c
@@ -1693,12 +1693,12 @@ lstcon_session_match(struct lst_sid sid)
 static void
 lstcon_new_session_id(struct lst_sid *sid)
 {
-       struct lnet_process_id id;
+       struct lnet_processid id;
 
        LASSERT(console_session.ses_state == LST_SESSION_NONE);
 
        LNetGetId(1, &id);
-       sid->ses_nid = id.nid;
+       sid->ses_nid = lnet_nid_to_nid4(&id.nid);
        sid->ses_stamp = div_u64(ktime_get_ns(), NSEC_PER_MSEC);
 }
 

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index ccdcc8c..e11d023 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -3525,7 +3525,7 @@ void ll_compute_rootsquash_state(struct ll_sb_info *sbi)
        struct root_squash_info *squash = &sbi->ll_squash;
        int i;
        bool matched;
-       struct lnet_process_id id;
+       struct lnet_processid id;
 
        /* Update norootsquash flag */
        spin_lock(&squash->rsi_lock);
@@ -3537,9 +3537,10 @@ void ll_compute_rootsquash_state(struct ll_sb_info *sbi)
                matched = false;
                i = 0;
                while (LNetGetId(i++, &id) != -ENOENT) {
-                       if (id.nid == LNET_NID_LO_0)
+                       if (nid_is_lo0(&id.nid))
                                continue;
-                       if (cfs_match_nid(id.nid, &squash->rsi_nosquash_nids)) {
+                       if (cfs_match_nid(lnet_nid_to_nid4(&id.nid),
+                                         &squash->rsi_nosquash_nids)) {
                                matched = true;
                                break;
                        }

diff --git a/lustre/llite/super25.c b/lustre/llite/super25.c
index f75595a..c9deb45 100644 (file)
--- a/lustre/llite/super25.c
+++ b/lustre/llite/super25.c
@@ -212,7 +212,7 @@ MODULE_ALIAS_FS("lustre");
 
 static int __init lustre_init(void)
 {
-       struct lnet_process_id lnet_id;
+       struct lnet_processid lnet_id;
        int i, rc;
        unsigned long lustre_inode_cache_flags;
 

diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c
index e4b82bb..51adfa8 100644 (file)
--- a/lustre/lmv/lmv_obd.c
+++ b/lustre/lmv/lmv_obd.c
@@ -1094,7 +1094,7 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
 {
        struct lmv_obd *lmv = &obd->u.lmv;
        struct lmv_desc *desc;
-       struct lnet_process_id lnet_id;
+       struct lnet_processid lnet_id;
        int i = 0;
        int rc;
 
@@ -1128,8 +1128,8 @@ static int lmv_setup(struct obd_device *obd, struct lustre_cfg *lcfg)
         * can distribute subdirs evenly from the beginning.
         */
        while (LNetGetId(i++, &lnet_id) != -ENOENT) {
-               if (lnet_id.nid != LNET_NID_LO_0) {
-                       lmv->lmv_qos_rr_index = (u32)lnet_id.nid;
+               if (!nid_is_lo0(&lnet_id.nid)) {
+                       lmv->lmv_qos_rr_index = ntohl(lnet_id.nid.nid_addr[0]);
                        break;
                }
        }
@@ -1212,15 +1212,15 @@ static int lmv_select_statfs_mdt(struct lmv_obd *lmv, __u32 flags)
 
        /* choose initial MDT for this client */
        for (i = 0;; i++) {
-               struct lnet_process_id lnet_id;
+               struct lnet_processid lnet_id;
                if (LNetGetId(i, &lnet_id) == -ENOENT)
                        break;
 
-               if (lnet_id.nid != LNET_NID_LO_0) {
+               if (!nid_is_lo0(&lnet_id.nid)) {
                        /* We dont need a full 64-bit modulus, just enough
                         * to distribute the requests across MDTs evenly.
                         */
-                       lmv->lmv_statfs_start = (u32)lnet_id.nid %
+                       lmv->lmv_statfs_start = nidhash(&lnet_id.nid) %
                                                lmv->lmv_mdt_count;
                        break;
                }

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index ecfebc5..0699229 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -239,12 +239,12 @@ int lustre_start_mgc(struct super_block *sb)
                    (class_parse_nid(lsi->lsi_lmd->lmd_mgs, &nid, &ptr) == 0)) {
                        i++;
                } else if (IS_MGS(lsi)) {
-                       struct lnet_process_id id;
+                       struct lnet_processid id;
 
                        while ((rc = LNetGetId(i++, &id)) != -ENOENT) {
-                               if (id.nid == LNET_NID_LO_0)
+                               if (nid_is_lo0(&id.nid))
                                        continue;
-                               nid = id.nid;
+                               nid = lnet_nid_to_nid4(&id.nid);
                                i++;
                                break;
                        }
@@ -347,10 +347,11 @@ int lustre_start_mgc(struct super_block *sb)
                CDEBUG(D_MOUNT, "mgs NIDs %s.\n", ptr);
                if (IS_MGS(lsi)) {
                        /* Use local NIDs (including LO) */
-                       struct lnet_process_id id;
+                       struct lnet_processid id;
 
                        while ((rc = LNetGetId(i++, &id)) != -ENOENT) {
-                               rc = do_lcfg(mgcname, id.nid, LCFG_ADD_UUID,
+                               rc = do_lcfg(mgcname, lnet_nid_to_nid4(&id.nid),
+                                            LCFG_ADD_UUID,
                                             niduuid, NULL, NULL, NULL);
                        }
                } else {

diff --git a/lustre/obdclass/obd_mount_server.c b/lustre/obdclass/obd_mount_server.c
index cd4c721..a175ebe 100644 (file)
--- a/lustre/obdclass/obd_mount_server.c
+++ b/lustre/obdclass/obd_mount_server.c
@@ -1146,7 +1146,7 @@ int server_mti_print(const char *title, struct mgs_target_info *mti)
 static int server_lsi2mti(struct lustre_sb_info *lsi,
                          struct mgs_target_info *mti)
 {
-       struct lnet_process_id id;
+       struct lnet_processid id;
        int rc, i = 0;
        int cplen = 0;
        ENTRY;
@@ -1160,22 +1160,23 @@ static int server_lsi2mti(struct lustre_sb_info *lsi,
 
        mti->mti_nid_count = 0;
        while (LNetGetId(i++, &id) != -ENOENT) {
-               if (id.nid == LNET_NID_LO_0)
+               if (nid_is_lo0(&id.nid))
                        continue;
 
                /* server use --servicenode param, only allow specified
                 * nids be registered */
                if ((lsi->lsi_lmd->lmd_flags & LMD_FLG_NO_PRIMNODE) != 0 &&
                    class_match_nid(lsi->lsi_lmd->lmd_params,
-                                   PARAM_FAILNODE, id.nid) < 1)
+                                   PARAM_FAILNODE,
+                                   lnet_nid_to_nid4(&id.nid)) < 1)
                        continue;
 
                /* match specified network */
                if (!class_match_net(lsi->lsi_lmd->lmd_params,
-                                    PARAM_NETWORK, LNET_NIDNET(id.nid)))
+                                    PARAM_NETWORK, LNET_NID_NET(&id.nid)))
                        continue;
 
-               mti->mti_nids[mti->mti_nid_count] = id.nid;
+               mti->mti_nids[mti->mti_nid_count] = lnet_nid_to_nid4(&id.nid);
                mti->mti_nid_count++;
                if (mti->mti_nid_count >= MTI_NIDS_MAX) {
                        CWARN("Only using first %d nids for %s\n",

diff --git a/lustre/ptlrpc/nodemap_handler.c b/lustre/ptlrpc/nodemap_handler.c
index 7fe568e..c3a8103 100644 (file)
--- a/lustre/ptlrpc/nodemap_handler.c
+++ b/lustre/ptlrpc/nodemap_handler.c
@@ -264,16 +264,16 @@ struct lu_nodemap *nodemap_classify_nid(lnet_nid_t nid)
 
        /* don't use 0@lo, use the first non-lo local NID instead */
        if (nid == LNET_NID_LO_0) {
-               struct lnet_process_id id;
+               struct lnet_processid id;
                int i = 0;
 
                do {
                        rc = LNetGetId(i++, &id);
                        if (rc < 0)
                                RETURN(ERR_PTR(-EINVAL));
-               } while (id.nid == LNET_NID_LO_0);
+               } while (nid_is_lo0(&id.nid));
 
-               nid = id.nid;
+               nid = lnet_nid_to_nid4(&id.nid);
                CDEBUG(D_INFO, "found nid %s\n", libcfs_nid2str(nid));
        }