#ifndef EXPORT_SYMTAB
# define EXPORT_SYMTAB
#endif
-#define DEBUG_SUBSYSTEM S_PORTALS
-
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/string.h>
-#include <linux/stat.h>
-#include <linux/init.h>
-#include <linux/errno.h>
-#include <linux/smp_lock.h>
-#include <linux/unistd.h>
-
-#include <asm/system.h>
-#include <asm/uaccess.h>
-
-#include <linux/fs.h>
-#include <linux/stat.h>
-#include <asm/uaccess.h>
-#include <asm/segment.h>
-#include <linux/miscdevice.h>
-
-#include <portals/lib-p30.h>
-#include <portals/p30.h>
-#include <linux/kp30.h>
-#include <linux/portals_compat25.h>
-
-#define PORTAL_MINOR 240
-
-extern void (kping_client)(struct portal_ioctl_data *);
-
-struct nal_cmd_handler {
- nal_cmd_handler_t nch_handler;
- void * nch_private;
-};
-
-static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
-struct semaphore nal_cmd_sem;
+#define DEBUG_SUBSYSTEM S_LNET
-#ifdef PORTAL_DEBUG
-void kportal_assertion_failed(char *expr, char *file, const char *func,
- const int line)
-{
- portals_debug_msg(0, D_EMERG, file, func, line, CDEBUG_STACK,
- "ASSERTION(%s) failed\n", expr);
- LBUG_WITH_LOC(file, func, line);
-}
-#endif
+#include <lnet/lib-lnet.h>
+#include <lnet/lnet.h>
+#include <libcfs/kp30.h>
+#include "tracefile.h"
void
-kportal_daemonize (char *str)
+kportal_memhog_free (struct libcfs_device_userstate *ldu)
{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,63))
- daemonize(str);
-#else
- daemonize();
- snprintf (current->comm, sizeof (current->comm), "%s", str);
-#endif
-}
+ cfs_page_t **level0p = &ldu->ldu_memhog_root_page;
+ cfs_page_t **level1p;
+ cfs_page_t **level2p;
+ int count1;
+ int count2;
-void
-kportal_blockallsigs ()
-{
- unsigned long flags;
+ if (*level0p != NULL) {
- SIGNAL_MASK_LOCK(current, flags);
- sigfillset(¤t->blocked);
- RECALC_SIGPENDING;
- SIGNAL_MASK_UNLOCK(current, flags);
-}
+ level1p = (cfs_page_t **)cfs_page_address(*level0p);
+ count1 = 0;
-/* called when opening /dev/device */
-static int kportal_psdev_open(struct inode * inode, struct file * file)
-{
- ENTRY;
+ while (count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *) &&
+ *level1p != NULL) {
- if (!inode)
- RETURN(-EINVAL);
- PORTAL_MODULE_USE;
- RETURN(0);
-}
+ level2p = (cfs_page_t **)cfs_page_address(*level1p);
+ count2 = 0;
-/* called when closing /dev/device */
-static int kportal_psdev_release(struct inode * inode, struct file * file)
-{
- ENTRY;
+ while (count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *) &&
+ *level2p != NULL) {
- if (!inode)
- RETURN(-EINVAL);
+ cfs_free_page(*level2p);
+ ldu->ldu_memhog_pages--;
+ level2p++;
+ count2++;
+ }
- PORTAL_MODULE_UNUSE;
- RETURN(0);
-}
+ cfs_free_page(*level1p);
+ ldu->ldu_memhog_pages--;
+ level1p++;
+ count1++;
+ }
-static inline void freedata(void *data, int len)
-{
- PORTAL_FREE(data, len);
+ cfs_free_page(*level0p);
+ ldu->ldu_memhog_pages--;
+
+ *level0p = NULL;
+ }
+
+ LASSERT (ldu->ldu_memhog_pages == 0);
}
-static int
-kportal_add_route(int gateway_nalid, ptl_nid_t gateway_nid,
- ptl_nid_t lo_nid, ptl_nid_t hi_nid)
+int
+kportal_memhog_alloc (struct libcfs_device_userstate *ldu, int npages, int flags)
{
- int rc;
- kpr_control_interface_t *ci;
+ cfs_page_t **level0p;
+ cfs_page_t **level1p;
+ cfs_page_t **level2p;
+ int count1;
+ int count2;
- ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET (kpr_control_interface);
- if (ci == NULL)
- return (-ENODEV);
+ LASSERT (ldu->ldu_memhog_pages == 0);
+ LASSERT (ldu->ldu_memhog_root_page == NULL);
- rc = ci->kprci_add_route (gateway_nalid, gateway_nid, lo_nid, hi_nid);
+ if (npages < 0)
+ return -EINVAL;
- PORTAL_SYMBOL_PUT(kpr_control_interface);
- return (rc);
-}
+ if (npages == 0)
+ return 0;
-static int
-kportal_del_route(int gw_nalid, ptl_nid_t gw_nid,
- ptl_nid_t lo, ptl_nid_t hi)
-{
- int rc;
- kpr_control_interface_t *ci;
+ level0p = &ldu->ldu_memhog_root_page;
+ *level0p = cfs_alloc_page(flags);
+ if (*level0p == NULL)
+ return -ENOMEM;
+ ldu->ldu_memhog_pages++;
- ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
- if (ci == NULL)
- return (-ENODEV);
+ level1p = (cfs_page_t **)cfs_page_address(*level0p);
+ count1 = 0;
+ memset(level1p, 0, CFS_PAGE_SIZE);
- rc = ci->kprci_del_route (gw_nalid, gw_nid, lo, hi);
+ while (ldu->ldu_memhog_pages < npages &&
+ count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) {
- PORTAL_SYMBOL_PUT(kpr_control_interface);
- return (rc);
-}
+ if (cfs_signal_pending())
+ return (-EINTR);
-static int
-kportal_notify_router (int gw_nalid, ptl_nid_t gw_nid,
- int alive, time_t when)
-{
- int rc;
- kpr_control_interface_t *ci;
+ *level1p = cfs_alloc_page(flags);
+ if (*level1p == NULL)
+ return -ENOMEM;
+ ldu->ldu_memhog_pages++;
- /* No error if router not preset. Sysadmin is allowed to notify
- * _everywhere_ when a NID boots or crashes, even if they know
- * nothing of the peer. */
- ci = (kpr_control_interface_t *)PORTAL_SYMBOL_GET(kpr_control_interface);
- if (ci == NULL)
- return (0);
+ level2p = (cfs_page_t **)cfs_page_address(*level1p);
+ count2 = 0;
+ memset(level2p, 0, CFS_PAGE_SIZE);
- rc = ci->kprci_notify (gw_nalid, gw_nid, alive, when);
+ while (ldu->ldu_memhog_pages < npages &&
+ count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) {
- PORTAL_SYMBOL_PUT(kpr_control_interface);
- return (rc);
-}
+ if (cfs_signal_pending())
+ return (-EINTR);
-static int
-kportal_get_route(int index, __u32 *gateway_nalidp, ptl_nid_t *gateway_nidp,
- ptl_nid_t *lo_nidp, ptl_nid_t *hi_nidp, int *alivep)
-{
- int gateway_nalid;
- ptl_nid_t gateway_nid;
- ptl_nid_t lo_nid;
- ptl_nid_t hi_nid;
- int alive;
- int rc;
- kpr_control_interface_t *ci;
-
- ci = (kpr_control_interface_t *) PORTAL_SYMBOL_GET(kpr_control_interface);
- if (ci == NULL)
- return (-ENODEV);
-
- rc = ci->kprci_get_route(index, &gateway_nalid, &gateway_nid,
- &lo_nid, &hi_nid, &alive);
-
- if (rc == 0) {
- CDEBUG(D_IOCTL, "got route [%d] %d "LPX64":"LPX64" - "LPX64", %s\n",
- index, gateway_nalid, gateway_nid, lo_nid, hi_nid,
- alive ? "up" : "down");
-
- *gateway_nalidp = (__u32)gateway_nalid;
- *gateway_nidp = gateway_nid;
- *lo_nidp = lo_nid;
- *hi_nidp = hi_nid;
- *alivep = alive;
+ *level2p = cfs_alloc_page(flags);
+ if (*level2p == NULL)
+ return (-ENOMEM);
+ ldu->ldu_memhog_pages++;
+
+ level2p++;
+ count2++;
+ }
+
+ level1p++;
+ count1++;
}
- PORTAL_SYMBOL_PUT (kpr_control_interface);
- return (rc);
+ return 0;
}
-static int
-kportal_nal_cmd(int nal, struct portal_ioctl_data *data)
+/* called when opening /dev/device */
+static int libcfs_psdev_open(unsigned long flags, void *args)
{
- int rc = -EINVAL;
-
+ struct libcfs_device_userstate *ldu;
ENTRY;
- down(&nal_cmd_sem);
- if (nal > 0 && nal <= NAL_MAX_NR && nal_cmd[nal].nch_handler) {
- CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal, data->ioc_nal_cmd);
- rc = nal_cmd[nal].nch_handler(data, nal_cmd[nal].nch_private);
- }
- up(&nal_cmd_sem);
- RETURN(rc);
-}
-
-ptl_handle_ni_t *
-kportal_get_ni (int nal)
-{
+ PORTAL_MODULE_USE;
- switch (nal)
- {
- case QSWNAL:
- return (PORTAL_SYMBOL_GET(kqswnal_ni));
- case SOCKNAL:
- return (PORTAL_SYMBOL_GET(ksocknal_ni));
- case TOENAL:
- return (PORTAL_SYMBOL_GET(ktoenal_ni));
- case GMNAL:
- return (PORTAL_SYMBOL_GET(kgmnal_ni));
- case TCPNAL:
- /* userspace NAL */
- return (NULL);
- case SCIMACNAL:
- return (PORTAL_SYMBOL_GET(kscimacnal_ni));
- default:
- /* A warning to a naive caller */
- CERROR ("unknown nal: %d\n", nal);
- return (NULL);
+ LIBCFS_ALLOC(ldu, sizeof(*ldu));
+ if (ldu != NULL) {
+ ldu->ldu_memhog_pages = 0;
+ ldu->ldu_memhog_root_page = NULL;
}
+ *(struct libcfs_device_userstate **)args = ldu;
+
+ RETURN(0);
}
-void
-kportal_put_ni (int nal)
+/* called when closing /dev/device */
+static int libcfs_psdev_release(unsigned long flags, void *args)
{
+ struct libcfs_device_userstate *ldu;
+ ENTRY;
- switch (nal)
- {
- case QSWNAL:
- PORTAL_SYMBOL_PUT(kqswnal_ni);
- break;
- case SOCKNAL:
- PORTAL_SYMBOL_PUT(ksocknal_ni);
- break;
- case TOENAL:
- PORTAL_SYMBOL_PUT(ktoenal_ni);
- break;
- case GMNAL:
- PORTAL_SYMBOL_PUT(kgmnal_ni);
- break;
- case TCPNAL:
- /* A lesson to a malicious caller */
- LBUG ();
- case SCIMACNAL:
- PORTAL_SYMBOL_PUT(kscimacnal_ni);
- break;
- default:
- CERROR ("unknown nal: %d\n", nal);
+ ldu = (struct libcfs_device_userstate *)args;
+ if (ldu != NULL) {
+ kportal_memhog_free(ldu);
+ LIBCFS_FREE(ldu, sizeof(*ldu));
}
+
+ PORTAL_MODULE_UNUSE;
+ RETURN(0);
}
-int
-kportal_nal_register(int nal, nal_cmd_handler_t handler, void * private)
+static struct rw_semaphore ioctl_list_sem;
+static struct list_head ioctl_list;
+
+int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand)
{
int rc = 0;
- CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
+ down_write(&ioctl_list_sem);
+ if (!list_empty(&hand->item))
+ rc = -EBUSY;
+ else
+ list_add_tail(&hand->item, &ioctl_list);
+ up_write(&ioctl_list_sem);
- if (nal > 0 && nal <= NAL_MAX_NR) {
- down(&nal_cmd_sem);
- if (nal_cmd[nal].nch_handler != NULL)
- rc = -EBUSY;
- else {
- nal_cmd[nal].nch_handler = handler;
- nal_cmd[nal].nch_private = private;
- }
- up(&nal_cmd_sem);
- }
return rc;
}
+EXPORT_SYMBOL(libcfs_register_ioctl);
-int
-kportal_nal_unregister(int nal)
+int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand)
{
int rc = 0;
- CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
+ down_write(&ioctl_list_sem);
+ if (list_empty(&hand->item))
+ rc = -ENOENT;
+ else
+ list_del_init(&hand->item);
+ up_write(&ioctl_list_sem);
- if (nal > 0 && nal <= NAL_MAX_NR) {
- down(&nal_cmd_sem);
- nal_cmd[nal].nch_handler = NULL;
- nal_cmd[nal].nch_private = NULL;
- up(&nal_cmd_sem);
- }
return rc;
}
+EXPORT_SYMBOL(libcfs_deregister_ioctl);
-
-static int kportal_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg)
{
- int err = 0;
- char buf[1024];
- struct portal_ioctl_data *data;
-
+ char buf[1024];
+ int err = -EINVAL;
+ struct libcfs_ioctl_data *data;
ENTRY;
- if ( _IOC_TYPE(cmd) != IOC_PORTAL_TYPE ||
- _IOC_NR(cmd) < IOC_PORTAL_MIN_NR ||
- _IOC_NR(cmd) > IOC_PORTAL_MAX_NR ) {
- CDEBUG(D_IOCTL, "invalid ioctl ( type %d, nr %d, size %d )\n",
- _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd));
- RETURN(-EINVAL);
- }
+ /* 'cmd' and permissions get checked in our arch-specific caller */
- if (portal_ioctl_getdata(buf, buf + 800, (void *)arg)) {
+ if (libcfs_ioctl_getdata(buf, buf + 800, (void *)arg)) {
CERROR("PORTALS ioctl: data error\n");
RETURN(-EINVAL);
}
-
- data = (struct portal_ioctl_data *)buf;
+ data = (struct libcfs_ioctl_data *)buf;
switch (cmd) {
- case IOC_PORTAL_SET_DAEMON:
- RETURN (portals_debug_set_daemon (
- (unsigned int) data->ioc_count,
- (unsigned int) data->ioc_inllen1,
- (char *) data->ioc_inlbuf1,
- (unsigned int) data->ioc_misc));
- case IOC_PORTAL_GET_DEBUG: {
- __s32 size = portals_debug_copy_to_user(data->ioc_pbuf1,
- data->ioc_plen1);
-
- if (size < 0)
- RETURN(size);
-
- data->ioc_size = size;
- err = copy_to_user((char *)arg, data, sizeof(*data));
- RETURN(err);
- }
- case IOC_PORTAL_CLEAR_DEBUG:
- portals_debug_clear_buffer();
+ case IOC_LIBCFS_CLEAR_DEBUG:
+ libcfs_debug_clear_buffer();
RETURN(0);
- case IOC_PORTAL_PANIC:
- if (!capable (CAP_SYS_BOOT))
- RETURN (-EPERM);
- panic("debugctl-invoked panic");
- RETURN(0);
- case IOC_PORTAL_MARK_DEBUG:
+ /*
+ * case IOC_LIBCFS_PANIC:
+ * Handled in arch/cfs_module.c
+ */
+ case IOC_LIBCFS_MARK_DEBUG:
if (data->ioc_inlbuf1 == NULL ||
data->ioc_inlbuf1[data->ioc_inllen1 - 1] != '\0')
RETURN(-EINVAL);
- portals_debug_mark_buffer(data->ioc_inlbuf1);
- RETURN(0);
- case IOC_PORTAL_PING: {
- void (*ping)(struct portal_ioctl_data *);
-
- CDEBUG(D_IOCTL, "doing %d pings to nid "LPU64"\n",
- data->ioc_count, data->ioc_nid);
- ping = PORTAL_SYMBOL_GET(kping_client);
- if (!ping)
- CERROR("PORTAL_SYMBOL_GET failed\n");
- else {
- ping(data);
- PORTAL_SYMBOL_PUT(kping_client);
- }
+ libcfs_debug_mark_buffer(data->ioc_inlbuf1);
RETURN(0);
- }
-
- case IOC_PORTAL_ADD_ROUTE:
- CDEBUG(D_IOCTL, "Adding route: [%d] "LPU64" : "LPU64" - "LPU64"\n",
- data->ioc_nal, data->ioc_nid,
- data->ioc_nid2, data->ioc_nid3);
- err = kportal_add_route(data->ioc_nal, data->ioc_nid,
- data->ioc_nid2, data->ioc_nid3);
- break;
-
- case IOC_PORTAL_DEL_ROUTE:
- CDEBUG (D_IOCTL, "Removing routes via [%d] "LPU64" : "LPU64" - "LPU64"\n",
- data->ioc_nal, data->ioc_nid,
- data->ioc_nid2, data->ioc_nid3);
- err = kportal_del_route (data->ioc_nal, data->ioc_nid,
- data->ioc_nid2, data->ioc_nid3);
- break;
-
- case IOC_PORTAL_NOTIFY_ROUTER: {
- CDEBUG (D_IOCTL, "Notifying peer [%d] "LPU64" %s @ %ld\n",
- data->ioc_nal, data->ioc_nid,
- data->ioc_flags ? "Enabling" : "Disabling",
- (time_t)data->ioc_nid3);
-
- err = kportal_notify_router (data->ioc_nal, data->ioc_nid,
- data->ioc_flags,
- (time_t)data->ioc_nid3);
- break;
- }
-
- case IOC_PORTAL_GET_ROUTE:
- CDEBUG (D_IOCTL, "Getting route [%d]\n", data->ioc_count);
- err = kportal_get_route(data->ioc_count, &data->ioc_nal,
- &data->ioc_nid,
- &data->ioc_nid2, &data->ioc_nid3,
- &data->ioc_flags);
- if (err == 0)
- if (copy_to_user((char *)arg, data, sizeof (*data)))
- err = -EFAULT;
+#if LWT_SUPPORT
+ case IOC_LIBCFS_LWT_CONTROL:
+ err = lwt_control ((data->ioc_flags & 1) != 0,
+ (data->ioc_flags & 2) != 0);
break;
- case IOC_PORTAL_GET_NID: {
- const ptl_handle_ni_t *nip;
- ptl_process_id_t pid;
-
- CDEBUG (D_IOCTL, "Getting nid [%d]\n", data->ioc_nal);
+ case IOC_LIBCFS_LWT_SNAPSHOT: {
+ cycles_t now;
+ int ncpu;
+ int total_size;
- nip = kportal_get_ni (data->ioc_nal);
- if (nip == NULL)
- RETURN (-EINVAL);
+ err = lwt_snapshot (&now, &ncpu, &total_size,
+ data->ioc_pbuf1, data->ioc_plen1);
+ data->ioc_u64[0] = now;
+ data->ioc_u32[0] = ncpu;
+ data->ioc_u32[1] = total_size;
- err = PtlGetId (*nip, &pid);
- LASSERT (err == PTL_OK);
- kportal_put_ni (data->ioc_nal);
+ /* Hedge against broken user/kernel typedefs (e.g. cycles_t) */
+ data->ioc_u32[2] = sizeof(lwt_event_t);
+ data->ioc_u32[3] = offsetof(lwt_event_t, lwte_where);
- data->ioc_nid = pid.nid;
- if (copy_to_user ((char *)arg, data, sizeof (*data)))
+ if (err == 0 &&
+ libcfs_ioctl_popdata(arg, data, sizeof (*data)))
err = -EFAULT;
break;
}
- case IOC_PORTAL_NAL_CMD:
- CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", data->ioc_nal,
- data->ioc_nal_cmd);
- err = kportal_nal_cmd(data->ioc_nal, data);
- if (err == 0)
- if (copy_to_user((char *)arg, data, sizeof (*data)))
- err = -EFAULT;
- break;
-
- case IOC_PORTAL_FAIL_NID: {
- const ptl_handle_ni_t *nip;
-
- CDEBUG (D_IOCTL, "fail nid: [%d] "LPU64" count %d\n",
- data->ioc_nal, data->ioc_nid, data->ioc_count);
-
- nip = kportal_get_ni (data->ioc_nal);
- if (nip == NULL)
- return (-EINVAL);
-
- err = PtlFailNid (*nip, data->ioc_nid, data->ioc_count);
- kportal_put_ni (data->ioc_nal);
- break;
- }
-#if LWT_SUPPORT
- case IOC_PORTAL_LWT_CONTROL:
- err = lwt_control (data->ioc_flags, data->ioc_misc);
- break;
-
- case IOC_PORTAL_LWT_SNAPSHOT:
- err = lwt_snapshot (&data->ioc_count, &data->ioc_misc,
- data->ioc_pbuf1, data->ioc_plen1);
- if (err == 0 &&
- copy_to_user((char *)arg, data, sizeof (*data)))
- err = -EFAULT;
- break;
-
- case IOC_PORTAL_LWT_LOOKUP_STRING:
+ case IOC_LIBCFS_LWT_LOOKUP_STRING:
err = lwt_lookup_string (&data->ioc_count, data->ioc_pbuf1,
data->ioc_pbuf2, data->ioc_plen2);
if (err == 0 &&
- copy_to_user((char *)arg, data, sizeof (*data)))
+ libcfs_ioctl_popdata(arg, data, sizeof (*data)))
err = -EFAULT;
break;
-#endif
- default:
+#endif
+ case IOC_LIBCFS_MEMHOG:
+ if (pfile->private_data == NULL) {
+ err = -EINVAL;
+ } else {
+ kportal_memhog_free(pfile->private_data);
+ /* XXX The ioc_flags is not GFP flags now, need to be fixed */
+ err = kportal_memhog_alloc(pfile->private_data,
+ data->ioc_count,
+ data->ioc_flags);
+ if (err != 0)
+ kportal_memhog_free(pfile->private_data);
+ }
+ break;
+
+ case IOC_LIBCFS_PING_TEST: {
+ extern void (kping_client)(struct libcfs_ioctl_data *);
+ void (*ping)(struct libcfs_ioctl_data *);
+
+ CDEBUG(D_IOCTL, "doing %d pings to nid %s (%s)\n",
+ data->ioc_count, libcfs_nid2str(data->ioc_nid),
+ libcfs_nid2str(data->ioc_nid));
+ ping = PORTAL_SYMBOL_GET(kping_client);
+ if (!ping)
+ CERROR("PORTAL_SYMBOL_GET failed\n");
+ else {
+ ping(data);
+ PORTAL_SYMBOL_PUT(kping_client);
+ }
+ RETURN(0);
+ }
+
+ default: {
+ struct libcfs_ioctl_handler *hand;
err = -EINVAL;
+ down_read(&ioctl_list_sem);
+ list_for_each_entry(hand, &ioctl_list, item) {
+ err = hand->handle_ioctl(cmd, data);
+ if (err != -EINVAL) {
+ if (err == 0)
+ err = libcfs_ioctl_popdata(arg,
+ data, sizeof (*data));
+ break;
+ }
+ }
+ up_read(&ioctl_list_sem);
break;
}
+ }
RETURN(err);
}
-
-static struct file_operations portalsdev_fops = {
- ioctl: kportal_ioctl,
- open: kportal_psdev_open,
- release: kportal_psdev_release
-};
-
-
-static struct miscdevice portal_dev = {
- PORTAL_MINOR,
- "portals",
- &portalsdev_fops
+struct cfs_psdev_ops libcfs_psdev_ops = {
+ libcfs_psdev_open,
+ libcfs_psdev_release,
+ NULL,
+ NULL,
+ libcfs_ioctl
};
extern int insert_proc(void);
MODULE_DESCRIPTION("Portals v3.1");
MODULE_LICENSE("GPL");
-static int init_kportals_module(void)
+extern cfs_psdev_t libcfs_dev;
+extern struct rw_semaphore tracefile_sem;
+extern struct semaphore trace_thread_sem;
+
+extern void libcfs_init_nidstrings(void);
+extern int libcfs_arch_init(void);
+extern void libcfs_arch_cleanup(void);
+
+static int init_libcfs_module(void)
{
int rc;
- rc = portals_debug_init(5 * 1024 * 1024);
+ libcfs_arch_init();
+ libcfs_init_nidstrings();
+ init_rwsem(&tracefile_sem);
+ init_mutex(&trace_thread_sem);
+ init_rwsem(&ioctl_list_sem);
+ CFS_INIT_LIST_HEAD(&ioctl_list);
+
+ rc = libcfs_debug_init(5 * 1024 * 1024);
if (rc < 0) {
- printk(KERN_ERR "portals_debug_init: %d\n", rc);
+ printk(KERN_ERR "LustreError: libcfs_debug_init: %d\n", rc);
return (rc);
}
goto cleanup_debug;
}
#endif
- sema_init(&nal_cmd_sem, 1);
-
- rc = misc_register(&portal_dev);
+ rc = cfs_psdev_register(&libcfs_dev);
if (rc) {
CERROR("misc_register: error %d\n", rc);
goto cleanup_lwt;
}
- rc = PtlInit();
- if (rc) {
- CERROR("PtlInit: error %d\n", rc);
- goto cleanup_deregister;
- }
-
rc = insert_proc();
if (rc) {
CERROR("insert_proc: error %d\n", rc);
- goto cleanup_fini;
+ goto cleanup_deregister;
}
CDEBUG (D_OTHER, "portals setup OK\n");
return (0);
- cleanup_fini:
- PtlFini();
cleanup_deregister:
- misc_deregister(&portal_dev);
+ cfs_psdev_deregister(&libcfs_dev);
cleanup_lwt:
#if LWT_SUPPORT
lwt_fini();
-#endif
cleanup_debug:
- portals_debug_cleanup();
+#endif
+ libcfs_debug_cleanup();
return rc;
}
-static void exit_kportals_module(void)
+static void exit_libcfs_module(void)
{
int rc;
remove_proc();
- PtlFini();
CDEBUG(D_MALLOC, "before Portals cleanup: kmem %d\n",
- atomic_read(&portal_kmemory));
-
+ atomic_read(&libcfs_kmemory));
- rc = misc_deregister(&portal_dev);
+ rc = cfs_psdev_deregister(&libcfs_dev);
if (rc)
CERROR("misc_deregister error %d\n", rc);
lwt_fini();
#endif
- if (atomic_read(&portal_kmemory) != 0)
+ if (atomic_read(&libcfs_kmemory) != 0)
CERROR("Portals memory leaked: %d bytes\n",
- atomic_read(&portal_kmemory));
+ atomic_read(&libcfs_kmemory));
- rc = portals_debug_cleanup();
+ rc = libcfs_debug_cleanup();
if (rc)
- printk(KERN_ERR "portals_debug_cleanup: %d\n", rc);
+ printk(KERN_ERR "LustreError: libcfs_debug_cleanup: %d\n", rc);
+ libcfs_arch_cleanup();
}
-EXPORT_SYMBOL(lib_dispatch);
-EXPORT_SYMBOL(PtlMEAttach);
-EXPORT_SYMBOL(PtlMEInsert);
-EXPORT_SYMBOL(PtlMEUnlink);
-EXPORT_SYMBOL(PtlEQAlloc);
-EXPORT_SYMBOL(PtlMDAttach);
-EXPORT_SYMBOL(PtlMDUnlink);
-EXPORT_SYMBOL(PtlNIInit);
-EXPORT_SYMBOL(PtlNIFini);
-EXPORT_SYMBOL(PtlNIDebug);
-EXPORT_SYMBOL(PtlInit);
-EXPORT_SYMBOL(PtlFini);
-EXPORT_SYMBOL(PtlPut);
-EXPORT_SYMBOL(PtlGet);
-EXPORT_SYMBOL(ptl_err_str);
-EXPORT_SYMBOL(portal_subsystem_debug);
-EXPORT_SYMBOL(portal_debug);
-EXPORT_SYMBOL(portal_stack);
-EXPORT_SYMBOL(portal_printk);
-EXPORT_SYMBOL(PtlEQWait);
-EXPORT_SYMBOL(PtlEQFree);
-EXPORT_SYMBOL(PtlEQGet);
-EXPORT_SYMBOL(PtlGetId);
-EXPORT_SYMBOL(PtlMDBind);
-EXPORT_SYMBOL(lib_iov_nob);
-EXPORT_SYMBOL(lib_copy_iov2buf);
-EXPORT_SYMBOL(lib_copy_buf2iov);
-EXPORT_SYMBOL(lib_kiov_nob);
-EXPORT_SYMBOL(lib_copy_kiov2buf);
-EXPORT_SYMBOL(lib_copy_buf2kiov);
-EXPORT_SYMBOL(lib_finalize);
-EXPORT_SYMBOL(lib_parse);
-EXPORT_SYMBOL(lib_init);
-EXPORT_SYMBOL(lib_fini);
-EXPORT_SYMBOL(portal_kmemory);
-EXPORT_SYMBOL(kportal_daemonize);
-EXPORT_SYMBOL(kportal_blockallsigs);
-EXPORT_SYMBOL(kportal_nal_register);
-EXPORT_SYMBOL(kportal_nal_unregister);
-EXPORT_SYMBOL(kportal_assertion_failed);
-EXPORT_SYMBOL(dispatch_name);
-EXPORT_SYMBOL(kportal_get_ni);
-EXPORT_SYMBOL(kportal_put_ni);
-
-module_init(init_kportals_module);
-module_exit (exit_kportals_module);
+cfs_module(libcfs, "1.0.0", init_libcfs_module, exit_libcfs_module);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff