*
* You should have received a copy of the GNU General Public License
* version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
*
* GPL HEADER END
*/
* 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, 2017, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
*/
#define DEBUG_SUBSYSTEM S_LNET
+
#include <lnet/lib-lnet.h>
-#include <lnet/lib-dlc.h>
+#include <uapi/linux/lnet/lnet-dlc.h>
static int config_on_load = 0;
-CFS_MODULE_PARM(config_on_load, "i", int, 0444,
- "configure network at module load");
+module_param(config_on_load, int, 0444);
+MODULE_PARM_DESC(config_on_load, "configure network at module load");
-static struct mutex lnet_config_mutex;
+static DEFINE_MUTEX(lnet_config_mutex);
-int
+static int
lnet_configure(void *arg)
{
/* 'arg' only there so I can be passed to cfs_create_thread() */
int rc = 0;
- LNET_MUTEX_LOCK(&lnet_config_mutex);
+ mutex_lock(&lnet_config_mutex);
if (!the_lnet.ln_niinit_self) {
- rc = LNetNIInit(LUSTRE_SRV_LNET_PID);
+ rc = try_module_get(THIS_MODULE);
+
+ 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);
}
}
- LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+out:
+ mutex_unlock(&lnet_config_mutex);
return rc;
}
-int
+static int
lnet_unconfigure (void)
{
- int refcount;
-
- LNET_MUTEX_LOCK(&lnet_config_mutex);
+ int refcount;
+
+ mutex_lock(&lnet_config_mutex);
- if (the_lnet.ln_niinit_self) {
- the_lnet.ln_niinit_self = 0;
- LNetNIFini();
- }
+ if (the_lnet.ln_niinit_self) {
+ the_lnet.ln_niinit_self = 0;
+ LNetNIFini();
+ module_put(THIS_MODULE);
+ }
+
+ mutex_lock(&the_lnet.ln_api_mutex);
+ refcount = the_lnet.ln_refcount;
+ mutex_unlock(&the_lnet.ln_api_mutex);
- LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex);
- refcount = the_lnet.ln_refcount;
- LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex);
+ mutex_unlock(&lnet_config_mutex);
- LNET_MUTEX_UNLOCK(&lnet_config_mutex);
- return (refcount == 0) ? 0 : -EBUSY;
+ return (refcount == 0) ? 0 : -EBUSY;
}
-int
-lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
+static int
+lnet_dyn_configure_net(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 (conf->cfg_hdr.ioc_len < sizeof(*conf))
+ return -EINVAL;
+
+ mutex_lock(&lnet_config_mutex);
if (the_lnet.ln_niinit_self)
- rc = lnet_dyn_add_ni(LUSTRE_SRV_LNET_PID,
- 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);
+ rc = lnet_dyn_add_net(conf);
else
rc = -EINVAL;
- LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+ mutex_unlock(&lnet_config_mutex);
+
return rc;
}
-int
-lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
+static int
+lnet_dyn_unconfigure_net(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 (conf->cfg_hdr.ioc_len < sizeof(*conf))
+ return -EINVAL;
+
+ mutex_lock(&lnet_config_mutex);
if (the_lnet.ln_niinit_self)
- rc = lnet_dyn_del_ni(conf->cfg_net);
+ rc = lnet_dyn_del_net(conf->cfg_net);
else
rc = -EINVAL;
- LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+ mutex_unlock(&lnet_config_mutex);
return rc;
}
-int
-lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
+static int
+lnet_dyn_configure_ni(struct libcfs_ioctl_hdr *hdr)
{
- int rc;
+ struct lnet_ioctl_config_ni *conf =
+ (struct lnet_ioctl_config_ni *)hdr;
+ int rc;
+
+ if (conf->lic_cfg_hdr.ioc_len < sizeof(*conf))
+ return -EINVAL;
+
+ mutex_lock(&lnet_config_mutex);
+ if (the_lnet.ln_niinit_self)
+ rc = lnet_dyn_add_ni(conf);
+ else
+ rc = -EINVAL;
+ mutex_unlock(&lnet_config_mutex);
+
+ return rc;
+}
+
+static int
+lnet_dyn_unconfigure_ni(struct libcfs_ioctl_hdr *hdr)
+{
+ struct lnet_ioctl_config_ni *conf =
+ (struct lnet_ioctl_config_ni *) hdr;
+ int rc;
+
+ if (conf->lic_cfg_hdr.ioc_len < sizeof(*conf))
+ return -EINVAL;
+
+ mutex_lock(&lnet_config_mutex);
+ if (the_lnet.ln_niinit_self)
+ rc = lnet_dyn_del_ni(conf);
+ else
+ rc = -EINVAL;
+ mutex_unlock(&lnet_config_mutex);
+
+ return rc;
+}
+
+static int
+lnet_ioctl(struct notifier_block *nb,
+ unsigned long cmd, void *vdata)
+{
+ struct libcfs_ioctl_hdr *hdr = vdata;
+ int rc;
switch (cmd) {
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);
+
+ if (data->ioc_hdr.ioc_len < sizeof(*data)) {
+ rc = -EINVAL;
+ } else {
+ the_lnet.ln_nis_from_mod_params = data->ioc_flags;
+ rc = lnet_configure(NULL);
+ }
+ break;
}
case IOC_LIBCFS_UNCONFIGURE:
- return lnet_unconfigure();
+ rc = lnet_unconfigure();
+ break;
case IOC_LIBCFS_ADD_NET:
- return lnet_dyn_configure(hdr);
+ rc = lnet_dyn_configure_net(hdr);
+ break;
case IOC_LIBCFS_DEL_NET:
- return lnet_dyn_unconfigure(hdr);
+ rc = lnet_dyn_unconfigure_net(hdr);
+ break;
+
+ case IOC_LIBCFS_ADD_LOCAL_NI:
+ rc = lnet_dyn_configure_ni(hdr);
+ break;
+
+ case IOC_LIBCFS_DEL_LOCAL_NI:
+ rc = lnet_dyn_unconfigure_ni(hdr);
+ break;
default:
/* Passing LNET_PID_ANY only gives me a ref if the net is up
rc = LNetCtl(cmd, hdr);
LNetNIFini();
}
- return rc;
+ break;
}
+ return notifier_from_ioctl_errno(rc);
}
-DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);
+static struct notifier_block lnet_ioctl_handler = {
+ .notifier_call = lnet_ioctl,
+};
-int
-init_lnet(void)
+static int __init lnet_init(void)
{
- int rc;
- ENTRY;
+ int rc;
+ ENTRY;
- mutex_init(&lnet_config_mutex);
+ rc = lnet_lib_init();
+ if (rc != 0) {
+ CERROR("lnet_lib_init: error %d\n", rc);
+ RETURN(rc);
+ }
- rc = LNetInit();
- if (rc != 0) {
- CERROR("LNetInit: error %d\n", rc);
- RETURN(rc);
- }
+ if (live_router_check_interval != INT_MIN ||
+ dead_router_check_interval != INT_MIN)
+ LCONSOLE_WARN("live_router_check_interval and dead_router_check_interval have been deprecated. Use alive_router_check_interval instead. Ignoring these deprecated parameters.\n");
- rc = libcfs_register_ioctl(&lnet_ioctl_handler);
- LASSERT (rc == 0);
+ rc = blocking_notifier_chain_register(&libcfs_ioctl_list,
+ &lnet_ioctl_handler);
+ LASSERT(rc == 0);
if (config_on_load) {
/* Have to schedule a separate thread to avoid deadlocking
* in modload */
- (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 __exit lnet_exit(void)
{
- int rc;
+ int rc;
- rc = libcfs_deregister_ioctl(&lnet_ioctl_handler);
- LASSERT (rc == 0);
+ rc = blocking_notifier_chain_unregister(&libcfs_ioctl_list,
+ &lnet_ioctl_handler);
+ LASSERT(rc == 0);
- LNetFini();
+ lnet_lib_exit();
}
-MODULE_AUTHOR("Peter J. Braam <braam@clusterfs.com>");
-MODULE_DESCRIPTION("Portals v3.1");
+MODULE_AUTHOR("OpenSFS, Inc. <http://www.lustre.org/>");
+MODULE_DESCRIPTION("Lustre Networking layer");
+MODULE_VERSION(LNET_VERSION);
MODULE_LICENSE("GPL");
-cfs_module(lnet, "1.0.0", init_lnet, fini_lnet);
+module_init(lnet_init);
+module_exit(lnet_exit);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff