LU-10391 socklnd: factor out key calculation for ksnd_peers

[fs/lustre-release.git] / lnet / klnds / socklnd / socklnd.c

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index ec7e069..ad93203 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -221,9 +221,10 @@ struct ksock_peer_ni *
 ksocknal_find_peer_locked(struct lnet_ni *ni, struct lnet_process_id id)
 {
        struct ksock_peer_ni *peer_ni;
+       unsigned long hash = nidhash(id.nid);
 
        hash_for_each_possible(ksocknal_data.ksnd_peers, peer_ni,
-                              ksnp_list, id.nid) {
+                              ksnp_list, hash) {
                LASSERT(!peer_ni->ksnp_closing);
 
                if (peer_ni->ksnp_ni != ni)
@@ -598,7 +599,8 @@ ksocknal_add_peer(struct lnet_ni *ni, struct lnet_process_id id,
                peer_ni = peer2;
        } else {
                /* peer_ni table takes my ref on peer_ni */
-               hash_add(ksocknal_data.ksnd_peers, &peer_ni->ksnp_list, id.nid);
+               hash_add(ksocknal_data.ksnd_peers, &peer_ni->ksnp_list,
+                        nidhash(id.nid));
        }
 
        ksocknal_add_conn_cb_locked(peer_ni, conn_cb);
@@ -652,7 +654,8 @@ ksocknal_del_peer(struct lnet_ni *ni, struct lnet_process_id id, __u32 ip)
        write_lock_bh(&ksocknal_data.ksnd_global_lock);
 
        if (id.nid != LNET_NID_ANY) {
-               lo = hash_min(id.nid, HASH_BITS(ksocknal_data.ksnd_peers));
+               lo = hash_min(nidhash(id.nid),
+                             HASH_BITS(ksocknal_data.ksnd_peers));
                hi = lo;
        } else {
                lo = 0;
@@ -924,7 +927,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_conn_cb *conn_cb,
                        /* NB this puts an "empty" peer_ni in the peer_ni
                         * table (which takes my ref) */
                        hash_add(ksocknal_data.ksnd_peers,
-                                &peer_ni->ksnp_list, peerid.nid);
+                                &peer_ni->ksnp_list, nidhash(peerid.nid));
                } else {
                        ksocknal_peer_decref(peer_ni);
                        peer_ni = peer2;
@@ -937,7 +940,7 @@ ksocknal_create_conn(struct lnet_ni *ni, struct ksock_conn_cb *conn_cb,
                /* Am I already connecting to this guy?  Resolve in
                 * favour of higher NID...
                 */
-               if (peerid.nid < ni->ni_nid &&
+               if (peerid.nid < lnet_nid_to_nid4(&ni->ni_nid) &&
                    ksocknal_connecting(peer_ni->ksnp_conn_cb,
                                        ((struct sockaddr *) &conn->ksnc_peeraddr))) {
                        rc = EALREADY;
@@ -1544,7 +1547,8 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr)
        write_lock_bh(&ksocknal_data.ksnd_global_lock);
 
        if (id.nid != LNET_NID_ANY) {
-               lo = hash_min(id.nid, HASH_BITS(ksocknal_data.ksnd_peers));
+               lo = hash_min(nidhash(id.nid),
+                             HASH_BITS(ksocknal_data.ksnd_peers));
                hi = lo;
        } else {
                lo = 0;
@@ -1638,7 +1642,8 @@ ksocknal_push(struct lnet_ni *ni, struct lnet_process_id id)
        int rc = -ENOENT;
 
        if (id.nid != LNET_NID_ANY) {
-               lo = hash_min(id.nid, HASH_BITS(ksocknal_data.ksnd_peers));
+               lo = hash_min(nidhash(id.nid),
+                             HASH_BITS(ksocknal_data.ksnd_peers));
                hi = lo;
        } else {
                lo = 0;
@@ -1793,15 +1798,16 @@ ksocknal_ctl(struct lnet_ni *ni, unsigned int cmd, void *arg)
                 return ksocknal_close_matching_conns (id,
                                                       data->ioc_u32[0]);
 
-        case IOC_LIBCFS_REGISTER_MYNID:
-                /* Ignore if this is a noop */
-                if (data->ioc_nid == ni->ni_nid)
-                        return 0;
+       case IOC_LIBCFS_REGISTER_MYNID:
+               /* Ignore if this is a noop */
+               if (nid_is_nid4(&ni->ni_nid) &&
+                   data->ioc_nid == lnet_nid_to_nid4(&ni->ni_nid))
+                       return 0;
 
-                CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID: %s(%s)\n",
-                       libcfs_nid2str(data->ioc_nid),
-                       libcfs_nid2str(ni->ni_nid));
-                return -EINVAL;
+               CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID: %s(%s)\n",
+                      libcfs_nid2str(data->ioc_nid),
+                      libcfs_nidstr(&ni->ni_nid));
+               return -EINVAL;
 
         case IOC_LIBCFS_PUSH_CONNECTION:
                 id.nid = data->ioc_nid;
@@ -2348,10 +2354,8 @@ ksocknal_startup(struct lnet_ni *ni)
 
        LASSERT(ksi);
        LASSERT(ksi->ksni_addr.ss_family == AF_INET);
-       ni->ni_nid = LNET_MKNID(
-               LNET_NIDNET(ni->ni_nid),
-               ntohl(((struct sockaddr_in *)
-                      &ksi->ksni_addr)->sin_addr.s_addr));
+       ni->ni_nid.nid_addr[0] =
+               ((struct sockaddr_in *)&ksi->ksni_addr)->sin_addr.s_addr;
        list_add(&net->ksnn_list, &ksocknal_data.ksnd_nets);
        net->ksnn_ni = ni;
        ksocknal_data.ksnd_nnets++;