X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flvfs%2Flvfs_linux.c;h=af03ac743dd5bb3a345b6ce192de261a87ec7c20;hb=a5b81807c5d6d2cb3b2ef1a0a7e150ee6002f7f7;hp=b4fb970dc16cac470c17424dc9a483c5984d269d;hpb=65db67618c743fca01b0a0cf99acea675056e2b5;p=fs%2Flustre-release.git diff --git a/lustre/lvfs/lvfs_linux.c b/lustre/lvfs/lvfs_linux.c index b4fb970..af03ac7 100644 --- a/lustre/lvfs/lvfs_linux.c +++ b/lustre/lvfs/lvfs_linux.c @@ -1,26 +1,41 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * lustre/lib/lvfs_linux.c - * Lustre filesystem abstraction routines + * GPL HEADER START * - * Copyright (C) 2002, 2003 Cluster File Systems, Inc. - * Author: Andreas Dilger + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * This file is part of Lustre, http://www.lustre.org. + * 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. * - * Lustre is free 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. + * 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). * - * 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 - * GNU General Public License for more details. + * 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 * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. + * + * GPL HEADER END + */ +/* + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. 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. + * + * lustre/lvfs/lvfs_linux.c + * + * Author: Andreas Dilger */ #ifndef EXPORT_SYMTAB @@ -36,22 +51,24 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include "lvfs_internal.h" -#include -#include -#include /* for mds_grp_hash_entry */ +#include +#include +#include -atomic_t obd_memory; -int obd_memmax; +__u64 obd_max_pages = 0; +__u64 obd_max_alloc = 0; +struct lprocfs_stats *obd_memory = NULL; +cfs_spinlock_t obd_updatemax_lock = CFS_SPIN_LOCK_UNLOCKED; +/* refine later and change to seqlock or simlar from libcfs */ /* Debugging check only needed during development */ #ifdef OBD_CTXT_DEBUG @@ -59,7 +76,6 @@ int obd_memmax; # define ASSERT_NOT_KERNEL_CTXT(msg) LASSERTF(!segment_eq(get_fs(), get_ds()),\ msg) # define ASSERT_KERNEL_CTXT(msg) LASSERTF(segment_eq(get_fs(), get_ds()), msg) - #else # define ASSERT_CTXT_MAGIC(magic) do {} while(0) # define ASSERT_NOT_KERNEL_CTXT(msg) do {} while(0) @@ -73,24 +89,14 @@ static void push_group_info(struct lvfs_run_ctxt *save, save->ngroups = current_ngroups; current_ngroups = 0; } else { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4) + struct cred *cred; task_lock(current); - save->group_info = current->group_info; - current->group_info = ginfo; + save->group_info = current_cred()->group_info; + if ((cred = prepare_creds())) { + cred->group_info = ginfo; + commit_creds(cred); + } task_unlock(current); -#else - LASSERT(ginfo->ngroups <= NGROUPS); - /* save old */ - save->group_info.ngroups = current->ngroups; - if (current->ngroups) - memcpy(save->group_info.small_block, current->groups, - current->ngroups); - /* push new */ - current->ngroups = ginfo->ngroups; - if (ginfo->ngroups) - memcpy(current->groups, ginfo->small_block, - current->ngroups); -#endif } } @@ -100,16 +106,13 @@ static void pop_group_info(struct lvfs_run_ctxt *save, if (!ginfo) { current_ngroups = save->ngroups; } else { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,4) + struct cred *cred; task_lock(current); - current->group_info = save->group_info; + if ((cred = prepare_creds())) { + cred->group_info = save->group_info; + commit_creds(cred); + } task_unlock(current); -#else - current->ngroups = ginfo->ngroups; - if (current->ngroups) - memcpy(current->groups, save->group_info.small_block, - current->ngroups); -#endif } } @@ -119,28 +122,15 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, { //ASSERT_NOT_KERNEL_CTXT("already in kernel context!\n"); ASSERT_CTXT_MAGIC(new_ctx->magic); - LASSERT(save->magic != OBD_RUN_CTXT_MAGIC || save->pid != current->pid); OBD_SET_CTXT_MAGIC(save); - save->pid = current->pid; - - /* - CDEBUG(D_INFO, - "= push %p->%p = cur fs %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - save, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ save->fs = get_fs(); - LASSERT(atomic_read(¤t->fs->pwd->d_count)); - LASSERT(atomic_read(&new_ctx->pwd->d_count)); - save->pwd = dget(current->fs->pwd); - save->pwdmnt = mntget(current->fs->pwdmnt); - save->ngroups = current_ngroups; - save->luc.luc_umask = current->fs->umask; + LASSERT(cfs_atomic_read(&cfs_fs_pwd(current->fs)->d_count)); + LASSERT(cfs_atomic_read(&new_ctx->pwd->d_count)); + save->pwd = dget(cfs_fs_pwd(current->fs)); + save->pwdmnt = mntget(cfs_fs_mnt(current->fs)); + save->luc.luc_umask = cfs_curproc_umask(); + save->ngroups = current_cred()->group_info->ngroups; LASSERT(save->pwd); LASSERT(save->pwdmnt); @@ -148,88 +138,66 @@ void push_ctxt(struct lvfs_run_ctxt *save, struct lvfs_run_ctxt *new_ctx, LASSERT(new_ctx->pwdmnt); if (uc) { - save->luc.luc_uid = current->uid; - save->luc.luc_gid = current->gid; - save->luc.luc_fsuid = current->fsuid; - save->luc.luc_fsgid = current->fsgid; - save->luc.luc_cap = current->cap_effective; - - current->uid = uc->luc_uid; - current->gid = uc->luc_gid; - current->fsuid = uc->luc_fsuid; - current->fsgid = uc->luc_fsgid; - current->cap_effective = uc->luc_cap; - - push_group_info(save, uc->luc_ginfo); + struct cred *cred; + save->luc.luc_uid = current_uid(); + save->luc.luc_gid = current_gid(); + save->luc.luc_fsuid = current_fsuid(); + save->luc.luc_fsgid = current_fsgid(); + save->luc.luc_cap = current_cap(); + + if ((cred = prepare_creds())) { + cred->uid = uc->luc_uid; + cred->gid = uc->luc_gid; + cred->fsuid = uc->luc_fsuid; + cred->fsgid = uc->luc_fsgid; + cred->cap_effective = uc->luc_cap; + commit_creds(cred); + } + + push_group_info(save, + uc->luc_ginfo ?: + uc->luc_identity ? uc->luc_identity->mi_ginfo : + NULL); } current->fs->umask = 0; /* umask already applied on client */ set_fs(new_ctx->fs); - set_fs_pwd(current->fs, new_ctx->pwdmnt, new_ctx->pwd); - - /* - CDEBUG(D_INFO, - "= push %p->%p = cur fs %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - new_ctx, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ + ll_set_fs_pwd(current->fs, new_ctx->pwdmnt, new_ctx->pwd); } EXPORT_SYMBOL(push_ctxt); void pop_ctxt(struct lvfs_run_ctxt *saved, struct lvfs_run_ctxt *new_ctx, struct lvfs_ucred *uc) { - //printk("pc0"); ASSERT_CTXT_MAGIC(saved->magic); - LASSERT(saved->pid == current->pid); - saved->magic = 0; - saved->pid = 0; - //printk("pc1"); ASSERT_KERNEL_CTXT("popping non-kernel context!\n"); - /* - CDEBUG(D_INFO, - " = pop %p==%p = cur %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - new_ctx, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ - - LASSERT(current->fs->pwd == new_ctx->pwd); - LASSERT(current->fs->pwdmnt == new_ctx->pwdmnt); + LASSERTF(cfs_fs_pwd(current->fs) == new_ctx->pwd, "%p != %p\n", + cfs_fs_pwd(current->fs), new_ctx->pwd); + LASSERTF(cfs_fs_mnt(current->fs) == new_ctx->pwdmnt, "%p != %p\n", + cfs_fs_mnt(current->fs), new_ctx->pwdmnt); set_fs(saved->fs); - set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd); + ll_set_fs_pwd(current->fs, saved->pwdmnt, saved->pwd); dput(saved->pwd); mntput(saved->pwdmnt); current->fs->umask = saved->luc.luc_umask; if (uc) { - current->uid = saved->luc.luc_uid; - current->gid = saved->luc.luc_gid; - current->fsuid = saved->luc.luc_fsuid; - current->fsgid = saved->luc.luc_fsgid; - current->cap_effective = saved->luc.luc_cap; + struct cred *cred; + if ((cred = prepare_creds())) { + cred->uid = saved->luc.luc_uid; + cred->gid = saved->luc.luc_gid; + cred->fsuid = saved->luc.luc_fsuid; + cred->fsgid = saved->luc.luc_fsgid; + cred->cap_effective = saved->luc.luc_cap; + commit_creds(cred); + } - pop_group_info(saved, uc->luc_ginfo); + pop_group_info(saved, + uc->luc_ginfo ?: + uc->luc_identity ? uc->luc_identity->mi_ginfo : + NULL); } - - /* - CDEBUG(D_INFO, - "= pop %p->%p = cur fs %p pwd %p:d%d:i%d (%.*s), pwdmnt %p:%d\n", - saved, current, current->fs, current->fs->pwd, - atomic_read(¤t->fs->pwd->d_count), - atomic_read(¤t->fs->pwd->d_inode->i_count), - current->fs->pwd->d_name.len, current->fs->pwd->d_name.name, - current->fs->pwdmnt, - atomic_read(¤t->fs->pwdmnt->mnt_count)); - */ } EXPORT_SYMBOL(pop_ctxt); @@ -240,7 +208,7 @@ struct dentry *simple_mknod(struct dentry *dir, char *name, int mode, int fix) int err = 0; ENTRY; - ASSERT_KERNEL_CTXT("kernel doing mknod outside kernel context\n"); + // ASSERT_KERNEL_CTXT("kernel doing mknod outside kernel context\n"); CDEBUG(D_INODE, "creating file %.*s\n", (int)strlen(name), name); dchild = ll_lookup_one_len(name, dir, strlen(name)); @@ -279,13 +247,14 @@ out_up: EXPORT_SYMBOL(simple_mknod); /* utility to make a directory */ -struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) +struct dentry *simple_mkdir(struct dentry *dir, struct vfsmount *mnt, + const char *name, int mode, int fix) { struct dentry *dchild; int err = 0; ENTRY; - ASSERT_KERNEL_CTXT("kernel doing mkdir outside kernel context\n"); + // ASSERT_KERNEL_CTXT("kernel doing mkdir outside kernel context\n"); CDEBUG(D_INODE, "creating directory %.*s\n", (int)strlen(name), name); dchild = ll_lookup_one_len(name, dir, strlen(name)); if (IS_ERR(dchild)) @@ -302,8 +271,9 @@ struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) /* Fixup directory permissions if necessary */ if (fix && (old_mode & S_IALLUGO) != (mode & S_IALLUGO)) { - CWARN("fixing permissions on %s from %o to %o\n", - name, old_mode, mode); + CDEBUG(D_CONFIG, + "fixing permissions on %s from %o to %o\n", + name, old_mode, mode); dchild->d_inode->i_mode = (mode & S_IALLUGO) | (old_mode & ~S_IALLUGO); mark_inode_dirty(dchild->d_inode); @@ -311,7 +281,7 @@ struct dentry *simple_mkdir(struct dentry *dir, char *name, int mode, int fix) GOTO(out_up, dchild); } - err = vfs_mkdir(dir->d_inode, dchild, mode); + err = ll_vfs_mkdir(dir->d_inode, dchild, mnt, mode); if (err) GOTO(out_err, err); @@ -325,6 +295,39 @@ out_up: } EXPORT_SYMBOL(simple_mkdir); +/* utility to rename a file */ +int lustre_rename(struct dentry *dir, struct vfsmount *mnt, + char *oldname, char *newname) +{ + struct dentry *dchild_old, *dchild_new; + int err = 0; + ENTRY; + + ASSERT_KERNEL_CTXT("kernel doing rename outside kernel context\n"); + CDEBUG(D_INODE, "renaming file %.*s to %.*s\n", + (int)strlen(oldname), oldname, (int)strlen(newname), newname); + + dchild_old = ll_lookup_one_len(oldname, dir, strlen(oldname)); + if (IS_ERR(dchild_old)) + RETURN(PTR_ERR(dchild_old)); + + if (!dchild_old->d_inode) + GOTO(put_old, err = -ENOENT); + + dchild_new = ll_lookup_one_len(newname, dir, strlen(newname)); + if (IS_ERR(dchild_new)) + GOTO(put_old, err = PTR_ERR(dchild_new)); + + err = ll_vfs_rename(dir->d_inode, dchild_old, mnt, + dir->d_inode, dchild_new, mnt); + + dput(dchild_new); +put_old: + dput(dchild_old); + RETURN(err); +} +EXPORT_SYMBOL(lustre_rename); + /* * Read a file from within kernel context. Prior to calling this * function we should already have done a push_ctxt(). @@ -376,27 +379,31 @@ int lustre_fsync(struct file *file) } EXPORT_SYMBOL(lustre_fsync); +/* Note: dput(dchild) will be called if there is an error */ struct l_file *l_dentry_open(struct lvfs_run_ctxt *ctxt, struct l_dentry *de, int flags) { mntget(ctxt->pwdmnt); - return dentry_open(de, ctxt->pwdmnt, flags); + return ll_dentry_open(de, ctxt->pwdmnt, flags, current_cred()); } EXPORT_SYMBOL(l_dentry_open); static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset, - ino_t ino, unsigned int d_type) + u64 ino, unsigned int d_type) { struct l_linux_dirent *dirent; struct l_readdir_callback *buf = (struct l_readdir_callback *)__buf; - + dirent = buf->lrc_dirent; if (dirent) - dirent->lld_off = offset; + dirent->lld_off = offset; OBD_ALLOC(dirent, sizeof(*dirent)); - list_add_tail(&dirent->lld_list, buf->lrc_list); + if (!dirent) + return -ENOMEM; + + cfs_list_add_tail(&dirent->lld_list, buf->lrc_list); buf->lrc_dirent = dirent; dirent->lld_ino = ino; @@ -406,14 +413,14 @@ static int l_filldir(void *__buf, const char *name, int namlen, loff_t offset, return 0; } -long l_readdir(struct file *file, struct list_head *dentry_list) +long l_readdir(struct file *file, cfs_list_t *dentry_list) { struct l_linux_dirent *lastdirent; struct l_readdir_callback buf; int error; buf.lrc_dirent = NULL; - buf.lrc_list = dentry_list; + buf.lrc_list = dentry_list; error = vfs_readdir(file, l_filldir, &buf); if (error < 0) @@ -423,222 +430,197 @@ long l_readdir(struct file *file, struct list_head *dentry_list) if (lastdirent) lastdirent->lld_off = file->f_pos; - return 0; + return 0; } EXPORT_SYMBOL(l_readdir); -EXPORT_SYMBOL(obd_memory); -EXPORT_SYMBOL(obd_memmax); -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) -static spinlock_t obd_memlist_lock = SPIN_LOCK_UNLOCKED; -static struct hlist_head *obd_memtable; -static unsigned long obd_memtable_size; - -static int lvfs_memdbg_init(int size) +int l_notify_change(struct vfsmount *mnt, struct dentry *dchild, + struct iattr *newattrs) { - struct hlist_head *head; - int i; + int rc; - LASSERT(size > sizeof(sizeof(struct hlist_head))); - obd_memtable_size = size / sizeof(struct hlist_head); + LOCK_INODE_MUTEX(dchild->d_inode); +#ifdef HAVE_SECURITY_PLUG + rc = notify_change(dchild, mnt, newattrs); +#else + rc = notify_change(dchild, newattrs); +#endif + UNLOCK_INODE_MUTEX(dchild->d_inode); + return rc; +} +EXPORT_SYMBOL(l_notify_change); - CWARN("allocating %lu malloc entries...\n", - (unsigned long)obd_memtable_size); +/* utility to truncate a file */ +int simple_truncate(struct dentry *dir, struct vfsmount *mnt, + char *name, loff_t length) +{ + struct dentry *dchild; + struct iattr newattrs; + int err = 0; + ENTRY; - obd_memtable = kmalloc(size, GFP_KERNEL); - if (!obd_memtable) - return -ENOMEM; + CDEBUG(D_INODE, "truncating file %.*s to %lld\n", (int)strlen(name), + name, (long long)length); + dchild = ll_lookup_one_len(name, dir, strlen(name)); + if (IS_ERR(dchild)) + GOTO(out, err = PTR_ERR(dchild)); - i = obd_memtable_size; - head = obd_memtable; - do { - INIT_HLIST_HEAD(head); - head++; - i--; - } while(i); + if (dchild->d_inode) { + int old_mode = dchild->d_inode->i_mode; + if (S_ISDIR(old_mode)) { + CERROR("found %s (%lu/%u) is mode %o\n", name, + dchild->d_inode->i_ino, + dchild->d_inode->i_generation, old_mode); + GOTO(out_dput, err = -EISDIR); + } - return 0; + newattrs.ia_size = length; + newattrs.ia_valid = ATTR_SIZE; + err = l_notify_change(mnt, dchild, &newattrs); + } + EXIT; +out_dput: + dput(dchild); +out: + return err; } +EXPORT_SYMBOL(simple_truncate); -static int lvfs_memdbg_cleanup(void) +#ifdef LUSTRE_KERNEL_VERSION +#ifndef HAVE_CLEAR_RDONLY_ON_PUT +#error rdonly patchset must be updated [cfs bz11248] +#endif +void dev_set_rdonly(lvfs_sbdev_type dev); +int dev_check_rdonly(lvfs_sbdev_type dev); + +void __lvfs_set_rdonly(lvfs_sbdev_type dev, lvfs_sbdev_type jdev) { - struct hlist_node *node = NULL, *tmp = NULL; - struct hlist_head *head; - struct mem_track *mt; - int i; - - spin_lock(&obd_memlist_lock); - for (i = 0, head = obd_memtable; i < obd_memtable_size; i++, head++) { - hlist_for_each_safe(node, tmp, head) { - mt = hlist_entry(node, struct mem_track, m_hash); - hlist_del_init(&mt->m_hash); - kfree(mt); - } + if (jdev && (jdev != dev)) { + CDEBUG(D_IOCTL | D_HA, "set journal dev %lx rdonly\n", + (long)jdev); + dev_set_rdonly(jdev); } - spin_unlock(&obd_memlist_lock); - kfree(obd_memtable); - return 0; + CDEBUG(D_IOCTL | D_HA, "set dev %lx rdonly\n", (long)dev); + dev_set_rdonly(dev); } -static inline unsigned long const hashfn(void *ptr) +int lvfs_check_rdonly(lvfs_sbdev_type dev) { - return (unsigned long)ptr & - (obd_memtable_size - 1); + return dev_check_rdonly(dev); } -static void __lvfs_memdbg_insert(struct mem_track *mt) -{ - struct hlist_head *head = obd_memtable + - hashfn(mt->m_ptr); - hlist_add_head(&mt->m_hash, head); -} +EXPORT_SYMBOL(__lvfs_set_rdonly); +EXPORT_SYMBOL(lvfs_check_rdonly); -void lvfs_memdbg_insert(struct mem_track *mt) +int lvfs_check_io_health(struct obd_device *obd, struct file *file) { - spin_lock(&obd_memlist_lock); - __lvfs_memdbg_insert(mt); - spin_unlock(&obd_memlist_lock); -} -EXPORT_SYMBOL(lvfs_memdbg_insert); + char *write_page = NULL; + loff_t offset = 0; + int rc = 0; + ENTRY; -static void __lvfs_memdbg_remove(struct mem_track *mt) -{ - hlist_del_init(&mt->m_hash); -} + OBD_ALLOC(write_page, CFS_PAGE_SIZE); + if (!write_page) + RETURN(-ENOMEM); -void lvfs_memdbg_remove(struct mem_track *mt) -{ - spin_lock(&obd_memlist_lock); - __lvfs_memdbg_remove(mt); - spin_unlock(&obd_memlist_lock); + rc = fsfilt_write_record(obd, file, write_page, CFS_PAGE_SIZE, &offset, 1); + + OBD_FREE(write_page, CFS_PAGE_SIZE); + + CDEBUG(D_INFO, "write 1 page synchronously for checking io rc %d\n",rc); + RETURN(rc); } -EXPORT_SYMBOL(lvfs_memdbg_remove); +EXPORT_SYMBOL(lvfs_check_io_health); +#endif /* LUSTRE_KERNEL_VERSION */ -static struct mem_track *__lvfs_memdbg_find(void *ptr) +void obd_update_maxusage() { - struct hlist_node *node = NULL; - struct mem_track *mt = NULL; - struct hlist_head *head; + __u64 max1, max2; - head = obd_memtable + hashfn(ptr); + max1 = obd_pages_sum(); + max2 = obd_memory_sum(); + + cfs_spin_lock(&obd_updatemax_lock); + if (max1 > obd_max_pages) + obd_max_pages = max1; + if (max2 > obd_max_alloc) + obd_max_alloc = max2; + cfs_spin_unlock(&obd_updatemax_lock); - hlist_for_each(node, head) { - mt = hlist_entry(node, struct mem_track, m_hash); - if ((unsigned long)mt->m_ptr == (unsigned long)ptr) - break; - mt = NULL; - } - return mt; } -struct mem_track *lvfs_memdbg_find(void *ptr) +__u64 obd_memory_max(void) { - struct mem_track *mt; + __u64 ret; - spin_lock(&obd_memlist_lock); - mt = __lvfs_memdbg_find(ptr); - spin_unlock(&obd_memlist_lock); - - return mt; -} -EXPORT_SYMBOL(lvfs_memdbg_find); + cfs_spin_lock(&obd_updatemax_lock); + ret = obd_max_alloc; + cfs_spin_unlock(&obd_updatemax_lock); -int lvfs_memdbg_check_insert(struct mem_track *mt) -{ - spin_lock(&obd_memlist_lock); - if (!__lvfs_memdbg_find(mt->m_ptr)) { - __lvfs_memdbg_insert(mt); - spin_unlock(&obd_memlist_lock); - return 1; - } - spin_unlock(&obd_memlist_lock); - return 0; + return ret; } -EXPORT_SYMBOL(lvfs_memdbg_check_insert); -struct mem_track * -lvfs_memdbg_check_remove(void *ptr) +__u64 obd_pages_max(void) { - struct mem_track *mt; - - spin_lock(&obd_memlist_lock); - mt = __lvfs_memdbg_find(ptr); - if (mt) { - __lvfs_memdbg_remove(mt); - spin_unlock(&obd_memlist_lock); - return mt; - } - spin_unlock(&obd_memlist_lock); - return NULL; -} -EXPORT_SYMBOL(lvfs_memdbg_check_remove); -#endif + __u64 ret; -void lvfs_memdbg_show(void) -{ -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) - struct hlist_node *node = NULL; - struct hlist_head *head; - struct mem_track *mt; -#endif - int leaked; - -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) - int i; -#endif + cfs_spin_lock(&obd_updatemax_lock); + ret = obd_max_pages; + cfs_spin_unlock(&obd_updatemax_lock); - leaked = atomic_read(&obd_memory); - - if (leaked > 0) { - CWARN("memory leaks detected (max %d, leaked %d)\n", - obd_memmax, leaked); - -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) - spin_lock(&obd_memlist_lock); - for (i = 0, head = obd_memtable; i < obd_memtable_size; i++, head++) { - hlist_for_each(node, head) { - mt = hlist_entry(node, struct mem_track, m_hash); - CWARN(" [%s] ptr: 0x%p, size: %d, src at \"%s\"\n", - ((mt->m_flags & MT_FLAGS_WRONG_SIZE) ? - "wrong ck size" : "leaked memory"), - mt->m_ptr, mt->m_size, mt->m_loc); - } - } - spin_unlock(&obd_memlist_lock); -#endif - /* remove for production */ - portals_debug_dumplog(); - } + return ret; } -EXPORT_SYMBOL(lvfs_memdbg_show); -static int __init lvfs_linux_init(void) -{ - ENTRY; -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) - lvfs_memdbg_init(PAGE_SIZE); -#endif - lvfs_mount_list_init(); - RETURN(0); -} +EXPORT_SYMBOL(obd_update_maxusage); +EXPORT_SYMBOL(obd_pages_max); +EXPORT_SYMBOL(obd_memory_max); +EXPORT_SYMBOL(obd_memory); -static void __exit lvfs_linux_exit(void) +#ifdef LPROCFS +__s64 lprocfs_read_helper(struct lprocfs_counter *lc, + enum lprocfs_fields_flags field) { - ENTRY; - - lvfs_mount_list_cleanup(); - lvfs_memdbg_show(); + __s64 ret = 0; + int centry; -#if defined (CONFIG_DEBUG_MEMORY) && defined(__KERNEL__) - lvfs_memdbg_cleanup(); -#endif - EXIT; - return; + if (!lc) + RETURN(0); + do { + centry = cfs_atomic_read(&lc->lc_cntl.la_entry); + + switch (field) { + case LPROCFS_FIELDS_FLAGS_CONFIG: + ret = lc->lc_config; + break; + case LPROCFS_FIELDS_FLAGS_SUM: + ret = lc->lc_sum + lc->lc_sum_irq; + break; + case LPROCFS_FIELDS_FLAGS_MIN: + ret = lc->lc_min; + break; + case LPROCFS_FIELDS_FLAGS_MAX: + ret = lc->lc_max; + break; + case LPROCFS_FIELDS_FLAGS_AVG: + ret = (lc->lc_max - lc->lc_min)/2; + break; + case LPROCFS_FIELDS_FLAGS_SUMSQUARE: + ret = lc->lc_sumsquare; + break; + case LPROCFS_FIELDS_FLAGS_COUNT: + ret = lc->lc_count; + break; + default: + break; + }; + } while (centry != cfs_atomic_read(&lc->lc_cntl.la_entry) && + centry != cfs_atomic_read(&lc->lc_cntl.la_exit)); + + RETURN(ret); } +EXPORT_SYMBOL(lprocfs_read_helper); +#endif /* LPROCFS */ -MODULE_AUTHOR("Cluster File Systems, Inc. "); +MODULE_AUTHOR("Sun Microsystems, Inc. "); MODULE_DESCRIPTION("Lustre VFS Filesystem Helper v0.1"); MODULE_LICENSE("GPL"); - -module_init(lvfs_linux_init); -module_exit(lvfs_linux_exit);