b=10849

-   add module reference count to gmlnd.

diff --git a/lnet/klnds/gmlnd/gmlnd_api.c b/lnet/klnds/gmlnd/gmlnd_api.c
index 6bb2b28..e316309 100644 (file)
--- a/lnet/klnds/gmlnd/gmlnd_api.c
+++ b/lnet/klnds/gmlnd/gmlnd_api.c
@@ -41,47 +41,47 @@ gmnal_ni_t *the_gmni = NULL;
 int
 gmnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg)
 {
 int
 gmnal_ctl(lnet_ni_t *ni, unsigned int cmd, void *arg)
 {

-       struct libcfs_ioctl_data *data = arg;
-
-       switch (cmd) {
-       case IOC_LIBCFS_REGISTER_MYNID:
-               if (data->ioc_nid == ni->ni_nid)
-                       return 0;
-               
-               LASSERT (LNET_NIDNET(data->ioc_nid) == LNET_NIDNET(ni->ni_nid));
-
-               CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID for %s(%s)\n",
-                      libcfs_nid2str(data->ioc_nid),
-                      libcfs_nid2str(ni->ni_nid));
-               return 0;
-               
-       default:
-               return (-EINVAL);
-       }
+        struct libcfs_ioctl_data *data = arg;
+
+        switch (cmd) {
+        case IOC_LIBCFS_REGISTER_MYNID:
+                if (data->ioc_nid == ni->ni_nid)
+                        return 0;
+
+                LASSERT (LNET_NIDNET(data->ioc_nid) == LNET_NIDNET(ni->ni_nid));
+
+                CERROR("obsolete IOC_LIBCFS_REGISTER_MYNID for %s(%s)\n",
+                       libcfs_nid2str(data->ioc_nid),
+                       libcfs_nid2str(ni->ni_nid));
+                return 0;
+
+        default:
+                return (-EINVAL);
+        }

 }
 
 int
 gmnal_set_local_nid (gmnal_ni_t *gmni)
 {
         lnet_ni_t       *ni = gmni->gmni_ni;
 }
 
 int
 gmnal_set_local_nid (gmnal_ni_t *gmni)
 {
         lnet_ni_t       *ni = gmni->gmni_ni;

-       __u32            local_gmid;
+        __u32            local_gmid;

         __u32            global_gmid;
         gm_status_t      gm_status;
 
         /* Called before anything initialised: no need to lock */
         __u32            global_gmid;
         gm_status_t      gm_status;
 
         /* Called before anything initialised: no need to lock */

-       gm_status = gm_get_node_id(gmni->gmni_port, &local_gmid);
-       if (gm_status != GM_SUCCESS)
-               return 0;
+        gm_status = gm_get_node_id(gmni->gmni_port, &local_gmid);
+        if (gm_status != GM_SUCCESS)
+                return 0;

 
 

-       CDEBUG(D_NET, "Local node id is [%u]\n", local_gmid);
-        
-       gm_status = gm_node_id_to_global_id(gmni->gmni_port, 
+        CDEBUG(D_NET, "Local node id is [%u]\n", local_gmid);
+
+        gm_status = gm_node_id_to_global_id(gmni->gmni_port, 

                                             local_gmid, 
                                             local_gmid, 

-                                           &global_gmid);
-       if (gm_status != GM_SUCCESS)
-               return 0;
-        
-       CDEBUG(D_NET, "Global node id is [%u]\n", global_gmid);
+                                            &global_gmid);
+        if (gm_status != GM_SUCCESS)
+                return 0;
+
+        CDEBUG(D_NET, "Global node id is [%u]\n", global_gmid);

 
         ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), global_gmid);
         return 1;
 
         ni->ni_nid = LNET_MKNID(LNET_NIDNET(ni->ni_nid), global_gmid);
         return 1;


@@ -90,9 +90,9 @@ gmnal_set_local_nid (gmnal_ni_t *gmni)
 void
 gmnal_shutdown(lnet_ni_t *ni)
 {
 void
 gmnal_shutdown(lnet_ni_t *ni)
 {

-       gmnal_ni_t      *gmni = ni->ni_data;
+        gmnal_ni_t *gmni = ni->ni_data;

 
 

-       CDEBUG(D_TRACE, "gmnal_api_shutdown: gmni [%p]\n", gmni);
+        CDEBUG(D_TRACE, "gmnal_api_shutdown: gmni [%p]\n", gmni);

 
         LASSERT (gmni == the_gmni);
 
 
         LASSERT (gmni == the_gmni);
 


@@ -100,69 +100,71 @@ gmnal_shutdown(lnet_ni_t *ni)
         gmnal_stop_threads(gmni);
 
         /* stop all network callbacks */
         gmnal_stop_threads(gmni);
 
         /* stop all network callbacks */

-       gm_close(gmni->gmni_port);
+        gm_close(gmni->gmni_port);

         gmni->gmni_port = NULL;
 
         gmni->gmni_port = NULL;
 

-       gm_finalize();
+        gm_finalize();

 
         gmnal_free_ltxbufs(gmni);
 
         gmnal_free_ltxbufs(gmni);

-       gmnal_free_txs(gmni);
-       gmnal_free_rxs(gmni);
+        gmnal_free_txs(gmni);
+        gmnal_free_rxs(gmni);

 
 

-       LIBCFS_FREE(gmni, sizeof(*gmni));
+        LIBCFS_FREE(gmni, sizeof(*gmni));

 
         the_gmni = NULL;
 
         the_gmni = NULL;

+        PORTAL_MODULE_UNUSE;

 }
 
 int
 gmnal_startup(lnet_ni_t *ni)
 {
 }
 
 int
 gmnal_startup(lnet_ni_t *ni)
 {

-       gmnal_ni_t      *gmni = NULL;
-       gmnal_rx_t      *rx = NULL;
-       gm_status_t      gm_status;
-        int              rc;
+        gmnal_ni_t  *gmni = NULL;
+        gmnal_rx_t  *rx = NULL;
+        gm_status_t  gm_status;
+        int          rc;

 
         LASSERT (ni->ni_lnd == &the_gmlnd);
 
         ni->ni_maxtxcredits = *gmnal_tunables.gm_credits;
         ni->ni_peertxcredits = *gmnal_tunables.gm_peer_credits;
 
         LASSERT (ni->ni_lnd == &the_gmlnd);
 
         ni->ni_maxtxcredits = *gmnal_tunables.gm_credits;
         ni->ni_peertxcredits = *gmnal_tunables.gm_peer_credits;

-        
+

         if (the_gmni != NULL) {
                 CERROR("Only 1 instance supported\n");
                 return -EINVAL;
         }
 
         if (the_gmni != NULL) {
                 CERROR("Only 1 instance supported\n");
                 return -EINVAL;
         }
 

-       LIBCFS_ALLOC(gmni, sizeof(*gmni));
-       if (gmni == NULL) {
-               CERROR("can't allocate gmni\n");
+        LIBCFS_ALLOC(gmni, sizeof(*gmni));
+        if (gmni == NULL) {
+                CERROR("can't allocate gmni\n");

                 return -ENOMEM;
         }
 
         ni->ni_data = gmni;
 
                 return -ENOMEM;
         }
 
         ni->ni_data = gmni;
 

-       memset(gmni, 0, sizeof(*gmni));
-       gmni->gmni_ni = ni;
+        memset(gmni, 0, sizeof(*gmni));
+        gmni->gmni_ni = ni;

         spin_lock_init(&gmni->gmni_tx_lock);
         spin_lock_init(&gmni->gmni_tx_lock);

-       spin_lock_init(&gmni->gmni_gm_lock);
+        spin_lock_init(&gmni->gmni_gm_lock);

         INIT_LIST_HEAD(&gmni->gmni_idle_txs);
         INIT_LIST_HEAD(&gmni->gmni_idle_ltxbs);
         INIT_LIST_HEAD(&gmni->gmni_buf_txq);
         INIT_LIST_HEAD(&gmni->gmni_cred_txq);
         sema_init(&gmni->gmni_rx_mutex, 1);
         INIT_LIST_HEAD(&gmni->gmni_idle_txs);
         INIT_LIST_HEAD(&gmni->gmni_idle_ltxbs);
         INIT_LIST_HEAD(&gmni->gmni_buf_txq);
         INIT_LIST_HEAD(&gmni->gmni_cred_txq);
         sema_init(&gmni->gmni_rx_mutex, 1);

-        
-       /*
-        *      initialise the interface,
-        */
-       CDEBUG(D_NET, "Calling gm_init\n");
-       if (gm_init() != GM_SUCCESS) {
-               CERROR("call to gm_init failed\n");
+        PORTAL_MODULE_USE;
+
+        /*
+         * initialise the interface,
+         */
+        CDEBUG(D_NET, "Calling gm_init\n");
+        if (gm_init() != GM_SUCCESS) {
+                CERROR("call to gm_init failed\n");

                 goto failed_0;
                 goto failed_0;

-       }
+        }

 
 

-       CDEBUG(D_NET, "Calling gm_open with port [%d], version [%d]\n",
+        CDEBUG(D_NET, "Calling gm_open with port [%d], version [%d]\n",

                *gmnal_tunables.gm_port, GM_API_VERSION);
 
                *gmnal_tunables.gm_port, GM_API_VERSION);
 

-       gm_status = gm_open(&gmni->gmni_port, 0, *gmnal_tunables.gm_port, 
+        gm_status = gm_open(&gmni->gmni_port, 0, *gmnal_tunables.gm_port, 

                             "gmnal", GM_API_VERSION);
 
         if (gm_status != GM_SUCCESS) {
                             "gmnal", GM_API_VERSION);
 
         if (gm_status != GM_SUCCESS) {


@@ -170,14 +172,14 @@ gmnal_startup(lnet_ni_t *ni)
                        *gmnal_tunables.gm_port, gm_status, 
                        gmnal_gmstatus2str(gm_status));
                 goto failed_1;
                        *gmnal_tunables.gm_port, gm_status, 
                        gmnal_gmstatus2str(gm_status));
                 goto failed_1;

-       }
+        }

 
         CDEBUG(D_NET,"gm_open succeeded port[%p]\n",gmni->gmni_port);
 
         if (!gmnal_set_local_nid(gmni))
                 goto failed_2;
 
 
         CDEBUG(D_NET,"gm_open succeeded port[%p]\n",gmni->gmni_port);
 
         if (!gmnal_set_local_nid(gmni))
                 goto failed_2;
 

-       CDEBUG(D_NET, "portals_nid is %s\n", libcfs_nid2str(ni->ni_nid));
+        CDEBUG(D_NET, "portals_nid is %s\n", libcfs_nid2str(ni->ni_nid));

 
         gmni->gmni_large_msgsize = 
                 offsetof(gmnal_msg_t, gmm_u.immediate.gmim_payload[LNET_MAX_PAYLOAD]);
 
         gmni->gmni_large_msgsize = 
                 offsetof(gmnal_msg_t, gmm_u.immediate.gmim_payload[LNET_MAX_PAYLOAD]);


@@ -185,7 +187,7 @@ gmnal_startup(lnet_ni_t *ni)
                 gm_min_size_for_length(gmni->gmni_large_msgsize);
         gmni->gmni_large_pages =
                 (gmni->gmni_large_msgsize + PAGE_SIZE - 1)/PAGE_SIZE;
                 gm_min_size_for_length(gmni->gmni_large_msgsize);
         gmni->gmni_large_pages =
                 (gmni->gmni_large_msgsize + PAGE_SIZE - 1)/PAGE_SIZE;

-        
+

         gmni->gmni_small_msgsize = MIN(GM_MTU, PAGE_SIZE);
         gmni->gmni_small_gmsize = 
                 gm_min_size_for_length(gmni->gmni_small_msgsize);
         gmni->gmni_small_msgsize = MIN(GM_MTU, PAGE_SIZE);
         gmni->gmni_small_gmsize = 
                 gm_min_size_for_length(gmni->gmni_small_msgsize);


@@ -197,22 +199,22 @@ gmnal_startup(lnet_ni_t *ni)
                gmni->gmni_large_msgsize, gmni->gmni_small_msgsize,
                gmni->gmni_large_gmsize, gmni->gmni_small_gmsize);
 
                gmni->gmni_large_msgsize, gmni->gmni_small_msgsize,
                gmni->gmni_large_gmsize, gmni->gmni_small_gmsize);
 

-       if (gmnal_alloc_rxs(gmni) != 0) {
-               CERROR("Failed to allocate rx descriptors\n");
+        if (gmnal_alloc_rxs(gmni) != 0) {
+                CERROR("Failed to allocate rx descriptors\n");

                 goto failed_2;
                 goto failed_2;

-       }
+        }

 
 

-       if (gmnal_alloc_txs(gmni) != 0) {
-               CERROR("Failed to allocate tx descriptors\n");
+        if (gmnal_alloc_txs(gmni) != 0) {
+                CERROR("Failed to allocate tx descriptors\n");

                 goto failed_2;
                 goto failed_2;

-       }
+        }

 
         if (gmnal_alloc_ltxbufs(gmni) != 0) {
                 CERROR("Failed to allocate large tx buffers\n");
                 goto failed_2;
         }
 
 
         if (gmnal_alloc_ltxbufs(gmni) != 0) {
                 CERROR("Failed to allocate large tx buffers\n");
                 goto failed_2;
         }
 

-       rc = gmnal_start_threads(gmni);
+        rc = gmnal_start_threads(gmni);

         if (rc != 0) {
                 CERROR("Can't start threads: %d\n", rc);
                 goto failed_2;
         if (rc != 0) {
                 CERROR("Can't start threads: %d\n", rc);
                 goto failed_2;


@@ -224,8 +226,8 @@ gmnal_startup(lnet_ni_t *ni)
 
         the_gmni = gmni;
 
 
         the_gmni = gmni;
 

-       CDEBUG(D_NET, "gmnal_init finished\n");
-       return 0;
+        CDEBUG(D_NET, "gmnal_init finished\n");
+        return 0;

 
  failed_2:
         gm_close(gmni->gmni_port);
 
  failed_2:
         gm_close(gmni->gmni_port);


@@ -241,6 +243,7 @@ gmnal_startup(lnet_ni_t *ni)
         gmnal_free_rxs(gmni);
 
         LIBCFS_FREE(gmni, sizeof(*gmni));
         gmnal_free_rxs(gmni);
 
         LIBCFS_FREE(gmni, sizeof(*gmni));

+        PORTAL_MODULE_UNUSE;

 
         return -EIO;
 }
 
         return -EIO;
 }