X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Flproc_mgs.c;h=7020470c31d77f2dd12972063820625e9423a4b8;hb=4af3ab1945fd1ac6cc9870d72734c37a000a0999;hp=b3fae3516468dc5de218208c52f2f14101d0e2b1;hpb=488f69f7e1fb55209ae65761f6e1a0fe9270587c;p=fs%2Flustre-release.git diff --git a/lustre/mgs/lproc_mgs.c b/lustre/mgs/lproc_mgs.c index b3fae35..7020470 100644 --- a/lustre/mgs/lproc_mgs.c +++ b/lustre/mgs/lproc_mgs.c @@ -1,26 +1,37 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: +/* + * GPL HEADER START * - * Copyright (C) 2002 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. * + * GPL HEADER END + */ +/* + * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. + * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Intel Corporation. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. */ #define DEBUG_SUBSYSTEM S_CLASS @@ -34,82 +45,47 @@ #ifdef LPROCFS -static int lprocfs_mgs_rd_mntdev(char *page, char **start, off_t off, int count, - int *eof, void *data) -{ - struct obd_device* obd = (struct obd_device *)data; - - LASSERT(obd != NULL); - LASSERT(obd->u.mgs.mgs_vfsmnt->mnt_devname); - *eof = 1; - - return snprintf(page, count, "%s\n",obd->u.mgs.mgs_vfsmnt->mnt_devname); -} - static int mgs_fs_seq_show(struct seq_file *seq, void *v) { struct obd_device *obd = seq->private; - struct mgs_obd *mgs = &obd->u.mgs; - struct list_head dentry_list; - struct l_linux_dirent *dirent, *n; + struct mgs_device *mgs; + cfs_list_t list; + struct mgs_direntry *dirent, *n; + struct lu_env env; int rc, len; ENTRY; LASSERT(obd != NULL); - rc = class_dentry_readdir(obd, mgs->mgs_configs_dir, - mgs->mgs_vfsmnt, &dentry_list); + LASSERT(obd->obd_lu_dev != NULL); + mgs = lu2mgs_dev(obd->obd_lu_dev); + + rc = lu_env_init(&env, LCT_MG_THREAD); + if (rc) + RETURN(rc); + + rc = class_dentry_readdir(&env, mgs, &list); if (rc) { CERROR("Can't read config dir\n"); - RETURN(rc); + GOTO(out, rc); } - list_for_each_entry_safe(dirent, n, &dentry_list, lld_list) { - list_del(&dirent->lld_list); - len = strlen(dirent->lld_name); - if ((len > 7) && (strncmp(dirent->lld_name + len - 7, "-client", - len) == 0)) { - seq_printf(seq, "%.*s\n", len - 7, dirent->lld_name); - } - OBD_FREE(dirent, sizeof(*dirent)); + cfs_list_for_each_entry_safe(dirent, n, &list, list) { + cfs_list_del(&dirent->list); + len = strlen(dirent->name); + if (len > 7 && + strncmp(dirent->name + len - 7, "-client", len) == 0) + seq_printf(seq, "%.*s\n", len - 7, dirent->name); + mgs_direntry_free(dirent); } +out: + lu_env_fini(&env); RETURN(0); } LPROC_SEQ_FOPS_RO(mgs_fs); -int lproc_mgs_setup(struct obd_device *obd) -{ - struct mgs_obd *mgs = &obd->u.mgs; - int rc; - - rc = lprocfs_obd_seq_create(obd, "filesystems", 0444, - &mgs_fs_fops, obd); - mgs->mgs_proc_live = proc_mkdir("live", obd->obd_proc_entry); - obd->obd_proc_exports = proc_mkdir("exports", obd->obd_proc_entry); - - return rc; -} - -int lproc_mgs_cleanup(struct obd_device *obd) -{ - struct mgs_obd *mgs = &obd->u.mgs; - - if (obd) - return -EINVAL; - - if (mgs->mgs_proc_live) { - /* Should be no live entries */ - LASSERT(mgs->mgs_proc_live->subdir == NULL); - lprocfs_remove(&mgs->mgs_proc_live); - mgs->mgs_proc_live = NULL; - } - lprocfs_free_obd_stats(obd); - - return lprocfs_obd_cleanup(obd); -} - -static void seq_show_srpc_rule(struct seq_file *seq, const char *tgtname, - struct sptlrpc_rule_set *rset) +static void seq_show_srpc_rules(struct seq_file *seq, const char *tgtname, + struct sptlrpc_rule_set *rset) { struct sptlrpc_rule *r; char dirbuf[10]; @@ -138,22 +114,134 @@ static void seq_show_srpc_rule(struct seq_file *seq, const char *tgtname, } } -static int mgs_live_seq_show(struct seq_file *seq, void *v) +static int mgsself_srpc_seq_show(struct seq_file *seq, void *v) +{ + struct obd_device *obd = seq->private; + struct mgs_device *mgs; + struct fs_db *fsdb; + struct lu_env env; + int rc; + + LASSERT(obd != NULL); + LASSERT(obd->obd_lu_dev != NULL); + mgs = lu2mgs_dev(obd->obd_lu_dev); + + rc = lu_env_init(&env, LCT_MG_THREAD); + if (rc) + return rc; + + rc = mgs_find_or_make_fsdb(&env, mgs, MGSSELF_NAME, &fsdb); + if (rc) + goto out; + + mutex_lock(&fsdb->fsdb_mutex); + seq_show_srpc_rules(seq, fsdb->fsdb_name, &fsdb->fsdb_srpc_gen); + mutex_unlock(&fsdb->fsdb_mutex); + +out: + lu_env_fini(&env); + return 0; +} + +LPROC_SEQ_FOPS_RO(mgsself_srpc); + +int lproc_mgs_setup(struct mgs_device *mgs, char *osd_name) +{ + struct obd_device *obd = mgs->mgs_obd; + struct obd_device *osd_obd = mgs->mgs_bottom->dd_lu_dev.ld_obd; + int osd_len = strlen(osd_name) - strlen("-osd"); + int rc; + + rc = lprocfs_obd_seq_create(obd, "filesystems", 0444, + &mgs_fs_fops, obd); + rc = lprocfs_obd_seq_create(obd, "srpc_rules", 0400, + &mgsself_srpc_fops, obd); + + mgs->mgs_proc_live = lprocfs_register("live", obd->obd_proc_entry, + NULL, NULL); + if (IS_ERR(mgs->mgs_proc_live)) { + rc = PTR_ERR(mgs->mgs_proc_live); + CERROR("error %d setting up lprocfs for %s\n", rc, "live"); + mgs->mgs_proc_live = NULL; + } + + obd->obd_proc_exports_entry = lprocfs_register("exports", + obd->obd_proc_entry, + NULL, NULL); + if (IS_ERR(obd->obd_proc_exports_entry)) { + rc = PTR_ERR(obd->obd_proc_exports_entry); + CERROR("error %d setting up lprocfs for %s\n", rc, "exports"); + obd->obd_proc_exports_entry = NULL; + } + + mgs->mgs_proc_osd = lprocfs_add_symlink("osd", + obd->obd_proc_entry, + "../../%s/%.*s", + osd_obd->obd_type->typ_name, + osd_len, /* Strip "-osd". */ + osd_name); + if (mgs->mgs_proc_osd == NULL) + rc = -ENOMEM; + + mgs->mgs_proc_mntdev = lprocfs_add_symlink("mntdev", + obd->obd_proc_entry, + "osd/mntdev"); + if (mgs->mgs_proc_mntdev == NULL) + rc = -ENOMEM; + + mgs->mgs_proc_fstype = lprocfs_add_symlink("fstype", + obd->obd_proc_entry, + "osd/fstype"); + if (mgs->mgs_proc_fstype == NULL) + rc = -ENOMEM; + + return rc; +} + +int lproc_mgs_cleanup(struct mgs_device *mgs) +{ + struct obd_device *obd = mgs->mgs_obd; + + if (!obd) + return -EINVAL; + + if (mgs->mgs_proc_osd != NULL) + lprocfs_remove(&mgs->mgs_proc_osd); + + if (mgs->mgs_proc_fstype != NULL) + lprocfs_remove(&mgs->mgs_proc_fstype); + + if (mgs->mgs_proc_mntdev) + lprocfs_remove(&mgs->mgs_proc_mntdev); + if (mgs->mgs_proc_live) { + /* Should be no live entries */ + LASSERT(mgs->mgs_proc_live->subdir == NULL); + lprocfs_remove(&mgs->mgs_proc_live); + mgs->mgs_proc_live = NULL; + } + lprocfs_free_per_client_stats(obd); + lprocfs_free_obd_stats(obd); + lprocfs_free_md_stats(obd); + + return lprocfs_obd_cleanup(obd); +} + +static int mgs_live_seq_show(struct seq_file *seq, void *v) { struct fs_db *fsdb = seq->private; struct mgs_tgt_srpc_conf *srpc_tgt; int i; - - down(&fsdb->fsdb_sem); + + mutex_lock(&fsdb->fsdb_mutex); seq_printf(seq, "fsname: %s\n", fsdb->fsdb_name); - seq_printf(seq, "flags: %#x gen: %d\n", + seq_printf(seq, "flags: %#lx gen: %d\n", fsdb->fsdb_flags, fsdb->fsdb_gen); for (i = 0; i < INDEX_MAP_SIZE * 8; i++) - if (test_bit(i, fsdb->fsdb_mdt_index_map)) + if (test_bit(i, fsdb->fsdb_mdt_index_map)) seq_printf(seq, "%s-MDT%04x\n", fsdb->fsdb_name, i); for (i = 0; i < INDEX_MAP_SIZE * 8; i++) - if (test_bit(i, fsdb->fsdb_ost_index_map)) + if (test_bit(i, fsdb->fsdb_ost_index_map)) seq_printf(seq, "%s-OST%04x\n", fsdb->fsdb_name, i); seq_printf(seq, "\nSecure RPC Config Rules:\n"); @@ -163,46 +251,58 @@ static int mgs_live_seq_show(struct seq_file *seq, void *v) #endif for (srpc_tgt = fsdb->fsdb_srpc_tgt; srpc_tgt; srpc_tgt = srpc_tgt->mtsc_next) { - seq_show_srpc_rule(seq, srpc_tgt->mtsc_tgt, - &srpc_tgt->mtsc_rset); + seq_show_srpc_rules(seq, srpc_tgt->mtsc_tgt, + &srpc_tgt->mtsc_rset); } - seq_show_srpc_rule(seq, fsdb->fsdb_name, &fsdb->fsdb_srpc_gen); + seq_show_srpc_rules(seq, fsdb->fsdb_name, &fsdb->fsdb_srpc_gen); - up(&fsdb->fsdb_sem); + lprocfs_rd_ir_state(seq, fsdb); + + mutex_unlock(&fsdb->fsdb_mutex); return 0; } -LPROC_SEQ_FOPS_RO(mgs_live); +static ssize_t mgs_live_seq_write(struct file *file, const char *buf, + size_t len, loff_t *off) +{ + struct seq_file *seq = file->private_data; + struct fs_db *fsdb = seq->private; + ssize_t rc; + + rc = lprocfs_wr_ir_state(file, buf, len, fsdb); + if (rc >= 0) + rc = len; + return rc; +} +LPROC_SEQ_FOPS(mgs_live); -int lproc_mgs_add_live(struct obd_device *obd, struct fs_db *fsdb) +int lproc_mgs_add_live(struct mgs_device *mgs, struct fs_db *fsdb) { - struct mgs_obd *mgs = &obd->u.mgs; int rc; - if (!mgs->mgs_proc_live) + if (!mgs->mgs_proc_live) return 0; - rc = lprocfs_seq_create(mgs->mgs_proc_live, fsdb->fsdb_name, 0444, - &mgs_live_fops, fsdb); + rc = lprocfs_seq_create(mgs->mgs_proc_live, fsdb->fsdb_name, 0644, + &mgs_live_fops, fsdb); return 0; } -int lproc_mgs_del_live(struct obd_device *obd, struct fs_db *fsdb) +int lproc_mgs_del_live(struct mgs_device *mgs, struct fs_db *fsdb) { - struct mgs_obd *mgs = &obd->u.mgs; - - if (!mgs->mgs_proc_live) + if (!mgs->mgs_proc_live) return 0; - remove_proc_entry(fsdb->fsdb_name, mgs->mgs_proc_live); + + lprocfs_remove_proc_entry(fsdb->fsdb_name, mgs->mgs_proc_live); return 0; } struct lprocfs_vars lprocfs_mgs_obd_vars[] = { { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "fstype", lprocfs_rd_fstype, 0, 0 }, - { "mntdev", lprocfs_mgs_rd_mntdev, 0, 0 }, { "num_exports", lprocfs_rd_num_exports, 0, 0 }, + { "hash_stats", lprocfs_obd_rd_hash, 0, 0 }, { "evict_client", 0, lprocfs_wr_evict_client, 0 }, + { "ir_timeout", lprocfs_rd_ir_timeout, lprocfs_wr_ir_timeout, 0 }, { 0 } }; @@ -213,7 +313,8 @@ struct lprocfs_vars lprocfs_mgs_module_vars[] = { void mgs_counter_incr(struct obd_export *exp, int opcode) { lprocfs_counter_incr(exp->exp_obd->obd_stats, opcode); - lprocfs_counter_incr(exp->exp_ops_stats, opcode); + if (exp->exp_nid_stats && exp->exp_nid_stats->nid_stats != NULL) + lprocfs_counter_incr(exp->exp_nid_stats->nid_stats, opcode); } void mgs_stats_counter_init(struct lprocfs_stats *stats)