X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Fobdclass%2Flprocfs_status_server.c;h=7a78959e3f6948007ed7586c660e9a5333da5c7e;hb=8a84c7f9c7d65f6f880be6fe4d94fca26a405d81;hp=4b8ea8ccdad453beaf2443098bb928178ad8629a;hpb=4a8f90cfdf8868d25f14b02214e51e7423d70160;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/lprocfs_status_server.c b/lustre/obdclass/lprocfs_status_server.c
index 4b8ea8c..7a78959 100644
--- a/lustre/obdclass/lprocfs_status_server.c
+++ b/lustre/obdclass/lprocfs_status_server.c
@@ -15,7 +15,7 @@
  *
  * 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
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -23,28 +23,67 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2014, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  *
  * lustre/obdclass/lprocfs_status_server.c
  */
 
 #define DEBUG_SUBSYSTEM S_CLASS
 
+#include <linux/kobject.h>
+#include <linux/sysfs.h>
 
 #include <obd_class.h>
 #include <lprocfs_status.h>
-#include <lustre/lustre_idl.h>
 #include <lustre_nodemap.h>
 
+#define MAX_STRING_SIZE 128
+
+struct dentry *ldebugfs_add_symlink(const char *name, const char *target,
+				    const char *format, ...)
+{
+	struct dentry *entry = NULL;
+	struct dentry *parent;
+	struct qstr dname;
+	va_list ap;
+	char *dest;
+
+	if (!target || !format)
+		return NULL;
+
+	dname.name = target;
+	dname.len = strlen(dname.name);
+	dname.hash = ll_full_name_hash(debugfs_lustre_root,
+				       dname.name, dname.len);
+	parent = d_lookup(debugfs_lustre_root, &dname);
+	if (!parent)
+		return NULL;
+
+	OBD_ALLOC_WAIT(dest, MAX_STRING_SIZE + 1);
+	if (!dest)
+		goto no_entry;
+
+	va_start(ap, format);
+	vsnprintf(dest, MAX_STRING_SIZE, format, ap);
+	va_end(ap);
+
+	entry = debugfs_create_symlink(name, parent, dest);
+
+	OBD_FREE(dest, MAX_STRING_SIZE + 1);
+no_entry:
+	dput(parent);
+	return entry;
+}
+EXPORT_SYMBOL(ldebugfs_add_symlink);
+
 #ifdef CONFIG_PROC_FS
 
 int lprocfs_evict_client_open(struct inode *inode, struct file *f)
 {
-	struct obd_device *obd = PDE_DATA(f->f_path.dentry->d_inode);
+	struct obd_device *obd = PDE_DATA(file_inode(f));
 
 	atomic_inc(&obd->obd_evict_inprogress);
 	return 0;
@@ -52,7 +91,7 @@ int lprocfs_evict_client_open(struct inode *inode, struct file *f)
 
 int lprocfs_evict_client_release(struct inode *inode, struct file *f)
 {
-	struct obd_device *obd = PDE_DATA(f->f_path.dentry->d_inode);
+	struct obd_device *obd = PDE_DATA(file_inode(f));
 
 	atomic_dec(&obd->obd_evict_inprogress);
 	wake_up(&obd->obd_evict_inprogress_waitq);
@@ -63,7 +102,7 @@ int lprocfs_evict_client_release(struct inode *inode, struct file *f)
 #define BUFLEN (UUID_MAX + 5)
 
 ssize_t
-lprocfs_evict_client_seq_write(struct file *file, const char *buffer,
+lprocfs_evict_client_seq_write(struct file *file, const char __user *buffer,
 			       size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
@@ -84,7 +123,8 @@ lprocfs_evict_client_seq_write(struct file *file, const char *buffer,
 		count = -EFAULT;
 		goto out;
 	}
-	tmpbuf = cfs_firststr(kbuf, min_t(unsigned long, BUFLEN - 1, count));
+	tmpbuf = skip_spaces(kbuf);
+	tmpbuf = strsep(&tmpbuf, " \t\n\f\v\r");
 	class_incref(obd, __func__, current);
 
 	if (strncmp(tmpbuf, "nid:", 4) == 0)
@@ -104,14 +144,105 @@ EXPORT_SYMBOL(lprocfs_evict_client_seq_write);
 
 #undef BUFLEN
 
-int lprocfs_num_exports_seq_show(struct seq_file *m, void *data)
+ssize_t num_exports_show(struct kobject *kobj, struct attribute *attr,
+			 char *buf)
 {
-	struct obd_device *obd = data;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	LASSERT(obd != NULL);
-	return seq_printf(m, "%u\n", obd->obd_num_exports);
+	return scnprintf(buf, PAGE_SIZE, "%u\n", obd->obd_num_exports);
+}
+EXPORT_SYMBOL(num_exports_show);
+
+static int obd_export_flags2str(struct obd_export *exp, struct seq_file *m)
+{
+	bool first = true;
+
+	flag2str(exp, failed);
+	flag2str(exp, in_recovery);
+	flag2str(exp, disconnected);
+	flag2str(exp, connecting);
+	flag2str(exp, no_recovery);
+
+	return 0;
 }
-EXPORT_SYMBOL(lprocfs_num_exports_seq_show);
+
+static int
+lprocfs_exp_print_export_seq(struct obd_export *exp, void *cb_data)
+{
+	struct seq_file		*m = cb_data;
+	struct obd_device	*obd;
+	struct obd_connect_data	*ocd;
+
+	LASSERT(exp != NULL);
+	if (exp->exp_nid_stats == NULL)
+		goto out;
+	obd = exp->exp_obd;
+	ocd = &exp->exp_connect_data;
+
+	seq_printf(m, "%s:\n"
+		   "    name: %s\n"
+		   "    client: %s\n"
+		   "    connect_flags: [ ",
+		   obd_uuid2str(&exp->exp_client_uuid),
+		   obd->obd_name,
+		   obd_export_nid2str(exp));
+	obd_connect_seq_flags2str(m, ocd->ocd_connect_flags,
+				  ocd->ocd_connect_flags2, ", ");
+	seq_printf(m, " ]\n");
+	obd_connect_data_seqprint(m, ocd);
+	seq_printf(m, "    export_flags: [ ");
+	obd_export_flags2str(exp, m);
+	seq_printf(m, " ]\n");
+
+	if (obd->obd_type &&
+	    strcmp(obd->obd_type->typ_name, "obdfilter") == 0) {
+		struct filter_export_data *fed = &exp->exp_filter_data;
+
+		seq_printf(m, "    grant:\n");
+		seq_printf(m, "       granted: %ld\n",
+			fed->fed_ted.ted_grant);
+		seq_printf(m, "       dirty: %ld\n",
+			fed->fed_ted.ted_dirty);
+		seq_printf(m, "       pending: %ld\n",
+			fed->fed_ted.ted_pending);
+	}
+
+out:
+	return 0;
+}
+
+/**
+ * RPC connections are composed of an import and an export. Using the
+ * lctl utility we can extract important information about the state.
+ * The lprocfs_exp_export_seq_show routine displays the state information
+ * for the export.
+ *
+ * \param[in] m		seq file
+ * \param[in] data	unused
+ *
+ * \retval		0 on success
+ *
+ * The format of the export state information is like:
+ * a793e354-49c0-aa11-8c4f-a4f2b1a1a92b:
+ *     name: MGS
+ *     client: 10.211.55.10@tcp
+ *     connect_flags: [ version, barrier, adaptive_timeouts, ... ]
+ *     connect_data:
+ *        flags: 0x2000011005002020
+ *        instance: 0
+ *        target_version: 2.10.51.0
+ *        export_flags: [ ... ]
+ *
+ */
+static int lprocfs_exp_export_seq_show(struct seq_file *m, void *data)
+{
+	struct nid_stat *stats = m->private;
+
+	return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+				       lprocfs_exp_print_export_seq, m);
+}
+LPROC_SEQ_FOPS_RO(lprocfs_exp_export);
 
 static void lprocfs_free_client_stats(struct nid_stat *client_stat)
 {
@@ -132,12 +263,11 @@ static void lprocfs_free_client_stats(struct nid_stat *client_stat)
 		lprocfs_free_stats(&client_stat->nid_ldlm_stats);
 
 	OBD_FREE_PTR(client_stat);
-	return;
 }
 
 void lprocfs_free_per_client_stats(struct obd_device *obd)
 {
-	cfs_hash_t *hash = obd->obd_nid_stats_hash;
+	struct cfs_hash *hash = obd->obd_nid_stats_hash;
 	struct nid_stat *stat;
 	ENTRY;
 
@@ -154,61 +284,95 @@ void lprocfs_free_per_client_stats(struct obd_device *obd)
 }
 EXPORT_SYMBOL(lprocfs_free_per_client_stats);
 
-static int lprocfs_exp_print_uuid_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-				      struct hlist_node *hnode, void *cb_data)
+static int
+lprocfs_exp_print_nodemap_seq(struct obd_export *exp, void *cb_data)
 {
+	struct lu_nodemap *nodemap = exp->exp_target_data.ted_nodemap;
 	struct seq_file *m = cb_data;
-	struct obd_export *exp = cfs_hash_object(hs, hnode);
 
-	if (exp->exp_nid_stats != NULL)
-		seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
+	if (nodemap)
+		seq_printf(m, "%s\n", nodemap->nm_name);
 	return 0;
 }
 
-static int lprocfs_exp_print_nodemap_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-					struct hlist_node *hnode, void *cb_data)
+static int
+lprocfs_exp_nodemap_seq_show(struct seq_file *m, void *data)
 {
-	struct seq_file *m = cb_data;
-	struct obd_export *exp = cfs_hash_object(hs, hnode);
-	struct lu_nodemap *nodemap = exp->exp_target_data.ted_nodemap;
+	struct nid_stat *stats = m->private;
 
-	if (nodemap != NULL)
-		seq_printf(m, "%s\n", nodemap->nm_name);
-	return 0;
+	return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+				       lprocfs_exp_print_nodemap_seq, m);
 }
