X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Fmodule.c;h=8eeca56a8f44738ddab9428fa0aebe6c477f8d72;hb=da677c1c4f37886ff7b8d31396645b12365c0e88;hp=757723e7f926715e3031e021172a36773ae44f9b;hpb=617e8e1229637908d4cce6725878dd5668960420;p=fs%2Flustre-release.git diff --git a/libcfs/libcfs/module.c b/libcfs/libcfs/module.c index 757723e..8eeca56 100644 --- a/libcfs/libcfs/module.c +++ b/libcfs/libcfs/module.c @@ -26,18 +26,23 @@ /* * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ * Lustre is a trademark of Sun Microsystems, Inc. */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif #define DEBUG_SUBSYSTEM S_LNET +/* TODO - This will be completed in the subsequent patches. + * For this patch the MAX is hardcoded, in the next patch + * the value will be set to the largest data structure that + * can be sent from user space */ +#define LIBCFS_MAX_IOCTL_BUF_LEN 2048 #include +#include #include #include #include "tracefile.h" @@ -45,310 +50,301 @@ void kportal_memhog_free (struct libcfs_device_userstate *ldu) { - cfs_page_t **level0p = &ldu->ldu_memhog_root_page; - cfs_page_t **level1p; - cfs_page_t **level2p; - int count1; - int count2; - - if (*level0p != NULL) { + struct page **level0p = &ldu->ldu_memhog_root_page; + struct page **level1p; + struct page **level2p; + int count1; + int count2; - level1p = (cfs_page_t **)cfs_page_address(*level0p); - count1 = 0; + if (*level0p != NULL) { + level1p = (struct page **)page_address(*level0p); + count1 = 0; - while (count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *) && - *level1p != NULL) { + while (count1 < PAGE_CACHE_SIZE/sizeof(struct page *) && + *level1p != NULL) { - level2p = (cfs_page_t **)cfs_page_address(*level1p); - count2 = 0; + level2p = (struct page **)page_address(*level1p); + count2 = 0; - while (count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *) && - *level2p != NULL) { + while (count2 < PAGE_CACHE_SIZE/sizeof(struct page *) && + *level2p != NULL) { - cfs_free_page(*level2p); - ldu->ldu_memhog_pages--; - level2p++; - count2++; - } + __free_page(*level2p); + ldu->ldu_memhog_pages--; + level2p++; + count2++; + } - cfs_free_page(*level1p); - ldu->ldu_memhog_pages--; - level1p++; - count1++; - } + __free_page(*level1p); + ldu->ldu_memhog_pages--; + level1p++; + count1++; + } - cfs_free_page(*level0p); - ldu->ldu_memhog_pages--; + __free_page(*level0p); + ldu->ldu_memhog_pages--; - *level0p = NULL; - } + *level0p = NULL; + } - LASSERT (ldu->ldu_memhog_pages == 0); + LASSERT(ldu->ldu_memhog_pages == 0); } int -kportal_memhog_alloc (struct libcfs_device_userstate *ldu, int npages, int flags) +kportal_memhog_alloc(struct libcfs_device_userstate *ldu, int npages, + gfp_t flags) { - cfs_page_t **level0p; - cfs_page_t **level1p; - cfs_page_t **level2p; - int count1; - int count2; + struct page **level0p; + struct page **level1p; + struct page **level2p; + int count1; + int count2; - LASSERT (ldu->ldu_memhog_pages == 0); - LASSERT (ldu->ldu_memhog_root_page == NULL); + LASSERT(ldu->ldu_memhog_pages == 0); + LASSERT(ldu->ldu_memhog_root_page == NULL); - if (npages < 0) - return -EINVAL; + if (npages < 0) + return -EINVAL; - if (npages == 0) - return 0; + if (npages == 0) + return 0; - level0p = &ldu->ldu_memhog_root_page; - *level0p = cfs_alloc_page(flags); - if (*level0p == NULL) - return -ENOMEM; - ldu->ldu_memhog_pages++; + level0p = &ldu->ldu_memhog_root_page; + *level0p = alloc_page(flags); + if (*level0p == NULL) + return -ENOMEM; + ldu->ldu_memhog_pages++; - level1p = (cfs_page_t **)cfs_page_address(*level0p); - count1 = 0; - memset(level1p, 0, CFS_PAGE_SIZE); + level1p = (struct page **)page_address(*level0p); + count1 = 0; + memset(level1p, 0, PAGE_CACHE_SIZE); - while (ldu->ldu_memhog_pages < npages && - count1 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) { + while (ldu->ldu_memhog_pages < npages && + count1 < PAGE_CACHE_SIZE/sizeof(struct page *)) { - if (cfs_signal_pending()) - return (-EINTR); + if (cfs_signal_pending()) + return -EINTR; - *level1p = cfs_alloc_page(flags); - if (*level1p == NULL) - return -ENOMEM; - ldu->ldu_memhog_pages++; + *level1p = alloc_page(flags); + if (*level1p == NULL) + return -ENOMEM; + ldu->ldu_memhog_pages++; - level2p = (cfs_page_t **)cfs_page_address(*level1p); - count2 = 0; - memset(level2p, 0, CFS_PAGE_SIZE); + level2p = (struct page **)page_address(*level1p); + count2 = 0; + memset(level2p, 0, PAGE_CACHE_SIZE); - while (ldu->ldu_memhog_pages < npages && - count2 < CFS_PAGE_SIZE/sizeof(cfs_page_t *)) { + while (ldu->ldu_memhog_pages < npages && + count2 < PAGE_CACHE_SIZE/sizeof(struct page *)) { - if (cfs_signal_pending()) - return (-EINTR); + if (cfs_signal_pending()) + return -EINTR; - *level2p = cfs_alloc_page(flags); - if (*level2p == NULL) - return (-ENOMEM); - ldu->ldu_memhog_pages++; + *level2p = alloc_page(flags); + if (*level2p == NULL) + return -ENOMEM; + ldu->ldu_memhog_pages++; - level2p++; - count2++; - } + level2p++; + count2++; + } - level1p++; - count1++; - } + level1p++; + count1++; + } - return 0; + return 0; } /* called when opening /dev/device */ static int libcfs_psdev_open(unsigned long flags, void *args) { - struct libcfs_device_userstate *ldu; - ENTRY; + struct libcfs_device_userstate *ldu; + ENTRY; - PORTAL_MODULE_USE; + try_module_get(THIS_MODULE); - 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; + 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); + RETURN(0); } /* called when closing /dev/device */ static int libcfs_psdev_release(unsigned long flags, void *args) { - struct libcfs_device_userstate *ldu; - ENTRY; + struct libcfs_device_userstate *ldu; + ENTRY; - ldu = (struct libcfs_device_userstate *)args; - if (ldu != NULL) { - kportal_memhog_free(ldu); - LIBCFS_FREE(ldu, sizeof(*ldu)); - } + ldu = (struct libcfs_device_userstate *)args; + if (ldu != NULL) { + kportal_memhog_free(ldu); + LIBCFS_FREE(ldu, sizeof(*ldu)); + } - PORTAL_MODULE_UNUSE; - RETURN(0); + module_put(THIS_MODULE); + RETURN(0); } -static cfs_rw_semaphore_t ioctl_list_sem; -static cfs_list_t ioctl_list; +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; + int rc = 0; - cfs_down_write(&ioctl_list_sem); - if (!cfs_list_empty(&hand->item)) - rc = -EBUSY; - else - cfs_list_add_tail(&hand->item, &ioctl_list); - cfs_up_write(&ioctl_list_sem); + 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); - return rc; + return rc; } EXPORT_SYMBOL(libcfs_register_ioctl); int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand) { - int rc = 0; + int rc = 0; - cfs_down_write(&ioctl_list_sem); - if (cfs_list_empty(&hand->item)) - rc = -ENOENT; - else - cfs_list_del_init(&hand->item); - cfs_up_write(&ioctl_list_sem); + down_write(&ioctl_list_sem); + if (list_empty(&hand->item)) + rc = -ENOENT; + else + list_del_init(&hand->item); + up_write(&ioctl_list_sem); - return rc; + return rc; } EXPORT_SYMBOL(libcfs_deregister_ioctl); -static int libcfs_ioctl_int(struct cfs_psdev_file *pfile,unsigned long cmd, - void *arg, struct libcfs_ioctl_data *data) +static int libcfs_ioctl_handle(struct cfs_psdev_file *pfile, unsigned long cmd, + void *arg, struct libcfs_ioctl_hdr *hdr) { - int err = -EINVAL; - ENTRY; - - switch (cmd) { - case IOC_LIBCFS_CLEAR_DEBUG: - libcfs_debug_clear_buffer(); - RETURN(0); - /* - * 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); - libcfs_debug_mark_buffer(data->ioc_inlbuf1); - RETURN(0); -#if LWT_SUPPORT - case IOC_LIBCFS_LWT_CONTROL: - err = lwt_control ((data->ioc_flags & 1) != 0, - (data->ioc_flags & 2) != 0); - break; - - case IOC_LIBCFS_LWT_SNAPSHOT: { - cfs_cycles_t now; - int ncpu; - int total_size; - - 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; - - /* 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); - - if (err == 0 && - libcfs_ioctl_popdata(arg, data, sizeof (*data))) - err = -EFAULT; - break; - } - - 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 && - libcfs_ioctl_popdata(arg, data, sizeof (*data))) - err = -EFAULT; - break; -#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; - cfs_down_read(&ioctl_list_sem); - cfs_list_for_each_entry_typed(hand, &ioctl_list, - struct libcfs_ioctl_handler, item) { - err = hand->handle_ioctl(cmd, data); - if (err != -EINVAL) { - if (err == 0) - err = libcfs_ioctl_popdata(arg, - data, sizeof (*data)); - break; - } - } - cfs_up_read(&ioctl_list_sem); - break; - } - } - - RETURN(err); + struct libcfs_ioctl_data *data = NULL; + int err; + ENTRY; + + /* TODO: this is going to change in subsequent patches + * to exclude messages which use the new data structures */ + if ((cmd <= IOC_LIBCFS_LNETST) || + (cmd >= IOC_LIBCFS_REGISTER_MYNID)) { + data = container_of(hdr, struct libcfs_ioctl_data, ioc_hdr); + err = libcfs_ioctl_data_adjust(data); + if (err != 0) { + RETURN(err); + } + } + + switch (cmd) { + case IOC_LIBCFS_CLEAR_DEBUG: + libcfs_debug_clear_buffer(); + RETURN(0); + /* + * 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); + libcfs_debug_mark_buffer(data->ioc_inlbuf1); + RETURN(0); + 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 = symbol_get(kping_client); + if (!ping) { + CERROR("symbol_get failed\n"); + } else { + ping(data); + 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, hdr); + if (err != -EINVAL) { + if (err == 0) + err = libcfs_ioctl_popdata(arg, + hdr, hdr->ioc_len); + break; + } + } + up_read(&ioctl_list_sem); + break; + } + } + + RETURN(err); } -static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *arg) +static int libcfs_ioctl(struct cfs_psdev_file *pfile, + unsigned long cmd, void *arg) { - char *buf; - struct libcfs_ioctl_data *data; - int err = 0; - ENTRY; - - LIBCFS_ALLOC_GFP(buf, 1024, CFS_ALLOC_STD); - if (buf == NULL) - RETURN(-ENOMEM); - - /* 'cmd' and permissions get checked in our arch-specific caller */ - if (libcfs_ioctl_getdata(buf, buf + 800, (void *)arg)) { - CERROR("PORTALS ioctl: data error\n"); - GOTO(out, err = -EINVAL); - } - data = (struct libcfs_ioctl_data *)buf; - - err = libcfs_ioctl_int(pfile, cmd, arg, data); + struct libcfs_ioctl_hdr *hdr; + int err = 0; + __u32 buf_len; + ENTRY; + + err = libcfs_ioctl_getdata_len(arg, &buf_len); + if (err != 0) + RETURN(err); + + /* + * do a check here to restrict the size of the memory + * to allocate to guard against DoS attacks. + */ + if (buf_len > LIBCFS_MAX_IOCTL_BUF_LEN) { + CERROR("LNET: user buffer exceeds kernel buffer\n"); + RETURN(-EINVAL); + } + + LIBCFS_ALLOC_GFP(hdr, buf_len, GFP_IOFS); + if (hdr == NULL) + RETURN(-ENOMEM); + + /* 'cmd' and permissions get checked in our arch-specific caller */ + if (libcfs_ioctl_getdata(hdr, buf_len, arg)) { + CERROR("LNET ioctl: data error\n"); + GOTO(out, err = -EINVAL); + } + + err = libcfs_ioctl_handle(pfile, cmd, arg, hdr); out: - LIBCFS_FREE(buf, 1024); - RETURN(err); + LIBCFS_FREE(hdr, buf_len); + RETURN(err); } @@ -366,9 +362,10 @@ MODULE_AUTHOR("Peter J. Braam "); MODULE_DESCRIPTION("Portals v3.1"); MODULE_LICENSE("GPL"); -extern cfs_psdev_t libcfs_dev; -extern cfs_rw_semaphore_t cfs_tracefile_sem; -extern cfs_mutex_t cfs_trace_thread_mutex; +extern struct miscdevice libcfs_dev; +extern struct rw_semaphore cfs_tracefile_sem; +extern struct mutex cfs_trace_thread_mutex; +extern struct cfs_wi_sched *cfs_sched_rehash; extern void libcfs_init_nidstrings(void); extern int libcfs_arch_init(void); @@ -376,99 +373,111 @@ extern void libcfs_arch_cleanup(void); static int init_libcfs_module(void) { - int rc; - - libcfs_arch_init(); - libcfs_init_nidstrings(); - cfs_init_rwsem(&cfs_tracefile_sem); - cfs_mutex_init(&cfs_trace_thread_mutex); - cfs_init_rwsem(&ioctl_list_sem); - CFS_INIT_LIST_HEAD(&ioctl_list); - cfs_waitq_init(&cfs_race_waitq); - - rc = libcfs_debug_init(5 * 1024 * 1024); - if (rc < 0) { - printk(CFS_KERN_ERR "LustreError: libcfs_debug_init: %d\n", rc); - return (rc); - } + int rc; + + libcfs_arch_init(); + libcfs_init_nidstrings(); + init_rwsem(&cfs_tracefile_sem); + mutex_init(&cfs_trace_thread_mutex); + init_rwsem(&ioctl_list_sem); + INIT_LIST_HEAD(&ioctl_list); + init_waitqueue_head(&cfs_race_waitq); + + rc = libcfs_debug_init(5 * 1024 * 1024); + if (rc < 0) { + printk(KERN_ERR "LustreError: libcfs_debug_init: %d\n", rc); + return (rc); + } rc = cfs_cpu_init(); if (rc != 0) goto cleanup_debug; -#if LWT_SUPPORT - rc = lwt_init(); - if (rc != 0) { - CERROR("lwt_init: error %d\n", rc); - goto cleanup_debug; - } -#endif - rc = cfs_psdev_register(&libcfs_dev); - if (rc) { - CERROR("misc_register: error %d\n", rc); - goto cleanup_lwt; - } - - rc = cfs_wi_startup(); - if (rc) { - CERROR("startup workitem: error %d\n", rc); - goto cleanup_deregister; - } - - rc = insert_proc(); - if (rc) { - CERROR("insert_proc: error %d\n", rc); - goto cleanup_wi; - } - - CDEBUG (D_OTHER, "portals setup OK\n"); - return (0); - - cleanup_wi: - cfs_wi_shutdown(); - cleanup_deregister: - cfs_psdev_deregister(&libcfs_dev); - cleanup_lwt: -#if LWT_SUPPORT - lwt_fini(); -#endif - cleanup_debug: - libcfs_debug_cleanup(); - return rc; + rc = misc_register(&libcfs_dev); + if (rc) { + CERROR("misc_register: error %d\n", rc); + goto cleanup_cpu; + } + + rc = cfs_wi_startup(); + if (rc) { + CERROR("initialize workitem: error %d\n", rc); + goto cleanup_deregister; + } + + /* max to 4 threads, should be enough for rehash */ + rc = min(cfs_cpt_weight(cfs_cpt_table, CFS_CPT_ANY), 4); + rc = cfs_wi_sched_create("cfs_rh", cfs_cpt_table, CFS_CPT_ANY, + rc, &cfs_sched_rehash); + if (rc != 0) { + CERROR("Startup workitem scheduler: error: %d\n", rc); + goto cleanup_deregister; + } + + rc = cfs_crypto_register(); + if (rc) { + CERROR("cfs_crypto_regster: error %d\n", rc); + goto cleanup_wi; + } + + + rc = insert_proc(); + if (rc) { + CERROR("insert_proc: error %d\n", rc); + goto cleanup_crypto; + } + + CDEBUG (D_OTHER, "portals setup OK\n"); + return 0; +cleanup_crypto: + cfs_crypto_unregister(); +cleanup_wi: + cfs_wi_shutdown(); +cleanup_deregister: + misc_deregister(&libcfs_dev); +cleanup_cpu: + cfs_cpu_fini(); +cleanup_debug: + libcfs_debug_cleanup(); + return rc; } static void exit_libcfs_module(void) { - int rc; + int rc; + + remove_proc(); + + CDEBUG(D_MALLOC, "before Portals cleanup: kmem %d\n", + atomic_read(&libcfs_kmemory)); - remove_proc(); + if (cfs_sched_rehash != NULL) { + cfs_wi_sched_destroy(cfs_sched_rehash); + cfs_sched_rehash = NULL; + } - CDEBUG(D_MALLOC, "before Portals cleanup: kmem %d\n", - cfs_atomic_read(&libcfs_kmemory)); + cfs_crypto_unregister(); + cfs_wi_shutdown(); - cfs_wi_shutdown(); - rc = cfs_psdev_deregister(&libcfs_dev); - if (rc) - CERROR("misc_deregister error %d\n", rc); + rc = misc_deregister(&libcfs_dev); + if (rc) + CERROR("misc_deregister error %d\n", rc); -#if LWT_SUPPORT - lwt_fini(); -#endif cfs_cpu_fini(); - if (cfs_atomic_read(&libcfs_kmemory) != 0) - CERROR("Portals memory leaked: %d bytes\n", - cfs_atomic_read(&libcfs_kmemory)); + if (atomic_read(&libcfs_kmemory) != 0) + CERROR("Portals memory leaked: %d bytes\n", + atomic_read(&libcfs_kmemory)); - rc = libcfs_debug_cleanup(); - if (rc) - printk(CFS_KERN_ERR "LustreError: libcfs_debug_cleanup: %d\n", - rc); + rc = libcfs_debug_cleanup(); + if (rc) + printk(KERN_ERR "LustreError: libcfs_debug_cleanup: %d\n", + rc); - cfs_fini_rwsem(&ioctl_list_sem); - cfs_fini_rwsem(&cfs_tracefile_sem); + fini_rwsem(&ioctl_list_sem); + fini_rwsem(&cfs_tracefile_sem); - libcfs_arch_cleanup(); + libcfs_arch_cleanup(); } cfs_module(libcfs, "1.0.0", init_libcfs_module, exit_libcfs_module);