LU-6010 lnet: prevent assert on LNet module unload

[fs/lustre-release.git] / lnet / lnet / module.c

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index aaad649..a8f39b3 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
  * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *

- * Copyright (c) 2012, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.

  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/


@@ -36,6 +36,7 @@
 
 #define DEBUG_SUBSYSTEM S_LNET
 #include <lnet/lib-lnet.h>
 
 #define DEBUG_SUBSYSTEM S_LNET
 #include <lnet/lib-lnet.h>

+#include <lnet/lib-dlc.h>

 
 static int config_on_load = 0;
 CFS_MODULE_PARM(config_on_load, "i", int, 0444,
 
 static int config_on_load = 0;
 CFS_MODULE_PARM(config_on_load, "i", int, 0444,


@@ -43,58 +44,120 @@ CFS_MODULE_PARM(config_on_load, "i", int, 0444,
 
 static struct mutex lnet_config_mutex;
 
 
 static struct mutex lnet_config_mutex;
 

-int
-lnet_configure (void *arg)
+static int
+lnet_configure(void *arg)

 {
 {

-        /* 'arg' only there so I can be passed to cfs_create_thread() */
-        int    rc = 0;
+       /* 'arg' only there so I can be passed to cfs_create_thread() */
+       int    rc = 0;

 
 

-        LNET_MUTEX_LOCK(&lnet_config_mutex);
+       LNET_MUTEX_LOCK(&lnet_config_mutex);

 
 

-        if (!the_lnet.ln_niinit_self) {
-                rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
-                if (rc >= 0) {
-                        the_lnet.ln_niinit_self = 1;
-                        rc = 0;
-                }
-        }
+       if (!the_lnet.ln_niinit_self) {
+               rc = try_module_get(THIS_MODULE);

 
 

-        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
-        return rc;
+               if (rc != 1)
+                       goto out;
+
+               rc = LNetNIInit(LNET_PID_LUSTRE);
+               if (rc >= 0) {
+                       the_lnet.ln_niinit_self = 1;
+                       rc = 0;
+               } else {
+                       module_put(THIS_MODULE);
+               }
+       }
+
+out:
+       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       return rc;

 }
 
 }
 

-int
+static int

 lnet_unconfigure (void)
 {
 lnet_unconfigure (void)
 {

-        int   refcount;
-        
-        LNET_MUTEX_LOCK(&lnet_config_mutex);
+       int   refcount;
+
+       LNET_MUTEX_LOCK(&lnet_config_mutex);
+
+       if (the_lnet.ln_niinit_self) {
+               the_lnet.ln_niinit_self = 0;
+               LNetNIFini();
+               module_put(THIS_MODULE);
+       }
+
+       LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex);
+       refcount = the_lnet.ln_refcount;
+       LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex);

 
 

-        if (the_lnet.ln_niinit_self) {
-                the_lnet.ln_niinit_self = 0;
-                LNetNIFini();
-        }
+       LNET_MUTEX_UNLOCK(&lnet_config_mutex);

 
 

-        LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex);
-        refcount = the_lnet.ln_refcount;
-        LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex);
+       return (refcount == 0) ? 0 : -EBUSY;
+}

 
 

-        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
-        return (refcount == 0) ? 0 : -EBUSY;
+static int
+lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
+{
+       struct lnet_ioctl_config_data *conf =
+         (struct lnet_ioctl_config_data *)hdr;
+       int                           rc;
+
+       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_add_ni(LNET_PID_LUSTRE,
+                                    conf->cfg_config_u.cfg_net.net_intf,
+                                    conf->cfg_config_u.cfg_net.
+                                       net_peer_timeout,
+                                    conf->cfg_config_u.cfg_net.
+                                       net_peer_tx_credits,
+                                    conf->cfg_config_u.cfg_net.
+                                       net_peer_rtr_credits,
+                                    conf->cfg_config_u.cfg_net.
+                                       net_max_tx_credits);
+       else
+               rc = -EINVAL;
+       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+       return rc;
+}
+
+static int
+lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
+{
+       struct lnet_ioctl_config_data *conf =
+         (struct lnet_ioctl_config_data *) hdr;
+       int                           rc;
+
+       LNET_MUTEX_LOCK(&lnet_config_mutex);
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_del_ni(conf->cfg_net);
+       else
+               rc = -EINVAL;
+       LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+
+       return rc;

 }
 
 }
 