+LPROC_SEQ_FOPS_RO(lprocfs_exp_nodemap);
 
-static int lprocfs_exp_nodemap_seq_show(struct seq_file *m, void *data)
+static int
+lprocfs_exp_print_uuid_seq(struct obd_export *exp, void *cb_data)
 {
-	struct nid_stat *stats = m->private;
-	struct obd_device *obd = stats->nid_obd;
+	struct seq_file *m = cb_data;
 
-	cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-			      lprocfs_exp_print_nodemap_seq, m);
+	if (exp->exp_nid_stats)
+		seq_printf(m, "%s\n", obd_uuid2str(&exp->exp_client_uuid));
 	return 0;
 }
-LPROC_SEQ_FOPS_RO(lprocfs_exp_nodemap);
 
 static int lprocfs_exp_uuid_seq_show(struct seq_file *m, void *data)
 {
 	struct nid_stat *stats = m->private;
-	struct obd_device *obd = stats->nid_obd;
 
-	cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-				lprocfs_exp_print_uuid_seq, m);
-	return 0;
+	return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+				       lprocfs_exp_print_uuid_seq, m);
 }
 LPROC_SEQ_FOPS_RO(lprocfs_exp_uuid);
 
-static int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
-				      struct hlist_node *hnode, void *cb_data)
+#define HASH_NAME_LEN	16
 
