#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,
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(LNET_PID_LUSTRE);
+ 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
}
int
+lnet_dyn_configure(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_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);
+ 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:
+ 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