LU-6245 libcfs: remove sysctl module handling

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

diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c
index 7e67339..1fa2bbc 100644 (file)
--- a/lnet/klnds/gnilnd/gnilnd.c
+++ b/lnet/klnds/gnilnd/gnilnd.c
@@ -248,7 +248,8 @@ kgnilnd_create_conn(kgn_conn_t **connp, kgn_device_t *dev)
                return -ENOMEM;
        }
 
-       LIBCFS_ALLOC(conn->gnc_tx_ref_table, GNILND_MAX_MSG_ID * sizeof(void *));
+       conn->gnc_tx_ref_table =
+               kgnilnd_vzalloc(GNILND_MAX_MSG_ID * sizeof(void *));
        if (conn->gnc_tx_ref_table == NULL) {
                CERROR("Can't allocate conn tx_ref_table\n");
                GOTO(failed, rc = -ENOMEM);
@@ -670,6 +671,10 @@ kgnilnd_close_conn_locked(kgn_conn_t *conn, int error)
                conn->gnc_state = GNILND_CONN_CLOSING;
        }
 
+       if (CFS_FAIL_CHECK(CFS_FAIL_GNI_RDMA_CQ_ERROR)) {
+               msleep_interruptible(MSEC_PER_SEC);
+       }
+
        /* leave on peer->gnp_conns to make sure we don't let the reaper
         * or others try to unlink this peer until the conn is fully
         * processed for closing */
@@ -1789,7 +1794,8 @@ kgnilnd_report_node_state(lnet_nid_t nid, int down)
                 */
                kgnilnd_txlist_done(&zombies, -ENETRESET);
                kgnilnd_peer_notify(peer, -ECONNRESET, 0);
-               LCONSOLE_INFO("Recieved down event for nid %lld\n", nid);
+               LCONSOLE_INFO("Received down event for nid %d\n",
+                             LNET_NIDADDR(nid));
        }
 
        return 0;
@@ -2093,6 +2099,11 @@ kgnilnd_dev_init(kgn_device_t *dev)
                GOTO(failed, rc = -EINVAL);
        }
 
+       rrc = kgnilnd_register_smdd_buf(dev);
+       if (rrc != GNI_RC_SUCCESS) {
+               GOTO(failed, rc = -EINVAL);
+       }
+
        RETURN(0);
 
 failed:
@@ -2143,6 +2154,13 @@ kgnilnd_dev_fini(kgn_device_t *dev)
                atomic_read(&kgnilnd_data.kgn_nthreads) == 0,
                "tried to shutdown with threads active\n");
 
+       if (dev->gnd_smdd_hold_buf) {
+               rrc = kgnilnd_deregister_smdd_buf(dev);
+               LASSERTF(rrc == GNI_RC_SUCCESS,
+                       "bad rc from deregistion of sMDD buffer: %d\n", rrc);
+               dev->gnd_smdd_hold_buf = NULL;
+       }
+
        if (dev->gnd_rcv_fma_cqh) {
                rrc = kgnilnd_cq_destroy(dev->gnd_rcv_fma_cqh);
                LASSERTF(rrc == GNI_RC_SUCCESS,
@@ -2860,17 +2878,14 @@ out:
        EXIT;
 }
 
-void __exit
-kgnilnd_module_fini(void)
+static void __exit kgnilnd_exit(void)
 {
        lnet_unregister_lnd(&the_kgnilnd);
        kgnilnd_proc_fini();
        kgnilnd_remove_sysctl();
-       kgnilnd_tunables_fini();
 }
 
-int __init
-kgnilnd_module_init(void)
+static int __init kgnilnd_init(void)
 {
        int    rc;
 
@@ -2889,8 +2904,9 @@ kgnilnd_module_init(void)
 }
 
 MODULE_AUTHOR("Cray, Inc. <nic@cray.com>");
-MODULE_DESCRIPTION("Kernel Gemini LND v"KGNILND_BUILD_REV);
+MODULE_DESCRIPTION("Gemini LNet Network Driver");
+MODULE_VERSION(KGNILND_BUILD_REV);
 MODULE_LICENSE("GPL");
 
-module_init(kgnilnd_module_init);
-module_exit(kgnilnd_module_fini);
+module_init(kgnilnd_init);
+module_exit(kgnilnd_exit);