+static void ldebugfs_rhash_seq_show(const char *name, struct rhashtable *ht,
+				    struct seq_file *m)
 {
+	unsigned int max_size = ht->p.max_size ? ht->p.max_size : UINT_MAX;
+	struct bucket_table *tbl;
+	int dist[8] = { 0, };
+	int maxdep = 0;
+	int i;
+
+	rcu_read_lock();
+	tbl = rht_dereference(ht->tbl, ht);
+	for (i = 0; i < tbl->size; i++) {
+		struct rhash_head *pos;
+		int count = 0;
+
+		rht_for_each(pos, tbl, i)
+			count++;
+
+		if (count)
+			maxdep = max(maxdep, count);
+
+		dist[min(fls(count), 7)]++;
+	}
+
+	seq_printf(m, "%-*s %5d %5d %10u %d.%03d 0.300 0.750 0x%03x %7d %7d %7d ",
+		   HASH_NAME_LEN, name, tbl->size, ht->p.min_size, max_size,
+		   atomic_read(&ht->nelems) / tbl->size,
+		   atomic_read(&ht->nelems) * 1000 / tbl->size,
+		   ht->p.automatic_shrinking, 0,
+		   atomic_read(&ht->nelems), maxdep);
+	rcu_read_unlock();
+
+	for (i = 0; i < 8; i++)
+		seq_printf(m, "%d%c",  dist[i], (i == 7) ? '\n' : '/');
+}
+
+static int
+lprocfs_exp_print_hash_seq(struct obd_export *exp, void *cb_data)
+
+{
+	struct obd_device *obd = exp->exp_obd;
 	struct seq_file *m = cb_data;
-	struct obd_export *exp = cfs_hash_object(hs, hnode);
 
 	if (exp->exp_lock_hash != NULL) {
-		cfs_hash_debug_header(m);
-		cfs_hash_debug_str(hs, m);
+		seq_printf(m, "%-*s   cur   min        max theta t-min t-max flags rehash   count distribution\n",
+			   HASH_NAME_LEN, "name");
+		ldebugfs_rhash_seq_show("NID_HASH", &obd->obd_nid_hash.ht, m);
 	}
 	return 0;
 }
@@ -216,18 +380,61 @@ static int lprocfs_exp_print_hash_seq(cfs_hash_t *hs, cfs_hash_bd_t *bd,
 static int lprocfs_exp_hash_seq_show(struct seq_file *m, void *data)
 {
 	struct nid_stat *stats = m->private;
-	struct obd_device *obd = stats->nid_obd;
 
-	cfs_hash_for_each_key(obd->obd_nid_hash, &stats->nid,
-				lprocfs_exp_print_hash_seq, m);
-	return 0;
+	return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+				       lprocfs_exp_print_hash_seq, m);
 }
 LPROC_SEQ_FOPS_RO(lprocfs_exp_hash);
 
