LU-16548 lnet: report actual timeout used by lnd

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

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index b23b317..62d578a 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -592,19 +592,20 @@ kgnilnd_peer_notify(kgn_peer_t *peer, int error, int alive)
                up_read(&kgnilnd_data.kgn_net_rw_sem);
 
                for (i = 0; i < nnets; i++) {
-                       lnet_nid_t peer_nid;
+                       struct lnet_nid peer_nid;
 
                        net = nets[i];
 
-                       peer_nid = kgnilnd_lnd2lnetnid(
-                               lnet_nid_to_nid4(&net->gnn_ni->ni_nid),
-                               peer->gnp_nid);
+                       lnet_nid4_to_nid(kgnilnd_lnd2lnetnid(
+                                                lnet_nid_to_nid4(&net->gnn_ni->ni_nid),
+                                                peer->gnp_nid),
+                                        &peer_nid);
 
                        CDEBUG(D_NET, "peer 0x%p->%s last_alive %lld (%llds ago)\n",
                                peer, libcfs_nid2str(peer_nid), peer->gnp_last_alive,
                                ktime_get_seconds() - peer->gnp_last_alive);
 
-                       lnet_notify(net->gnn_ni, peer_nid, alive, true,
+                       lnet_notify(net->gnn_ni, &peer_nid, alive, true,
                                    peer->gnp_last_alive);
 
                        kgnilnd_net_decref(net);
@@ -2104,7 +2105,6 @@ kgnilnd_dev_fini(kgn_device_t *dev)
 
 int kgnilnd_base_startup(void)
 {
-       struct timespec64    ts;
        long long            pkmem = libcfs_kmem_read();
        int                  rc;
        int                  i;
@@ -2134,10 +2134,9 @@ int kgnilnd_base_startup(void)
         * initialised with seconds + microseconds at startup time.  So we
         * rely on NOT creating connections more frequently on average than
         * 1MHz to ensure we don't use old connstamps when we reboot. */
-       ktime_get_ts64(&ts);
        kgnilnd_data.kgn_connstamp =
                 kgnilnd_data.kgn_peerstamp =
-                       (ts.tv_sec * 1000000) + (ts.tv_nsec / 100);
+                       ktime_get_seconds();
 
        init_rwsem(&kgnilnd_data.kgn_net_rw_sem);
 
@@ -2270,7 +2269,7 @@ int kgnilnd_base_startup(void)
 
        kgnilnd_data.kgn_tx_phys_cache =
                kmem_cache_create("kgn_tx_phys",
-                                  LNET_MAX_IOV * sizeof(gni_mem_segment_t),
+                                  GNILND_MAX_IOV * sizeof(gni_mem_segment_t),
                                   0, 0, NULL);
        if (kgnilnd_data.kgn_tx_phys_cache == NULL) {
                CERROR("Can't create slab for kgn_tx_phys\n");
@@ -2296,7 +2295,7 @@ int kgnilnd_base_startup(void)
                kgnilnd_data.kgn_cksum_npages * sizeof (struct page *));
 
        for (i = 0; i < kgnilnd_data.kgn_cksum_npages; i++) {
-               kgnilnd_data.kgn_cksum_map_pages[i] = kmalloc(LNET_MAX_IOV * sizeof (struct page *),
+               kgnilnd_data.kgn_cksum_map_pages[i] = kmalloc(GNILND_MAX_IOV * sizeof (struct page *),
                                                              GFP_KERNEL);
                if (kgnilnd_data.kgn_cksum_map_pages[i] == NULL) {
                        CERROR("Can't allocate vmap cksum pages for cpu %d\n", i);
@@ -2610,11 +2609,13 @@ kgnilnd_startup(struct lnet_ni *ni)
        INIT_LIST_HEAD(&net->gnn_list);
        ni->ni_data = net;
        net->gnn_ni = ni;
-       if (!ni->ni_net->net_tunables_set) {
-               ni->ni_net->net_tunables.lct_max_tx_credits =
-                       *kgnilnd_tunables.kgn_credits;
-               ni->ni_net->net_tunables.lct_peer_tx_credits =
-                       *kgnilnd_tunables.kgn_peer_credits;
+
+       kgnilnd_tunables_setup(ni);
+
+       if (!ni->ni_interface) {
+               rc = lnet_ni_add_interface(ni, "ipogif0");
+               if (rc < 0)
+                       CWARN("gnilnd failed to allocate ni_interface\n");
        }
 
        if (*kgnilnd_tunables.kgn_peer_health) {