X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fclass_obd.c;h=498ae5a2eb0ef78cb954f8068a3d55b8da97641b;hp=62ac5d31ee18e4019dd4acd789e19c9483e96abf;hb=f123480738a0eba0372053e069089190a5e13bca;hpb=de3c3fdf2597ba110a5247e271470b5dd626df75 diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c index 62ac5d3..498ae5a 100644 --- a/lustre/obdclass/class_obd.c +++ b/lustre/obdclass/class_obd.c @@ -1,30 +1,37 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Object Devices Class Driver + * GPL HEADER START * - * Copyright (C) 2001-2003 Cluster File Systems, Inc. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of the Lustre file system, http://www.lustre.org - * Lustre is a trademark of Cluster File Systems, Inc. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * You may have signed or agreed to another license before downloading - * this software. If so, you are bound by the terms and conditions - * of that agreement, and the following does not apply to you. See the - * LICENSE file included with this distribution for more information. + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * If you did not agree to a different license, then this copy of Lustre - * is open source software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf * - * In either case, Lustre is distributed in the hope that it will be - * useful, but WITHOUT ANY WARRANTY; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * license text for more details. + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. * - * These are the only exported functions, they provide some generic - * infrastructure for managing object devices + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_CLASS @@ -69,6 +76,7 @@ unsigned int obd_timeout = OBD_TIMEOUT_DEFAULT; /* seconds */ unsigned int ldlm_timeout = LDLM_TIMEOUT_DEFAULT; /* seconds */ unsigned int obd_max_dirty_pages = 256; atomic_t obd_dirty_pages; +atomic_t obd_dirty_transit_pages; cfs_waitq_t obd_race_waitq; int obd_race_state; @@ -80,11 +88,6 @@ unsigned long obd_print_fail_loc(void) return obd_fail_loc; } -void obd_set_fail_loc(unsigned int fl) -{ - obd_fail_loc = fl; -} - /* opening /dev/obd */ static int obd_class_open(unsigned long flags, void *args) { @@ -280,7 +283,7 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) CERROR("ioctl buffer too small to hold version\n"); GOTO(out, err = -EINVAL); } - + obd = class_num2obd(index); if (!obd) GOTO(out, err = -ENOENT); @@ -305,12 +308,19 @@ int class_handle_ioctl(unsigned int cmd, unsigned long arg) } - if (data->ioc_dev >= class_devno_max()) { + if (data->ioc_dev == OBD_DEV_BY_DEVNAME) { + if (data->ioc_inllen4 <= 0 || data->ioc_inlbuf4 == NULL) + GOTO(out, err = -EINVAL); + if (strnlen(data->ioc_inlbuf4, MAX_OBD_NAME) >= MAX_OBD_NAME) + GOTO(out, err = -EINVAL); + obd = class_name2obd(data->ioc_inlbuf4); + } else if (data->ioc_dev < class_devno_max()) { + obd = class_num2obd(data->ioc_dev); + } else { CERROR("OBD ioctl: No device\n"); GOTO(out, err = -EINVAL); } - obd = class_num2obd(data->ioc_dev); if (obd == NULL) { CERROR("OBD ioctl : No Device %d\n", data->ioc_dev); GOTO(out, err = -EINVAL); @@ -388,6 +398,7 @@ EXPORT_SYMBOL(obd_timeout); EXPORT_SYMBOL(ldlm_timeout); EXPORT_SYMBOL(obd_max_dirty_pages); EXPORT_SYMBOL(obd_dirty_pages); +EXPORT_SYMBOL(obd_dirty_transit_pages); EXPORT_SYMBOL(ptlrpc_put_connection_superhack); EXPORT_SYMBOL(proc_lustre_root); @@ -401,7 +412,6 @@ EXPORT_SYMBOL(class_name2obd); EXPORT_SYMBOL(class_uuid2dev); EXPORT_SYMBOL(class_uuid2obd); EXPORT_SYMBOL(class_find_client_obd); -EXPORT_SYMBOL(class_find_client_notype); EXPORT_SYMBOL(class_devices_in_group); EXPORT_SYMBOL(class_conn2export); EXPORT_SYMBOL(class_exp2obd); @@ -529,34 +539,30 @@ int init_obdclass(void) #ifdef __KERNEL__ int lustre_register_fs(void); - printk(KERN_INFO "Lustre: OBD class driver, info@clusterfs.com\n"); - printk(KERN_INFO " Lustre Version: "LUSTRE_VERSION_STRING"\n"); - printk(KERN_INFO " Build Version: "BUILD_VERSION"\n"); - for (i = CAPA_SITE_CLIENT; i < CAPA_SITE_MAX; i++) CFS_INIT_LIST_HEAD(&capa_list[i]); -#else - CDEBUG(D_INFO, "Lustre: OBD class driver, info@clusterfs.com\n"); - CDEBUG(D_INFO, " Lustre Version: "LUSTRE_VERSION_STRING"\n"); - CDEBUG(D_INFO, " Build Version: "BUILD_VERSION"\n"); #endif + LCONSOLE_INFO("OBD class driver, http://www.lustre.org/\n"); + LCONSOLE_INFO(" Lustre Version: "LUSTRE_VERSION_STRING"\n"); + LCONSOLE_INFO(" Build Version: "BUILD_VERSION"\n"); + spin_lock_init(&obd_types_lock); cfs_waitq_init(&obd_race_waitq); obd_zombie_impexp_init(); #ifdef LPROCFS - obd_memory = lprocfs_alloc_stats(OBD_STATS_NUM, - LPROCFS_STATS_FLAG_PERCPU); + obd_memory = lprocfs_alloc_stats(OBD_STATS_NUM, + LPROCFS_STATS_FLAG_NONE); if (obd_memory == NULL) { CERROR("kmalloc of 'obd_memory' failed\n"); RETURN(-ENOMEM); } - + lprocfs_counter_init(obd_memory, OBD_MEMORY_STAT, - LPROCFS_CNTR_AVGMINMAX, + LPROCFS_CNTR_AVGMINMAX, "memused", "bytes"); lprocfs_counter_init(obd_memory, OBD_MEMORY_PAGES_STAT, - LPROCFS_CNTR_AVGMINMAX, + LPROCFS_CNTR_AVGMINMAX, "pagesused", "pages"); #endif err = obd_init_checks(); @@ -577,23 +583,32 @@ int init_obdclass(void) return err; } - /* This struct is already zerod for us (static global) */ + /* This struct is already zeroed for us (static global) */ for (i = 0; i < class_devno_max(); i++) obd_devs[i] = NULL; - /* Default the dirty page cache cap to 1/2 of system memory */ - obd_max_dirty_pages = num_physpages / 2; + /* Default the dirty page cache cap to 1/2 of system memory. + * For clients with less memory, a larger fraction is needed + * for other purposes (mostly for BGL). */ + if (num_physpages <= 512 << (20 - CFS_PAGE_SHIFT)) + obd_max_dirty_pages = num_physpages / 4; + else + obd_max_dirty_pages = num_physpages / 2; err = obd_init_caches(); if (err) return err; #ifdef __KERNEL__ - err = lu_global_init(); + err = class_procfs_init(); if (err) return err; - err = class_procfs_init(); +#endif + + err = lu_global_init(); if (err) return err; + +#ifdef __KERNEL__ err = lustre_register_fs(); #endif @@ -636,24 +651,22 @@ static void cleanup_obdclass(void) memory_leaked = obd_memory_sum(); pages_leaked = obd_pages_sum(); - + memory_max = obd_memory_max(); pages_max = obd_pages_max(); lprocfs_free_stats(&obd_memory); - if (memory_leaked > 0) { - CWARN("Memory leaks detected (max "LPU64", leaked "LPD64")\n", - memory_max, memory_leaked); - } - if (pages_leaked > 0) { - CWARN("Page leaks detected (max "LPU64", leaked "LPU64")\n", - pages_max, pages_leaked); - } - + CDEBUG((memory_leaked) ? D_ERROR : D_INFO, + "obd_memory max: "LPU64", leaked: "LPU64"\n", + memory_max, memory_leaked); + CDEBUG((pages_leaked) ? D_ERROR : D_INFO, + "obd_memory_pages max: "LPU64", leaked: "LPU64"\n", + pages_max, pages_leaked); + EXIT; } -MODULE_AUTHOR("Cluster File Systems, Inc. "); +MODULE_AUTHOR("Sun Microsystems, Inc. "); MODULE_DESCRIPTION("Lustre Class Driver Build Version: " BUILD_VERSION); MODULE_LICENSE("GPL");