+int lprocfs_exp_print_replydata_seq(struct obd_export *exp, void *cb_data)
+
+{
+	struct seq_file *m = cb_data;
+	struct tg_export_data *ted = &exp->exp_target_data;
+
+	seq_printf(m, "reply_cnt: %d\n"
+		   "reply_max: %d\n"
+		   "reply_released_by_xid: %d\n"
+		   "reply_released_by_tag: %d\n\n",
+		   ted->ted_reply_cnt,
+		   ted->ted_reply_max,
+		   ted->ted_release_xid,
+		   ted->ted_release_tag);
+	return 0;
+}
+
+int lprocfs_exp_replydata_seq_show(struct seq_file *m, void *data)
+{
+	struct nid_stat *stats = m->private;
+
+	return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+				       lprocfs_exp_print_replydata_seq, m);
+}
+LPROC_SEQ_FOPS_RO(lprocfs_exp_replydata);
+
+int lprocfs_exp_print_fmd_count_seq(struct obd_export *exp, void *cb_data)
+{
+	struct seq_file *m = cb_data;
+	struct tg_export_data *ted = &exp->exp_target_data;
+
+	seq_printf(m, "%d\n", ted->ted_fmd_count);
+
+	return 0;
+}
+
+int lprocfs_exp_fmd_count_seq_show(struct seq_file *m, void *data)
+{
+	struct nid_stat *stats = m->private;
+
+	return obd_nid_export_for_each(stats->nid_obd, stats->nid,
+				       lprocfs_exp_print_fmd_count_seq, m);
+}
+LPROC_SEQ_FOPS_RO(lprocfs_exp_fmd_count);
+
 int lprocfs_nid_stats_clear_seq_show(struct seq_file *m, void *data)
 {
-	return seq_printf(m, "%s\n", "Write into this file to clear all nid "
-			  "stats and stale nid entries");
+	seq_puts(m, "Write into this file to clear all nid stats and stale nid entries\n");
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_show);
 
@@ -252,15 +459,14 @@ static int lprocfs_nid_stats_clear_write_cb(void *obj, void *data)
 }
 
 ssize_t
-lprocfs_nid_stats_clear_seq_write(struct file *file, const char *buffer,
+lprocfs_nid_stats_clear_seq_write(struct file *file, const char __user *buffer,
 					size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
 	struct obd_device *obd = m->private;
 	struct nid_stat *client_stat;
-	struct list_head free_list;
+	LIST_HEAD(free_list);
 
-	INIT_LIST_HEAD(&free_list);
 	cfs_hash_cond_del(obd->obd_nid_stats_hash,
 			  lprocfs_nid_stats_clear_write_cb, &free_list);
 
@@ -349,7 +555,8 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid)
 				   &lprocfs_exp_nodemap_fops);
 	if (IS_ERR(entry)) {
 		rc = PTR_ERR(entry);
-		CWARN("Error adding the nodemap file: rc = %d\n", rc);
+		CWARN("%s: error adding the nodemap file: rc = %d\n",
+		      obd->obd_name, rc);
 		GOTO(destroy_new_ns, rc);
 	}
 
@@ -357,7 +564,8 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid)
 				   &lprocfs_exp_uuid_fops);
 	if (IS_ERR(entry)) {
 		rc = PTR_ERR(entry);
-		CWARN("Error adding the NID stats file: rc = %d\n", rc);
+		CWARN("%s: error adding the NID stats file: rc = %d\n",
+		      obd->obd_name, rc);
 		GOTO(destroy_new_ns, rc);
 	}
 
@@ -365,7 +573,35 @@ int lprocfs_exp_setup(struct obd_export *exp, lnet_nid_t *nid)
 				   &lprocfs_exp_hash_fops);
 	if (IS_ERR(entry)) {
 		rc = PTR_ERR(entry);
-		CWARN("Error adding the hash file: rc = %d\n", rc);
+		CWARN("%s: error adding the hash file: rc = %d\n",
+		      obd->obd_name, rc);
+		GOTO(destroy_new_ns, rc);
+	}
+
+	entry = lprocfs_add_simple(new_stat->nid_proc, "export",
+				   new_stat, &lprocfs_exp_export_fops);
+	if (IS_ERR(entry)) {
+		rc = PTR_ERR(entry);
+		CWARN("%s: error adding the export file: rc = %d\n",
+		      obd->obd_name, rc);
+		GOTO(destroy_new_ns, rc);
+	}
+
+	entry = lprocfs_add_simple(new_stat->nid_proc, "reply_data", new_stat,
+				   &lprocfs_exp_replydata_fops);
+	if (IS_ERR(entry)) {
+		rc = PTR_ERR(entry);
+		CWARN("%s: error adding the reply_data file: rc = %d\n",
+		      obd->obd_name, rc);
+		GOTO(destroy_new_ns, rc);
+	}
+
+	entry = lprocfs_add_simple(new_stat->nid_proc, "fmd_count", new_stat,
+				   &lprocfs_exp_fmd_count_fops);
+	if (IS_ERR(entry)) {
+		rc = PTR_ERR(entry);
+		CWARN("%s: error adding the fmd_count file: rc = %d\n",
+		      obd->obd_name, rc);
 		GOTO(destroy_new_ns, rc);
 	}
 
@@ -405,94 +641,24 @@ int lprocfs_exp_cleanup(struct obd_export *exp)
 	return 0;
 }
 
