X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fmodule.c;h=261c45c92e94cd302472adf8a7b84f118025dcc6;hp=f3ccfa8e3dbdfc2ed5761f01b97588eb5cef6d22;hb=917655fc2938b90a9c246dd2d58408c42aa1658d;hpb=f6995cf04407dff15d6ca79ca44cfa97dc6eb014 diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c index f3ccfa8..261c45c 100644 --- a/lnet/lnet/module.c +++ b/lnet/lnet/module.c @@ -15,11 +15,7 @@ * * 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 */ @@ -27,7 +23,7 @@ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2014, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,14 +31,15 @@ */ #define DEBUG_SUBSYSTEM S_LNET + #include -#include +#include 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); static int lnet_configure(void *arg) @@ -50,7 +47,7 @@ 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 = try_module_get(THIS_MODULE); @@ -68,7 +65,7 @@ lnet_configure(void *arg) } out: - LNET_MUTEX_UNLOCK(&lnet_config_mutex); + mutex_unlock(&lnet_config_mutex); return rc; } @@ -77,7 +74,7 @@ lnet_unconfigure (void) { int refcount; - LNET_MUTEX_LOCK(&lnet_config_mutex); + mutex_lock(&lnet_config_mutex); if (the_lnet.ln_niinit_self) { the_lnet.ln_niinit_self = 0; @@ -85,78 +82,135 @@ lnet_unconfigure (void) module_put(THIS_MODULE); } - LNET_MUTEX_LOCK(&the_lnet.ln_api_mutex); + mutex_lock(&the_lnet.ln_api_mutex); refcount = the_lnet.ln_refcount; - LNET_MUTEX_UNLOCK(&the_lnet.ln_api_mutex); + mutex_unlock(&the_lnet.ln_api_mutex); - LNET_MUTEX_UNLOCK(&lnet_config_mutex); + mutex_unlock(&lnet_config_mutex); return (refcount == 0) ? 0 : -EBUSY; } static int -lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr) +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(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); + rc = lnet_dyn_add_net(conf); else rc = -EINVAL; - LNET_MUTEX_UNLOCK(&lnet_config_mutex); + mutex_unlock(&lnet_config_mutex); + return rc; } static int -lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr) +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_net(conf->cfg_net); + else + rc = -EINVAL; + mutex_unlock(&lnet_config_mutex); + + return rc; +} + +static int +lnet_dyn_configure_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_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->cfg_net); + rc = lnet_dyn_del_ni(conf); else rc = -EINVAL; - LNET_MUTEX_UNLOCK(&lnet_config_mutex); + mutex_unlock(&lnet_config_mutex); return rc; } static int -lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr) +lnet_ioctl(struct notifier_block *nb, + unsigned long cmd, void *vdata) { - int rc; + 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 @@ -167,53 +221,58 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr) 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, +}; -static int -lnet_module_init(void) +static int __init lnet_init(void) { int rc; ENTRY; - mutex_init(&lnet_config_mutex); - - rc = lnet_init(); + rc = lnet_lib_init(); if (rc != 0) { - CERROR("lnet_init: error %d\n", rc); + CERROR("lnet_lib_init: error %d\n", rc); RETURN(rc); } - rc = libcfs_register_ioctl(&lnet_ioctl_handler); + 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 = 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); } -static void -lnet_module_exit(void) +static void __exit lnet_exit(void) { int rc; - rc = libcfs_deregister_ioctl(&lnet_ioctl_handler); + rc = blocking_notifier_chain_unregister(&libcfs_ioctl_list, + &lnet_ioctl_handler); LASSERT(rc == 0); - lnet_fini(); + lnet_lib_exit(); } -MODULE_AUTHOR("Peter J. Braam "); -MODULE_DESCRIPTION("LNet v3.1"); -MODULE_VERSION("1.0.0"); +MODULE_AUTHOR("OpenSFS, Inc. "); +MODULE_DESCRIPTION("Lustre Networking layer"); +MODULE_VERSION(LNET_VERSION); MODULE_LICENSE("GPL"); -module_init(lnet_module_init); -module_exit(lnet_module_exit); +module_init(lnet_init); +module_exit(lnet_exit);