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 c080eb4..a7190dd 100644 (file)
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -91,7 +91,7 @@ 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;
@@ -101,19 +101,17 @@ lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
                return -EINVAL;
 
        mutex_lock(&lnet_config_mutex);
-       if (!the_lnet.ln_niinit_self) {
+       if (the_lnet.ln_niinit_self)
+               rc = lnet_dyn_add_net(conf);
+       else
                rc = -EINVAL;
-               goto out_unlock;
-       }
-       rc = lnet_dyn_add_ni(LNET_PID_LUSTRE, conf);
-out_unlock:
        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;
@@ -123,12 +121,50 @@ lnet_dyn_unconfigure(struct libcfs_ioctl_hdr *hdr)
                return -EINVAL;
 
        mutex_lock(&lnet_config_mutex);
-       if (!the_lnet.ln_niinit_self) {
+       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);
+       else
                rc = -EINVAL;
-               goto out_unlock;
-       }
-       rc = lnet_dyn_del_ni(conf->cfg_net);
-out_unlock:
        mutex_unlock(&lnet_config_mutex);
 
        return rc;
@@ -155,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