-#define LPROCFS_OBD_OP_INIT(base, stats, op)			\
-do {								\
-	unsigned int coffset = base + OBD_COUNTER_OFFSET(op);	\
-	LASSERT(coffset < stats->ls_num);			\
-	lprocfs_counter_init(stats, coffset, 0, #op, "reqs");	\
-} while (0)
-
-void lprocfs_init_ops_stats(int num_private_stats, struct lprocfs_stats *stats)
-{
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, iocontrol);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_info);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, set_info_async);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setup);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, precleanup);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, cleanup);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, process_config);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, postrecov);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, add_conn);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, del_conn);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, connect);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, reconnect);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, disconnect);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_init);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_fini);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, fid_alloc);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, statfs_async);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, packmd);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, unpackmd);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, create);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, setattr);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getattr);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, preprw);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, commitrw);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, init_export);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, destroy_export);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, import_event);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, notify);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, health_check);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, get_uuid);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, quotactl);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, ping);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_new);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_rem);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_add);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, pool_del);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, getref);
-	LPROCFS_OBD_OP_INIT(num_private_stats, stats, putref);
-
-	CLASSERT(NUM_OBD_STATS == OBD_COUNTER_OFFSET(putref) + 1);
-}
-EXPORT_SYMBOL(lprocfs_init_ops_stats);
-
-int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned num_private_stats)
+int lprocfs_alloc_obd_stats(struct obd_device *obd, unsigned int num_stats)
 {
 	struct lprocfs_stats *stats;
-	unsigned int num_stats;
-	int rc, i;
+	int rc;
 
 	LASSERT(obd->obd_stats == NULL);
 	LASSERT(obd->obd_proc_entry != NULL);
-	LASSERT(obd->obd_cntr_base == 0);
 
-	num_stats = NUM_OBD_STATS + num_private_stats;
 	stats = lprocfs_alloc_stats(num_stats, 0);
 	if (stats == NULL)
 		return -ENOMEM;
 
-	lprocfs_init_ops_stats(num_private_stats, stats);
-
-	for (i = num_private_stats; i < num_stats; i++) {
-		/* If this LBUGs, it is likely that an obd
-		 * operation was added to struct obd_ops in
-		 * <obd.h>, and that the corresponding line item
-		 * LPROCFS_OBD_OP_INIT(.., .., opname)
-		 * is missing from the list above. */
-		LASSERTF(stats->ls_cnt_header[i].lc_name != NULL,
-			 "Missing obd_stat initializer obd_op "
-			 "operation at offset %d.\n", i - num_private_stats);
-	}
 	rc = lprocfs_register_stats(obd->obd_proc_entry, "stats", stats);
-	if (rc < 0) {
+	if (rc < 0)
 		lprocfs_free_stats(&stats);
-	} else {
-		obd->obd_stats  = stats;
-		obd->obd_cntr_base = num_private_stats;
-	}
+	else
+		obd->obd_stats = stats;
+
 	return rc;
 }
 EXPORT_SYMBOL(lprocfs_alloc_obd_stats);
@@ -504,48 +670,195 @@ void lprocfs_free_obd_stats(struct obd_device *obd)
 }
 EXPORT_SYMBOL(lprocfs_free_obd_stats);
 
