#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
+#include <libcfs/kp30.h>
struct nal_cmd_handler {
+ int nch_number;
nal_cmd_handler_fn *nch_handler;
void *nch_private;
};
-static struct nal_cmd_handler nal_cmd[NAL_MAX_NR + 1];
-static DECLARE_MUTEX(nal_cmd_sem);
+static struct nal_cmd_handler nal_cmd[16];
+struct semaphore nal_cmd_mutex;
#ifdef PORTAL_DEBUG
void kportal_assertion_failed(char *expr, char *file, const char *func,
#endif
void
-kportal_daemonize (char *str)
-{
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,63))
- daemonize(str);
-#else
- daemonize();
- snprintf (current->comm, sizeof (current->comm), "%s", str);
-#endif
-}
-
-void
kportal_memhog_free (struct portals_device_userstate *pdu)
{
- struct page **level0p = &pdu->pdu_memhog_root_page;
- struct page **level1p;
- struct page **level2p;
+ cfs_page_t **level0p = &pdu->pdu_memhog_root_page;
+ cfs_page_t **level1p;
+ cfs_page_t **level2p;
int count1;
int count2;
-
+
if (*level0p != NULL) {
- level1p = (struct page **)page_address(*level0p);
+ level1p = (cfs_page_t **)cfs_page_address(*level0p);
count1 = 0;
-
- while (count1 < PAGE_SIZE/sizeof(struct page *) &&
+
+ while (count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *) &&
*level1p != NULL) {
- level2p = (struct page **)page_address(*level1p);
+ level2p = (cfs_page_t **)cfs_page_address(*level1p);
count2 = 0;
-
- while (count2 < PAGE_SIZE/sizeof(struct page *) &&
+
+ while (count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *) &&
*level2p != NULL) {
-
- __free_page(*level2p);
+
+ cfs_free_page(*level2p);
pdu->pdu_memhog_pages--;
level2p++;
count2++;
}
-
- __free_page(*level1p);
+
+ cfs_free_page(*level1p);
pdu->pdu_memhog_pages--;
level1p++;
count1++;
}
-
- __free_page(*level0p);
+
+ cfs_free_page(*level0p);
pdu->pdu_memhog_pages--;
*level0p = NULL;
}
-
+
LASSERT (pdu->pdu_memhog_pages == 0);
}
int
kportal_memhog_alloc (struct portals_device_userstate *pdu, int npages, int flags)
{
- struct page **level0p;
- struct page **level1p;
- struct page **level2p;
+ cfs_page_t **level0p;
+ cfs_page_t **level1p;
+ cfs_page_t **level2p;
int count1;
int count2;
-
+
LASSERT (pdu->pdu_memhog_pages == 0);
LASSERT (pdu->pdu_memhog_root_page == NULL);
return 0;
level0p = &pdu->pdu_memhog_root_page;
- *level0p = alloc_page(flags);
+ *level0p = cfs_alloc_page(flags);
if (*level0p == NULL)
return -ENOMEM;
pdu->pdu_memhog_pages++;
- level1p = (struct page **)page_address(*level0p);
+ level1p = (cfs_page_t **)cfs_page_address(*level0p);
count1 = 0;
- memset(level1p, 0, PAGE_SIZE);
-
+ memset(level1p, 0, CFS_PAGE_SIZE);
+
while (pdu->pdu_memhog_pages < npages &&
- count1 < PAGE_SIZE/sizeof(struct page *)) {
+ count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) {
- if (signal_pending(current))
+ if (cfs_signal_pending(cfs_current()))
return (-EINTR);
-
- *level1p = alloc_page(flags);
+
+ *level1p = cfs_alloc_page(flags);
if (*level1p == NULL)
return -ENOMEM;
pdu->pdu_memhog_pages++;
- level2p = (struct page **)page_address(*level1p);
+ level2p = (cfs_page_t **)cfs_page_address(*level1p);
count2 = 0;
- memset(level2p, 0, PAGE_SIZE);
-
+ memset(level2p, 0, CFS_PAGE_SIZE);
+
while (pdu->pdu_memhog_pages < npages &&
- count2 < PAGE_SIZE/sizeof(struct page *)) {
-
- if (signal_pending(current))
+ count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) {
+
+ if (cfs_signal_pending(cfs_current()))
return (-EINTR);
- *level2p = alloc_page(flags);
+ *level2p = cfs_alloc_page(flags);
if (*level2p == NULL)
return (-ENOMEM);
pdu->pdu_memhog_pages++;
-
+
level2p++;
count2++;
}
-
+
level1p++;
count1++;
}
return 0;
}
-void
-kportal_blockallsigs ()
-{
- unsigned long flags;
-
- SIGNAL_MASK_LOCK(current, flags);
- sigfillset(¤t->blocked);
- RECALC_SIGPENDING;
- SIGNAL_MASK_UNLOCK(current, flags);
-}
-
/* called when opening /dev/device */
-static int libcfs_psdev_open(struct inode * inode, struct file * file)
+static int libcfs_psdev_open(unsigned long flags, void *args)
{
struct portals_device_userstate *pdu;
ENTRY;
-
- if (!inode)
- RETURN(-EINVAL);
PORTAL_MODULE_USE;
pdu->pdu_memhog_pages = 0;
pdu->pdu_memhog_root_page = NULL;
}
- file->private_data = pdu;
-
+ *(struct portals_device_userstate **)args = pdu;
+
RETURN(0);
}
/* called when closing /dev/device */
-static int libcfs_psdev_release(struct inode * inode, struct file * file)
+static int libcfs_psdev_release(unsigned long flags, void *args)
{
struct portals_device_userstate *pdu;
ENTRY;
- if (!inode)
- RETURN(-EINVAL);
-
- pdu = file->private_data;
+ pdu = (struct portals_device_userstate *)args;
if (pdu != NULL) {
kportal_memhog_free(pdu);
PORTAL_FREE(pdu, sizeof(*pdu));
}
-
+
PORTAL_MODULE_UNUSE;
RETURN(0);
}
PORTAL_FREE(data, len);
}
+struct nal_cmd_handler *
+libcfs_find_nal_cmd_handler(int nal)
+{
+ int i;
+
+ for (i = 0; i < sizeof(nal_cmd)/sizeof(nal_cmd[0]); i++)
+ if (nal_cmd[i].nch_handler != NULL &&
+ nal_cmd[i].nch_number == nal)
+ return (&nal_cmd[i]);
+
+ return (NULL);
+}
+
int
libcfs_nal_cmd_register(int nal, nal_cmd_handler_fn *handler, void *private)
{
- int rc = 0;
+ struct nal_cmd_handler *cmd;
+ int i;
+ int rc;
- CDEBUG(D_IOCTL, "Register NAL %d, handler: %p\n", nal, handler);
+ CDEBUG(D_IOCTL, "Register NAL %x, handler: %p\n", nal, handler);
- 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;
+ mutex_down(&nal_cmd_mutex);
+
+ if (libcfs_find_nal_cmd_handler(nal) != NULL) {
+ mutex_up (&nal_cmd_mutex);
+ return (-EBUSY);
+ }
+
+ cmd = NULL;
+ for (i = 0; i < sizeof(nal_cmd)/sizeof(nal_cmd[0]); i++)
+ if (nal_cmd[i].nch_handler == NULL) {
+ cmd = &nal_cmd[i];
+ break;
}
- up(&nal_cmd_sem);
+
+ if (cmd == NULL) {
+ rc = -EBUSY;
+ } else {
+ rc = 0;
+ cmd->nch_number = nal;
+ cmd->nch_handler = handler;
+ cmd->nch_private = private;
}
+
+ mutex_up(&nal_cmd_mutex);
+
return rc;
}
EXPORT_SYMBOL(libcfs_nal_cmd_register);
void
libcfs_nal_cmd_unregister(int nal)
{
- CDEBUG(D_IOCTL, "Unregister NAL %d\n", nal);
+ struct nal_cmd_handler *cmd;
- LASSERT(nal > 0 && nal <= NAL_MAX_NR);
- LASSERT(nal_cmd[nal].nch_handler != NULL);
+ CDEBUG(D_IOCTL, "Unregister NAL %x\n", nal);
- down(&nal_cmd_sem);
- nal_cmd[nal].nch_handler = NULL;
- nal_cmd[nal].nch_private = NULL;
- up(&nal_cmd_sem);
+ mutex_down(&nal_cmd_mutex);
+ cmd = libcfs_find_nal_cmd_handler(nal);
+ LASSERT (cmd != NULL);
+ cmd->nch_handler = NULL;
+ cmd->nch_private = NULL;
+ mutex_up(&nal_cmd_mutex);
}
EXPORT_SYMBOL(libcfs_nal_cmd_unregister);
int
libcfs_nal_cmd(struct portals_cfg *pcfg)
{
+#if CRAY_PORTALS
+ /* pretend success */
+ RETURN(0);
+#else
+ struct nal_cmd_handler *cmd;
__u32 nal = pcfg->pcfg_nal;
int rc = -EINVAL;
ENTRY;
- down(&nal_cmd_sem);
- if (nal > 0 && nal <= NAL_MAX_NR &&
- nal_cmd[nal].nch_handler != NULL) {
- CDEBUG(D_IOCTL, "calling handler nal: %d, cmd: %d\n", nal,
+ if (pcfg->pcfg_version != PORTALS_CFG_VERSION) {
+ RETURN(-EINVAL);
+ }
+
+ mutex_down(&nal_cmd_mutex);
+ cmd = libcfs_find_nal_cmd_handler(nal);
+ if (cmd != NULL) {
+ CDEBUG(D_IOCTL, "calling handler nal: %x, cmd: %d\n", nal,
pcfg->pcfg_command);
- rc = nal_cmd[nal].nch_handler(pcfg, nal_cmd[nal].nch_private);
+ rc = cmd->nch_handler(pcfg, cmd->nch_private);
+ } else {
+ CERROR("invalid nal: %x, cmd: %d\n", nal, pcfg->pcfg_command);
}
- up(&nal_cmd_sem);
+ mutex_up(&nal_cmd_mutex);
RETURN(rc);
+#endif
}
EXPORT_SYMBOL(libcfs_nal_cmd);
-static DECLARE_RWSEM(ioctl_list_sem);
-static LIST_HEAD(ioctl_list);
+static struct rw_semaphore ioctl_list_sem;
+static struct list_head ioctl_list;
int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand)
{
}
EXPORT_SYMBOL(libcfs_deregister_ioctl);
-static int libcfs_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)
{
+ char buf[1024];
int err = -EINVAL;
- char buf[1024];
struct portal_ioctl_data *data;
ENTRY;
- if (current->fsuid != 0)
- RETURN(err = -EACCES);
-
- 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)) {
CERROR("PORTALS ioctl: data error\n");
- RETURN(-EINVAL);
+ return (-EINVAL);
}
-
data = (struct portal_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();
RETURN(0);
- case IOC_PORTAL_PANIC:
- if (!capable (CAP_SYS_BOOT))
- RETURN (-EPERM);
- panic("debugctl-invoked panic");
- RETURN(0);
+ /*
+ * case IOC_PORTAL_PANIC:
+ * Handled in arch/cfs_module.c
+ */
case IOC_PORTAL_MARK_DEBUG:
if (data->ioc_inlbuf1 == NULL ||
data->ioc_inlbuf1[data->ioc_inllen1 - 1] != '\0')
portals_debug_mark_buffer(data->ioc_inlbuf1);
RETURN(0);
#if LWT_SUPPORT
- case IOC_PORTAL_LWT_CONTROL:
+ case IOC_PORTAL_LWT_CONTROL:
err = lwt_control (data->ioc_flags, data->ioc_misc);
break;
-
+
case IOC_PORTAL_LWT_SNAPSHOT: {
cycles_t now;
int ncpu;
int total_size;
-
+
err = lwt_snapshot (&now, &ncpu, &total_size,
data->ioc_pbuf1, data->ioc_plen1);
data->ioc_nid = now;
data->ioc_count = ncpu;
data->ioc_misc = total_size;
+ /* Hedge against broken user/kernel typedefs (e.g. cycles_t) */
+ data->ioc_nid2 = sizeof(lwt_event_t);
+ data->ioc_nid3 = offsetof(lwt_event_t, lwte_where);
+
if (err == 0 &&
copy_to_user((char *)arg, data, sizeof (*data)))
err = -EFAULT;
break;
}
-
+
case IOC_PORTAL_LWT_LOOKUP_STRING:
err = lwt_lookup_string (&data->ioc_count, data->ioc_pbuf1,
data->ioc_pbuf2, data->ioc_plen2);
struct portals_cfg pcfg;
if (data->ioc_plen1 != sizeof(pcfg)) {
- CERROR("Bad ioc_plen1 %d (wanted %d)\n",
+ CERROR("Bad ioc_plen1 %d (wanted "LPSZ")\n",
data->ioc_plen1, sizeof(pcfg));
err = -EINVAL;
break;
}
- if (copy_from_user(&pcfg, (void *)data->ioc_pbuf1,
+ if (copy_from_user(&pcfg, (void *)data->ioc_pbuf1,
sizeof(pcfg))) {
err = -EFAULT;
break;
}
- CDEBUG (D_IOCTL, "nal command nal %d cmd %d\n", pcfg.pcfg_nal,
+ CDEBUG (D_IOCTL, "nal command nal %x cmd %d\n", pcfg.pcfg_nal,
pcfg.pcfg_command);
- err = libcfs_nal_cmd(&pcfg);
+ if (pcfg.pcfg_version != PORTALS_CFG_VERSION) {
+ /* set this so userspace can tell when they
+ * have an incompatible version and print a
+ * decent message to the user
+ */
+ pcfg.pcfg_version = PORTALS_CFG_VERSION;
+ if (copy_to_user((char *)data->ioc_pbuf1, &pcfg,
+ sizeof (pcfg)))
+ err = -EFAULT;
+ else
+ err = -EINVAL;
+ } else {
+ err = libcfs_nal_cmd(&pcfg);
- if (err == 0 &&
- copy_to_user((char *)data->ioc_pbuf1, &pcfg,
- sizeof (pcfg)))
- err = -EFAULT;
+ if (err == 0 &&
+ copy_to_user((char *)data->ioc_pbuf1, &pcfg,
+ sizeof (pcfg)))
+ err = -EFAULT;
+ }
break;
}
case IOC_PORTAL_MEMHOG:
- if (!capable (CAP_SYS_ADMIN))
- err = -EPERM;
- else if (file->private_data == NULL) {
+ if (pfile->private_data == NULL) {
err = -EINVAL;
} else {
- kportal_memhog_free(file->private_data);
- err = kportal_memhog_alloc(file->private_data,
+ 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(file->private_data);
+ kportal_memhog_free(pfile->private_data);
}
break;
err = -EINVAL;
down_read(&ioctl_list_sem);
list_for_each_entry(hand, &ioctl_list, item) {
- err = hand->handle_ioctl(data, cmd, arg);
+ err = hand->handle_ioctl(data, cmd, (unsigned long)arg);
if (err != -EINVAL)
break;
}
RETURN(err);
}
-
-static struct file_operations libcfs_fops = {
- ioctl: libcfs_ioctl,
- open: libcfs_psdev_open,
- release: libcfs_psdev_release
-};
-
-
-static struct miscdevice libcfs_dev = {
- PORTAL_MINOR,
- "portals",
- &libcfs_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");
+extern cfs_psdev_t libcfs_dev;
+extern struct rw_semaphore tracefile_sem;
+extern struct semaphore trace_thread_sem;
+
+extern int libcfs_arch_init(void);
+extern void libcfs_arch_cleanup(void);
+
static int init_libcfs_module(void)
{
int rc;
+ libcfs_arch_init();
+ init_rwsem(&tracefile_sem);
+ init_mutex(&trace_thread_sem);
+ init_mutex(&nal_cmd_mutex);
+ init_rwsem(&ioctl_list_sem);
+ CFS_INIT_LIST_HEAD(&ioctl_list);
+
rc = portals_debug_init(5 * 1024 * 1024);
if (rc < 0) {
printk(KERN_ERR "LustreError: portals_debug_init: %d\n", rc);
goto cleanup_debug;
}
#endif
- rc = misc_register(&libcfs_dev);
+ rc = cfs_psdev_register(&libcfs_dev);
if (rc) {
CERROR("misc_register: error %d\n", rc);
goto cleanup_lwt;
return (0);
cleanup_deregister:
- misc_deregister(&libcfs_dev);
+ cfs_psdev_deregister(&libcfs_dev);
cleanup_lwt:
#if LWT_SUPPORT
lwt_fini();
CDEBUG(D_MALLOC, "before Portals cleanup: kmem %d\n",
atomic_read(&portal_kmemory));
-
- rc = misc_deregister(&libcfs_dev);
+ rc = cfs_psdev_deregister(&libcfs_dev);
if (rc)
CERROR("misc_deregister error %d\n", rc);
rc = portals_debug_cleanup();
if (rc)
printk(KERN_ERR "LustreError: portals_debug_cleanup: %d\n", rc);
+ libcfs_arch_cleanup();
}
-EXPORT_SYMBOL(kportal_daemonize);
-EXPORT_SYMBOL(kportal_blockallsigs);
EXPORT_SYMBOL(kportal_assertion_failed);
-module_init(init_libcfs_module);
-module_exit(exit_libcfs_module);
+cfs_module(libcfs, "1.0.0", init_libcfs_module, exit_libcfs_module);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff