X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmgs%2Flproc_mgs.c;h=ffa2d0d1ffc53ea560eb51c9e7117e526eef77e1;hb=da12d3ba35bbb86c8e5860a5ed161a55f01b69d5;hp=1d84a122560d92fe6a4b85ab5953b2399306880e;hpb=1a24137e8f26eaae9a2dac39a1e8a8a0bed46b6b;p=fs%2Flustre-release.git

diff --git a/lustre/mgs/lproc_mgs.c b/lustre/mgs/lproc_mgs.c
index 1d84a12..ffa2d0d 100644
--- a/lustre/mgs/lproc_mgs.c
+++ b/lustre/mgs/lproc_mgs.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,63 +45,119 @@
 
 #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)
+static void seq_show_srpc_rules(struct seq_file *seq, const char *tgtname,
+                                struct sptlrpc_rule_set *rset)
 {
-        struct mgs_obd *mgs = &obd->u.mgs;
-        int rc;
+        struct sptlrpc_rule    *r;
+        char                    dirbuf[10];
+        char                    flvrbuf[40];
+        char                   *net;
+        int                     i;
+
+        for (i = 0; i < rset->srs_nrule; i++) {
+                r = &rset->srs_rules[i];
+
+                if (r->sr_netid == LNET_NIDNET(LNET_NID_ANY))
+                        net = "default";
+                else
+                        net = libcfs_net2str(r->sr_netid);
+
+                if (r->sr_from == LUSTRE_SP_ANY && r->sr_to == LUSTRE_SP_ANY)
+                        dirbuf[0] = '\0';
+                else
+                        snprintf(dirbuf, sizeof(dirbuf), ".%s2%s",
+                                 sptlrpc_part2name(r->sr_from),
+                                 sptlrpc_part2name(r->sr_to));
+
+                sptlrpc_flavor2name(&r->sr_flvr, flvrbuf, sizeof(flvrbuf));
+                seq_printf(seq, "%s.srpc.flavor.%s%s=%s\n", tgtname,
+                           net, dirbuf, flvrbuf);
+        }
+}
+
+static int mgsself_srpc_seq_show(struct seq_file *seq, void *v)
+{
+	struct obd_device	*obd = seq->private;
+	struct mgs_device	*mgs = lu2mgs_dev(obd->obd_lu_dev);
+	struct lu_target	*tgt = &mgs->mgs_lut;
+
+	read_lock(&tgt->lut_sptlrpc_lock);
+	seq_show_srpc_rules(seq, MGSSELF_NAME, &tgt->lut_sptlrpc_rset);
+	read_unlock(&tgt->lut_sptlrpc_lock);
+
+        return 0;
+}
+
+LPROC_SEQ_FOPS_RO(mgsself_srpc);
+
+int lproc_mgs_setup(struct mgs_device *mgs, const 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;
+	struct lprocfs_static_vars lvars;
+
+	lprocfs_mgs_init_vars(&lvars);
+	rc = lprocfs_obd_setup(obd, lvars.obd_vars);
+	if (rc != 0)
+		GOTO(out, rc);
 
         rc = lprocfs_obd_seq_create(obd, "filesystems", 0444,
                                     &mgs_fs_fops, obd);
+	if (rc != 0)
+		GOTO(out, rc);
+
+	rc = lprocfs_obd_seq_create(obd, "srpc_rules", 0400,
+				    &mgsself_srpc_fops, obd);
+	if (rc != 0)
+		GOTO(out, rc);
 
         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;
+		GOTO(out, rc);
         }
 
         obd->obd_proc_exports_entry = lprocfs_register("exports",
@@ -109,78 +165,83 @@ int lproc_mgs_setup(struct obd_device *obd)
                                                        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;
+		GOTO(out, rc);
         }
 