+static void display_brw_stats(struct seq_file *seq, const char *name,
+			      const char *units, struct obd_histogram *read,
+			      struct obd_histogram *write, bool scale)
+{
+	unsigned long read_tot, write_tot, r, w, read_cum = 0, write_cum = 0;
+	unsigned int i;
+
+	seq_printf(seq, "\n%26s read      |     write\n", " ");
+	seq_printf(seq, "%-22s %-5s %% cum %% |  %-11s %% cum %%\n",
+		   name, units, units);
+
+	read_tot = lprocfs_oh_sum(read);
+	write_tot = lprocfs_oh_sum(write);
+
+	if (!read_tot && !write_tot)
+		return;
+
+	for (i = 0; i < OBD_HIST_MAX; i++) {
+		r = read->oh_buckets[i];
+		w = write->oh_buckets[i];
+		read_cum += r;
+		write_cum += w;
+		if (read_cum == 0 && write_cum == 0)
+			continue;
+
+		if (!scale)
+			seq_printf(seq, "%u", i);
+		else if (i < 10)
+			seq_printf(seq, "%lu", BIT(i));
+		else if (i < 20)
+			seq_printf(seq, "%luK", BIT(i - 10));
+		else
+			seq_printf(seq, "%luM", BIT(i - 20));
+
+		seq_printf(seq, ":\t\t%10lu %3u %3u   | %4lu %3u %3u\n",
+			   r, pct(r, read_tot), pct(read_cum, read_tot),
+			   w, pct(w, write_tot), pct(write_cum, write_tot));
+
+		if (read_cum == read_tot && write_cum == write_tot)
+			break;
+	}
+}
+
+static const struct brw_stats_props brw_props[] = {
+	{ .bsp_name	= "pages per bulk r/w",
+	  .bsp_units	= "rpcs",
+	  .bsp_scale	= true				},
+	{ .bsp_name	= "discontiguous pages",
+	  .bsp_units	= "rpcs",
+	  .bsp_scale	= false				},
+	{ .bsp_name	= "discontiguous blocks",
+	  .bsp_units	= "rpcs",
+	  .bsp_scale	= false				},
+	{ .bsp_name	= "disk fragmented I/Os",
+	  .bsp_units	= "ios",
+	  .bsp_scale	= false				},
+	{ .bsp_name	= "disk I/Os in flight",
+	  .bsp_units	= "ios",
+	  .bsp_scale	= false				},
+	{ .bsp_name	= "I/O time (1/1000s)",
+	  .bsp_units	= "ios",
+	  .bsp_scale	= true				},
+	{ .bsp_name	= "disk I/O size",
+	  .bsp_units	= "ios",
+	  .bsp_scale	= true				},
+};
+
+static int brw_stats_seq_show(struct seq_file *seq, void *v)
+{
+	struct brw_stats *brw_stats = seq->private;
+	int i;
+
+	/* this sampling races with updates */
+	lprocfs_stats_header(seq, ktime_get(), brw_stats->bs_init, 25, ":", 1);
+
+	for (i = 0; i < ARRAY_SIZE(brw_stats->bs_props); i++) {
+		if (!brw_stats->bs_props[i].bsp_name)
+			continue;
+
+		display_brw_stats(seq, brw_stats->bs_props[i].bsp_name,
+				  brw_stats->bs_props[i].bsp_units,
+				  &brw_stats->bs_hist[i * 2],
+				  &brw_stats->bs_hist[i * 2 + 1],
+				  brw_stats->bs_props[i].bsp_scale);
+	}
+
+	return 0;
+}
+
+static ssize_t brw_stats_seq_write(struct file *file,
+				   const char __user *buf,
+				   size_t len, loff_t *off)
+{
+	struct seq_file *seq = file->private_data;
+	struct brw_stats *brw_stats = seq->private;
+	int i;
+
+	for (i = 0; i < BRW_RW_STATS_NUM; i++)
+		lprocfs_oh_clear(&brw_stats->bs_hist[i]);
+
+	return len;
+}
+
+LDEBUGFS_SEQ_FOPS(brw_stats);
+
+void ldebugfs_register_osd_stats(struct dentry *parent,
+				 struct brw_stats *brw_stats,
+				 struct lprocfs_stats *stats)
+{
+	int i;
+
+	LASSERT(brw_stats);
+	brw_stats->bs_init = ktime_get();
+	for (i = 0; i < BRW_RW_STATS_NUM; i++) {
+		struct brw_stats_props *props = brw_stats->bs_props;
+
+		spin_lock_init(&brw_stats->bs_hist[i].oh_lock);
+		if (i % 2) {
+			props[i / 2].bsp_name = brw_props[i / 2].bsp_name;
+			props[i / 2].bsp_units = brw_props[i / 2].bsp_units;
+			props[i / 2].bsp_scale = brw_props[i / 2].bsp_scale;
+		}
+	}
+
+	if (!parent)
+		return;
+
+	debugfs_create_file("brw_stats", 0644, parent, brw_stats,
+			    &brw_stats_fops);
+
+	if (stats)
+		debugfs_create_file("stats", 0644, parent, stats,
+				    &ldebugfs_stats_seq_fops);
+}
+EXPORT_SYMBOL(ldebugfs_register_osd_stats);
+
 int lprocfs_hash_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = m->private;
-	int c = 0;
 
 	if (obd == NULL)
 		return 0;
 
-	c += cfs_hash_debug_header(m);
-	c += cfs_hash_debug_str(obd->obd_uuid_hash, m);
-	c += cfs_hash_debug_str(obd->obd_nid_hash, m);
-	c += cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
-	return c;
+	/* header for rhashtable state */
+	seq_printf(m, "%-*s   cur   min        max theta t-min t-max flags  rehash   count  maxdep distribution\n",
+		   HASH_NAME_LEN, "name");
+	ldebugfs_rhash_seq_show("UUID_HASH", &obd->obd_uuid_hash, m);
+	ldebugfs_rhash_seq_show("NID_HASH", &obd->obd_nid_hash.ht, m);
+
+	cfs_hash_debug_header(m);
+	cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
+	return 0;
 }
 EXPORT_SYMBOL(lprocfs_hash_seq_show);
 
 int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = m->private;
+	struct target_distribute_txn_data *tdtd;
 
 	LASSERT(obd != NULL);
 
 	seq_printf(m, "status: ");
