X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_lproc.c;h=c4fb103a3831f2b5ca9d4a46e3fb9db44cef653d;hb=7e1758e5621df902c5942d100a75cebde8df0327;hp=f3a662c19adda502ca721cfd57f459671211dd8d;hpb=98d88213b8adde7cfa4a3b7aa1ff65e17e7e93a9;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c
index f3a662c..c4fb103 100644
--- a/lustre/osd-zfs/osd_lproc.c
+++ b/lustre/osd-zfs/osd_lproc.c
@@ -26,10 +26,8 @@
 /*
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
- */
-/*
- * Copyright (c) 2012, Intel Corporation.
- * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -50,7 +48,111 @@
 
 #include "osd_internal.h"
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
+
+#define pct(a, b) (b ? a * 100 / b : 0)
+
+static void display_brw_stats(struct seq_file *seq, char *name, char *units,
+			      struct obd_histogram *read,
+			      struct obd_histogram *write, int scale)
+{
+	unsigned long read_tot, write_tot, r, w, read_cum = 0, write_cum = 0;
+	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);
+	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, "%u", scale << i);
+		else if (i < 20)
+			seq_printf(seq, "%uK", scale << (i-10));
+		else
+			seq_printf(seq, "%uM", scale << (i-20));
+
+		seq_printf(seq, ":\t\t%10lu %3lu %3lu   | %4lu %3lu %3lu\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 void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
+{
+	struct timeval now;
+
+	/* this sampling races with updates */
+	do_gettimeofday(&now);
+	seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
+		   now.tv_sec, now.tv_usec);
+
+	display_brw_stats(seq, "pages per bulk r/w", "rpcs",
+			  &brw_stats->hist[BRW_R_PAGES],
+			  &brw_stats->hist[BRW_W_PAGES], 1);
+	display_brw_stats(seq, "discontiguous pages", "rpcs",
+			  &brw_stats->hist[BRW_R_DISCONT_PAGES],
+			  &brw_stats->hist[BRW_W_DISCONT_PAGES], 0);
+#if 0
+	display_brw_stats(seq, "discontiguous blocks", "rpcs",
+			  &brw_stats->hist[BRW_R_DISCONT_BLOCKS],
+			  &brw_stats->hist[BRW_W_DISCONT_BLOCKS], 0);
+
+	display_brw_stats(seq, "disk fragmented I/Os", "ios",
+			  &brw_stats->hist[BRW_R_DIO_FRAGS],
+			  &brw_stats->hist[BRW_W_DIO_FRAGS], 0);
+#endif
+	display_brw_stats(seq, "disk I/Os in flight", "ios",
+			  &brw_stats->hist[BRW_R_RPC_HIST],
+			  &brw_stats->hist[BRW_W_RPC_HIST], 0);
+
+	display_brw_stats(seq, "I/O time (1/1000s)", "ios",
+			  &brw_stats->hist[BRW_R_IO_TIME],
+			  &brw_stats->hist[BRW_W_IO_TIME], 1000 / HZ);
+
+	display_brw_stats(seq, "disk I/O size", "ios",
+			  &brw_stats->hist[BRW_R_DISK_IOSIZE],
+			  &brw_stats->hist[BRW_W_DISK_IOSIZE], 1);
+}
+
+#undef pct
+
+static int osd_brw_stats_seq_show(struct seq_file *seq, void *v)
+{
+	struct osd_device *osd = seq->private;
+
+	brw_stats_show(seq, &osd->od_brw_stats);
+
+	return 0;
+}
+
+static ssize_t osd_brw_stats_seq_write(struct file *file, const char *buf,
+				       size_t len, loff_t *off)
+{
+	struct seq_file *seq = file->private_data;
+	struct osd_device *osd = seq->private;
+	int i;
+
+	for (i = 0; i < BRW_LAST; i++)
+		lprocfs_oh_clear(&osd->od_brw_stats.hist[i]);
+
+	return len;
+}
+
+LPROC_SEQ_FOPS(osd_brw_stats);
 
 static int osd_stats_init(struct osd_device *osd)
 {
@@ -99,6 +201,8 @@ static int osd_stats_init(struct osd_device *osd)
 				LPROCFS_CNTR_AVGMINMAX,
 				"thandle_closing", "usec");
 #endif
+		result = lprocfs_seq_create(osd->od_proc_entry, "brw_stats",
+					    0644, &osd_brw_stats_fops, osd);
 	} else {
 		result = -ENOMEM;
 	}
@@ -177,7 +281,7 @@ LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesavail);
 LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_filestotal);
 LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_filesfree);
 
-struct lprocfs_seq_vars lprocfs_osd_obd_vars[] = {
+struct lprocfs_vars lprocfs_osd_obd_vars[] = {
 	{ .name	=	"blocksize",
 	  .fops	=	&zfs_dt_blksize_fops		},
 	{ .name	=	"kbytestotal",
@@ -217,8 +321,9 @@ int osd_procfs_init(struct osd_device *osd, const char *name)
 	LASSERT(name != NULL);
 	LASSERT(type != NULL);
 
-	osd->od_proc_entry = lprocfs_seq_register(name, type->typ_procroot,
-			lprocfs_osd_obd_vars, &osd->od_dt_dev);
+	osd->od_proc_entry = lprocfs_register(name, type->typ_procroot,
+					      lprocfs_osd_obd_vars,
+					      &osd->od_dt_dev);
 	if (IS_ERR(osd->od_proc_entry)) {
 		rc = PTR_ERR(osd->od_proc_entry);
 		CERROR("Error %d setting up lprocfs for %s\n", rc, name);