LU-7734 lnet: fix routing selection

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

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index eee6ff4..a7190dd 100644 (file)
--- 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, 2015, Intel Corporation.
+ * Copyright (c) 2012, 2016, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -95,31 +91,78 @@ lnet_unconfigure (void)
 }
 
 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;
 
+       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);
+               rc = lnet_dyn_add_net(conf);
        else
                rc = -EINVAL;
        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;
 
+       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;
        mutex_unlock(&lnet_config_mutex);
@@ -136,6 +179,10 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
        case IOC_LIBCFS_CONFIGURE: {
                struct libcfs_ioctl_data *data =
                  (struct libcfs_ioctl_data *)hdr;
+
+               if (data->ioc_hdr.ioc_len < sizeof(*data))
+                       return -EINVAL;
+
                the_lnet.ln_nis_from_mod_params = data->ioc_flags;
                return lnet_configure(NULL);
        }
@@ -144,10 +191,16 @@ lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
                return lnet_unconfigure();
 
        case IOC_LIBCFS_ADD_NET:
-               return lnet_dyn_configure(hdr);
+               return lnet_dyn_configure_net(hdr);
 
        case IOC_LIBCFS_DEL_NET:
-               return lnet_dyn_unconfigure(hdr);
+               return lnet_dyn_unconfigure_net(hdr);
+
+       case IOC_LIBCFS_ADD_LOCAL_NI:
+               return lnet_dyn_configure_ni(hdr);
+
+       case IOC_LIBCFS_DEL_LOCAL_NI:
+               return lnet_dyn_unconfigure_ni(hdr);
 
        default:
                /* Passing LNET_PID_ANY only gives me a ref if the net is up