-	if (obd->obd_max_recoverable_clients == 0) {
+	if (atomic_read(&obd->obd_max_recoverable_clients) == 0) {
 		seq_printf(m, "INACTIVE\n");
 		goto out;
 	}
 
-	/* sampled unlocked, but really... */
-	if (obd->obd_recovering == 0) {
+	/* There is gap between client data read from storage and setting
+	 * obd_recovering so check obd_recovery_end as well to make sure
+	 * recovery is really finished
+	 */
+	if (obd->obd_recovery_end > 0 && !obd->obd_recovering) {
 		seq_printf(m, "COMPLETE\n");
-		seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
-		seq_printf(m, "recovery_duration: %lu\n",
-			   obd->obd_recovery_end - obd->obd_recovery_start);
+		seq_printf(m, "recovery_start: %lld\n",
+			   (s64)ktime_get_real_seconds() -
+			   (ktime_get_seconds() - obd->obd_recovery_start));
+		seq_printf(m, "recovery_duration: %lld\n",
+			   obd->obd_recovery_end ?
+			   obd->obd_recovery_end - obd->obd_recovery_start :
+			   ktime_get_seconds() - obd->obd_recovery_start);
 		/* Number of clients that have completed recovery */
 		seq_printf(m, "completed_clients: %d/%d\n",
-			   obd->obd_max_recoverable_clients -
+			   atomic_read(&obd->obd_max_recoverable_clients) -
 			   obd->obd_stale_clients,
-			   obd->obd_max_recoverable_clients);
+			   atomic_read(&obd->obd_max_recoverable_clients));
 		seq_printf(m, "replayed_requests: %d\n",
 			   obd->obd_replayed_requests);
-		seq_printf(m, "last_transno: "LPD64"\n",
+		seq_printf(m, "last_transno: %lld\n",
 			   obd->obd_next_recovery_transno - 1);
 		seq_printf(m, "VBR: %s\n", obd->obd_version_recov ?
 			   "ENABLED" : "DISABLED");
@@ -554,18 +867,54 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 		goto out;
 	}
 
+	tdtd = obd->u.obt.obt_lut->lut_tdtd;
+	if (tdtd && tdtd->tdtd_show_update_logs_retrievers) {
+		char *buf;
+		int size = 0;
+		int count = 0;
+
+		buf = tdtd->tdtd_show_update_logs_retrievers(
+			tdtd->tdtd_show_retrievers_cbdata,
+			&size, &count);
+		if (count > 0) {
+			seq_printf(m, "WAITING\n");
+			seq_printf(m, "non-ready MDTs: %s\n",
+				   buf ? buf : "unknown (not enough RAM)");
+			seq_printf(m, "recovery_start: %lld\n",
+				   (s64)ktime_get_real_seconds() -
+				   (ktime_get_seconds() -
+				    obd->obd_recovery_start));
+			seq_printf(m, "time_waited: %lld\n",
+				   (s64)(ktime_get_seconds() -
+					 obd->obd_recovery_start));
+		}
+
+		if (buf != NULL)
+			OBD_FREE(buf, size);
+
+		if (likely(count > 0))
+			goto out;
+	}
+
+	/* recovery won't start until the clients connect */
+	if (obd->obd_recovery_start == 0) {
+		seq_printf(m, "WAITING_FOR_CLIENTS\n");
+		goto out;
+	}
+
 	seq_printf(m, "RECOVERING\n");
-	seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
-	seq_printf(m, "time_remaining: %lu\n",
-		   cfs_time_current_sec() >=
+	seq_printf(m, "recovery_start: %lld\n", (s64)ktime_get_real_seconds() -
+		   (ktime_get_seconds() - obd->obd_recovery_start));
+	seq_printf(m, "time_remaining: %lld\n",
+		   ktime_get_seconds() >=
 		   obd->obd_recovery_start +
 		   obd->obd_recovery_timeout ? 0 :
-		   obd->obd_recovery_start +
-		   obd->obd_recovery_timeout -
-		   cfs_time_current_sec());
+		   (s64)(obd->obd_recovery_start +
+			 obd->obd_recovery_timeout -
+			 ktime_get_seconds()));
 	seq_printf(m, "connected_clients: %d/%d\n",
 		   atomic_read(&obd->obd_connected_clients),
-		   obd->obd_max_recoverable_clients);
+		   atomic_read(&obd->obd_max_recoverable_clients));
 	/* Number of clients that have completed recovery */
 	seq_printf(m, "req_replay_clients: %d\n",
 		   atomic_read(&obd->obd_req_replay_clients));
@@ -578,32 +927,32 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data)
 	seq_printf(m, "replayed_requests: %d\n", obd->obd_replayed_requests);
 	seq_printf(m, "queued_requests: %d\n",
 		   obd->obd_requests_queued_for_recovery);
-	seq_printf(m, "next_transno: "LPD64"\n",
+	seq_printf(m, "next_transno: %lld\n",
 		   obd->obd_next_recovery_transno);
 out:
 	return 0;
 }
 EXPORT_SYMBOL(lprocfs_recovery_status_seq_show);
 
-int lprocfs_ir_factor_seq_show(struct seq_file *m, void *data)
+ssize_t ir_factor_show(struct kobject *kobj, struct attribute *attr,
+		       char *buf)
 {
-	struct obd_device *obd = m->private;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	LASSERT(obd != NULL);
-	return seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+	return scnprintf(buf, PAGE_SIZE, "%d\n", obd->obd_recovery_ir_factor);
 }