-int
+static int

 lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
 {
        int   rc;
 
        switch (cmd) {
 lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
 {
        int   rc;
 
        switch (cmd) {

-       case IOC_LIBCFS_CONFIGURE:
+       case IOC_LIBCFS_CONFIGURE: {
+               struct libcfs_ioctl_data *data =
+                 (struct libcfs_ioctl_data *)hdr;
+               the_lnet.ln_nis_from_mod_params = data->ioc_flags;

                return lnet_configure(NULL);
                return lnet_configure(NULL);

+       }

 
        case IOC_LIBCFS_UNCONFIGURE:
                return lnet_unconfigure();
 
 
        case IOC_LIBCFS_UNCONFIGURE:
                return lnet_unconfigure();
 

+       case IOC_LIBCFS_ADD_NET:
+               return lnet_dyn_configure(hdr);
+
+       case IOC_LIBCFS_DEL_NET:
+               return lnet_dyn_unconfigure(hdr);
+

        default:
                /* Passing LNET_PID_ANY only gives me a ref if the net is up
                 * already; I'll need it to ensure the net can't go down while
        default:
                /* Passing LNET_PID_ANY only gives me a ref if the net is up
                 * already; I'll need it to ensure the net can't go down while


@@ -110,22 +173,22 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
 
 DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
 
 
 DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
 

-int
-init_lnet(void)
+static int
+lnet_module_init(void)

 {
 {

-        int                  rc;
-        ENTRY;
+       int rc;
+       ENTRY;

 
        mutex_init(&lnet_config_mutex);
 
 
        mutex_init(&lnet_config_mutex);
 

-        rc = LNetInit();
-        if (rc != 0) {
-                CERROR("LNetInit: error %d\n", rc);
-                RETURN(rc);
-        }
+       rc = lnet_init();
+       if (rc != 0) {
+               CERROR("lnet_init: error %d\n", rc);
+               RETURN(rc);
+       }

 
 

-        rc = libcfs_register_ioctl(&lnet_ioctl_handler);
-        LASSERT (rc == 0);
+       rc = libcfs_register_ioctl(&lnet_ioctl_handler);
+       LASSERT(rc == 0);

 
        if (config_on_load) {
                /* Have to schedule a separate thread to avoid deadlocking
 
        if (config_on_load) {
                /* Have to schedule a separate thread to avoid deadlocking


@@ -133,22 +196,22 @@ init_lnet(void)
                (void) kthread_run(lnet_configure, NULL, "lnet_initd");
        }
 
                (void) kthread_run(lnet_configure, NULL, "lnet_initd");
        }
 

-        RETURN(0);
+       RETURN(0);

 }
 
 }
 

-void
-fini_lnet(void)
+static void
+lnet_module_exit(void)

 {
 {

-        int rc;
+       int rc;

 
 

-        rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
-        LASSERT (rc == 0);
+       rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
+       LASSERT(rc == 0);

 
 

-        LNetFini();
+       lnet_fini();

 }
 
 MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
 MODULE_DESCRIPTION("Portals v3.1");
 MODULE_LICENSE("GPL");
 
 }
 
 MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
 MODULE_DESCRIPTION("Portals v3.1");
 MODULE_LICENSE("GPL");
 

-cfs_module(lnet, "1.0.0", init_lnet, fini_lnet);
+cfs_module(lnet, "1.0.0", lnet_module_init, lnet_module_exit);