-        return rc;
+	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)
+		GOTO(out, rc = -ENOMEM);
+
+	mgs->mgs_proc_mntdev = lprocfs_add_symlink("mntdev",
+						   obd->obd_proc_entry,
+						   "osd/mntdev");
+	if (mgs->mgs_proc_mntdev == NULL)
+		GOTO(out, rc = -ENOMEM);
+
+	mgs->mgs_proc_fstype = lprocfs_add_symlink("fstype",
+						   obd->obd_proc_entry,
+						   "osd/fstype");
+	if (mgs->mgs_proc_fstype == NULL)
+		GOTO(out, rc = -ENOMEM);
+
+out:
+	if (rc != 0)
+		lproc_mgs_cleanup(mgs);
+
+	return rc;
 }
 
-int lproc_mgs_cleanup(struct obd_device *obd)
+void lproc_mgs_cleanup(struct mgs_device *mgs)
 {
-        struct mgs_obd *mgs;
+	struct obd_device *obd = mgs->mgs_obd;
 
-        if (!obd)
-                RETURN(-EINVAL);
+	if (obd == NULL)
+		return;
 
-        mgs = &obd->u.mgs;
-        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);
+	if (mgs->mgs_proc_osd != NULL)
+		lprocfs_remove(&mgs->mgs_proc_osd);
 
-        return lprocfs_obd_cleanup(obd);
-}
+	if (mgs->mgs_proc_fstype != NULL)
+		lprocfs_remove(&mgs->mgs_proc_fstype);
 
-static void seq_show_srpc_rule(struct seq_file *seq, const char *tgtname,
-                               struct sptlrpc_rule_set *rset)
-{
-        struct sptlrpc_rule    *r;
-        char                    dirbuf[10];
-        char                    flvrbuf[40];
-        char                   *net;
-        int                     i;
+	if (mgs->mgs_proc_mntdev != NULL)
+		lprocfs_remove(&mgs->mgs_proc_mntdev);
 
-        for (i = 0; i < rset->srs_nrule; i++) {
-                r = &rset->srs_rules[i];
+	if (mgs->mgs_proc_live != NULL) {
+		/* Should be no live entries */
+		LASSERT(mgs->mgs_proc_live->subdir == NULL);
+		lprocfs_remove(&mgs->mgs_proc_live);
+		mgs->mgs_proc_live = NULL;
+	}
 
-                if (r->sr_netid == LNET_NIDNET(LNET_NID_ANY))
-                        net = "default";
-                else
-                        net = libcfs_net2str(r->sr_netid);
-
-                if (r->sr_from == LUSTRE_SP_ANY && r->sr_to == LUSTRE_SP_ANY)
-                        dirbuf[0] = '\0';
-                else
-                        snprintf(dirbuf, sizeof(dirbuf), ".%s2%s",
-                                 sptlrpc_part2name(r->sr_from),
-                                 sptlrpc_part2name(r->sr_to));
-
-                sptlrpc_flavor2name(&r->sr_flvr, flvrbuf, sizeof(flvrbuf));
-                seq_printf(seq, "%s.srpc.flavor.%s%s=%s\n", tgtname,
-                           net, dirbuf, flvrbuf);
-        }
+        lprocfs_free_per_client_stats(obd);
+	lprocfs_obd_cleanup(obd);
+        lprocfs_free_obd_stats(obd);
+        lprocfs_free_md_stats(obd);
 }
 
-static int mgs_live_seq_show(struct seq_file *seq, void *v) 
+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");
@@ -190,48 +251,60 @@ 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);
+
+        lprocfs_rd_ir_state(seq, fsdb);
 
-        up(&fsdb->fsdb_sem);
+	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;
 
-int lproc_mgs_add_live(struct obd_device *obd, struct fs_db *fsdb)
+        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 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;
 
-        lprocfs_remove_proc_entry(fsdb->fsdb_name, mgs->mgs_proc_live);
+	/* didn't create the proc file for MGSSELF_NAME */
+	if (!test_bit(FSDB_MGS_SELF, &fsdb->fsdb_flags))
+		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 }
 };