-EXPORT_SYMBOL(lprocfs_ir_factor_seq_show);
+EXPORT_SYMBOL(ir_factor_show);
 
-ssize_t
-lprocfs_ir_factor_seq_write(struct file *file, const char *buffer,
-			    size_t count, loff_t *off)
+ssize_t ir_factor_store(struct kobject *kobj, struct attribute *attr,
+			const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *obd = m->private;
-	int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	int val;
+	int rc;
 
-	LASSERT(obd != NULL);
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = kstrtoint(buffer, 10, &val);
 	if (rc)
 		return rc;
 
@@ -613,71 +962,103 @@ lprocfs_ir_factor_seq_write(struct file *file, const char *buffer,
 	obd->obd_recovery_ir_factor = val;
 	return count;
 }
-EXPORT_SYMBOL(lprocfs_ir_factor_seq_write);
+EXPORT_SYMBOL(ir_factor_store);
 
-int lprocfs_recovery_time_soft_seq_show(struct seq_file *m, void *data)
+int lprocfs_checksum_dump_seq_show(struct seq_file *m, void *data)
 {
 	struct obd_device *obd = m->private;
 
 	LASSERT(obd != NULL);
-	return seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+	seq_printf(m, "%d\n", obd->obd_checksum_dump);
+	return 0;
 }
-EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_show);
+EXPORT_SYMBOL(lprocfs_checksum_dump_seq_show);
 
 ssize_t
-lprocfs_recovery_time_soft_seq_write(struct file *file, const char *buffer,
-					size_t count, loff_t *off)
+lprocfs_checksum_dump_seq_write(struct file *file, const char __user *buffer,
+			    size_t count, loff_t *off)
 {
 	struct seq_file *m = file->private_data;
 	struct obd_device *obd = m->private;
-	int val, rc;
+	bool val;
+	int rc;
 
 	LASSERT(obd != NULL);
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = kstrtobool_from_user(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	obd->obd_checksum_dump = val;
+	return count;
+}
+EXPORT_SYMBOL(lprocfs_checksum_dump_seq_write);
+
+ssize_t recovery_time_soft_show(struct kobject *kobj, struct attribute *attr,
+				char *buf)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+
+	return scnprintf(buf, PAGE_SIZE, "%d\n", obd->obd_recovery_timeout);
+}
+EXPORT_SYMBOL(recovery_time_soft_show);
+
+ssize_t recovery_time_soft_store(struct kobject *kobj,
+				 struct attribute *attr,
+				 const char *buffer, size_t count)
+{
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	unsigned int val;
+	int rc;
+
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc)
 		return rc;
 
 	obd->obd_recovery_timeout = val;
 	return count;
 }
-EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_write);
+EXPORT_SYMBOL(recovery_time_soft_store);
 
-int lprocfs_recovery_time_hard_seq_show(struct seq_file *m, void *data)
+ssize_t recovery_time_hard_show(struct kobject *kobj, struct attribute *attr,
+				char *buf)
 {
-	struct obd_device *obd = m->private;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 
-	LASSERT(obd != NULL);
-	return seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+	return scnprintf(buf, PAGE_SIZE, "%d\n", obd->obd_recovery_time_hard);
 }
-EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_show);
+EXPORT_SYMBOL(recovery_time_hard_show);
 
-ssize_t
-lprocfs_recovery_time_hard_seq_write(struct file *file, const char *buffer,
-				     size_t count, loff_t *off)
+ssize_t recovery_time_hard_store(struct kobject *kobj,
+				 struct attribute *attr,
+				 const char *buffer, size_t count)
 {
-	struct seq_file *m = file->private_data;
-	struct obd_device *obd = m->private;
-	int val, rc;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
+	unsigned int val;
+	int rc;
 
-	LASSERT(obd != NULL);
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = kstrtouint(buffer, 0, &val);
 	if (rc)
 		return rc;
 
 	obd->obd_recovery_time_hard = val;
 	return count;
 }
-EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_write);
+EXPORT_SYMBOL(recovery_time_hard_store);
 
-int lprocfs_target_instance_seq_show(struct seq_file *m, void *data)
+ssize_t instance_show(struct kobject *kobj, struct attribute *attr,
+		      char *buf)
 {
-	struct obd_device *obd = m->private;
+	struct obd_device *obd = container_of(kobj, struct obd_device,
+					      obd_kset.kobj);
 	struct obd_device_target *target = &obd->u.obt;
 
-	LASSERT(obd != NULL);
 	LASSERT(target->obt_magic == OBT_MAGIC);
-	return seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+	return scnprintf(buf, PAGE_SIZE, "%u\n", obd->u.obt.obt_instance);
 }
-EXPORT_SYMBOL(lprocfs_target_instance_seq_show);
+EXPORT_SYMBOL(instance_show);
 
 #endif /* CONFIG_PROC_FS*/