X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Fmodule.c;h=3547a3b22d1f75860d10cd6a57c513c1d9e0eee8;hp=9d574797d6af2abaec870edbbf496a08bff55928;hb=5655ee76f5c7573c9ad076a92df6388f27b65196;hpb=c8fd9c3c38a66ab3dd479c48e0168577a4ff960e

diff --git a/lnet/lnet/module.c b/lnet/lnet/module.c
index 9d57479..3547a3b 100644
--- a/lnet/lnet/module.c
+++ b/lnet/lnet/module.c
@@ -36,6 +36,7 @@
 
 #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,
@@ -44,23 +45,23 @@ CFS_MODULE_PARM(config_on_load, "i", int, 0444,
 static struct mutex lnet_config_mutex;
 
 int
-lnet_configure (void *arg)
+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 = LNetNIInit(LUSTRE_SRV_LNET_PID);
+		if (rc >= 0) {
+			the_lnet.ln_niinit_self = 1;
+			rc = 0;
+		}
+	}
 
-        LNET_MUTEX_UNLOCK(&lnet_config_mutex);
-        return rc;
+	LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+	return rc;
 }
 
 int
@@ -84,28 +85,80 @@ lnet_unconfigure (void)
 }
 
 int
-lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_data *data)
+lnet_dyn_configure(struct libcfs_ioctl_hdr *hdr)
 {
-        int   rc;
-
-        switch (cmd) {
-        case IOC_LIBCFS_CONFIGURE:
-                return lnet_configure(NULL);
-
-        case IOC_LIBCFS_UNCONFIGURE:
-                return lnet_unconfigure();
-                
-        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
-                 * I'm called into it */
-                rc = LNetNIInit(LNET_PID_ANY);
-                if (rc >= 0) {
-                        rc = LNetCtl(cmd, data);
-                        LNetNIFini();
-                }
-                return rc;
-        }
+	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(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);
+	else
+		rc = -EINVAL;
+	LNET_MUTEX_UNLOCK(&lnet_config_mutex);
+	return rc;
+}
+
+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
+lnet_ioctl(unsigned int cmd, struct libcfs_ioctl_hdr *hdr)
+{
+	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);
+	}
+
+	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
+		 * I'm called into it */
+		rc = LNetNIInit(LNET_PID_ANY);
+		if (rc >= 0) {
+			rc = LNetCtl(cmd, hdr);
+			LNetNIFini();
+		}
+		return rc;
+	}
 }
 
 DECLARE_IOCTL_HANDLER(lnet_ioctl_handler, lnet_ioctl);