X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_lproc.c;h=7e742fdd9e7622911ef336e5bd6f6ae30c19e8ad;hb=a9b9dd8312417fcb82513108f11b4684b67aefaa;hp=8fdd42c3a4c732f762dcd06341778de3465ba625;hpb=08aa217ce49aba1ded52e0f7adb8a607035123fd;p=fs%2Flustre-release.git

diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c
index 8fdd42c..7e742fd 100644
--- a/lustre/osd-zfs/osd_lproc.c
+++ b/lustre/osd-zfs/osd_lproc.c
@@ -15,21 +15,15 @@
  *
  * 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
- *
- * 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.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * 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, 2017, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -41,25 +35,126 @@
  * Author: Mike Pershin <tappro@whamcloud.com>
  */
 
-#define DEBUG_SUBSYSTEM S_CLASS
+#define DEBUG_SUBSYSTEM S_OSD
 
 #include <obd.h>
 #include <obd_class.h>
 #include <lprocfs_status.h>
-#include <lu_time.h>
-
-#include <lustre/lustre_idl.h>
+#include <lustre_scrub.h>
 
-#include "udmu.h"
 #include "osd_internal.h"
 
-#ifdef LPROCFS
+#ifdef CONFIG_PROC_FS
+
+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 %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 void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
+{
+	struct timespec64 now;
+
+	/* this sampling races with updates */
+	ktime_get_real_ts64(&now);
+	seq_printf(seq, "snapshot_time:         %llu.%09lu (secs.nsecs)\n",
+		   (s64)now.tv_sec, now.tv_nsec);
+
+	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], 1);
+
+	display_brw_stats(seq, "disk I/O size", "ios",
+			  &brw_stats->hist[BRW_R_DISK_IOSIZE],
+			  &brw_stats->hist[BRW_W_DISK_IOSIZE], 1);
+}
+
+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 __user *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)
 {
-	int result;
+	int result, i;
 	ENTRY;
 
+	for (i = 0; i < BRW_LAST; i++)
+		spin_lock_init(&osd->od_brw_stats.hist[i].oh_lock);
+
 	osd->od_stats = lprocfs_alloc_stats(LPROC_OSD_LAST, 0);
 	if (osd->od_stats != NULL) {
 		result = lprocfs_register_stats(osd->od_proc_entry, "stats",
@@ -102,6 +197,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;
 	}
@@ -110,103 +207,261 @@ out:
 	RETURN(result);
 }
 
-static int lprocfs_osd_rd_fstype(char *page, char **start, off_t off,
-				int count, int *eof, void *data)
+static int zfs_osd_oi_scrub_seq_show(struct seq_file *m, void *data)
 {
-	return snprintf(page, count, "zfs\n");
+	struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private);
+
+	LASSERT(dev != NULL);
+	if (!dev->od_os)
+		return -EINPROGRESS;
+
+	scrub_dump(m, &dev->od_scrub);
+	return 0;
 }
+LDEBUGFS_SEQ_FOPS_RO(zfs_osd_oi_scrub);
 
-static int lprocfs_osd_rd_mntdev(char *page, char **start, off_t off, int count,
-				int *eof, void *data)
+static ssize_t auto_scrub_show(struct kobject *kobj, struct attribute *attr,
+			      char *buf)
 {
-	struct osd_device *osd = osd_dt_dev((struct dt_device *)data);
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *dev = osd_dt_dev(dt);
 
-	LASSERT(osd != NULL);
-	*eof = 1;
+	LASSERT(dev);
+	if (!dev->od_os)
+		return -EINPROGRESS;
 
-	return snprintf(page, count, "%s\n", osd->od_mntdev);
+	return sprintf(buf, "%lld\n", dev->od_auto_scrub_interval);
 }
 
-static int lprocfs_osd_wr_force_sync(struct file *file, const char *buffer,
-					unsigned long count, void *data)
+static ssize_t auto_scrub_store(struct kobject *kobj, struct attribute *attr,
+				const char *buffer, size_t count)
 {
-	struct dt_device  *dt = data;
-	struct lu_env      env;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *dev = osd_dt_dev(dt);
+	s64 val;
+	int rc;
+
+	LASSERT(dev);
+	if (!dev->od_os)
+		return -EINPROGRESS;
+
+	rc = kstrtoull(buffer, 0, &val);
+	if (rc)
+		return rc;
+
+	dev->od_auto_scrub_interval = val;
+	return count;
+}
+LUSTRE_RW_ATTR(auto_scrub);
+
+static ssize_t fstype_show(struct kobject *kobj, struct attribute *attr,
+			  char *buf)
+{
+	return sprintf(buf, "zfs\n");
+}
+LUSTRE_RO_ATTR(fstype);
+
+static ssize_t mntdev_show(struct kobject *kobj, struct attribute *attr,
+			   char *buf)
+{
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *osd = osd_dt_dev(dt);
+
+	LASSERT(osd);
+
+	return sprintf(buf, "%s\n", osd->od_mntdev);
+}
+LUSTRE_RO_ATTR(mntdev);
+
+ssize_t force_sync_store(struct kobject *kobj, struct attribute *attr,
+			 const char *buffer, size_t count)
+{
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct lu_env env;
 	int rc;
 
 	rc = lu_env_init(&env, LCT_LOCAL);
 	if (rc)
 		return rc;
+
 	rc = dt_sync(&env, dt);
 	lu_env_fini(&env);
 
 	return rc == 0 ? count : rc;
 }
+LUSTRE_WO_ATTR(force_sync);
 
-static int lprocfs_osd_rd_iused_est(char *page, char **start, off_t off, int count,
-					int *eof, void *data)
+static ssize_t nonrotational_show(struct kobject *kobj, struct attribute *attr,
+				  char *buf)
 {
-	struct osd_device *osd = osd_dt_dev((struct dt_device *)data);
-	LASSERT(osd != NULL);
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *osd = osd_dt_dev(dt);
+
+	LASSERT(osd);
+	if (!osd->od_os)
+		return -EINPROGRESS;
 
-	return snprintf(page, count, "%d\n", osd->od_quota_iused_est);
+	return sprintf(buf, "%u\n", osd->od_nonrotational);
 }
 
-static int lprocfs_osd_wr_iused_est(struct file *file, const char *buffer,
-					unsigned long count, void *data)
+static ssize_t nonrotational_store(struct kobject *kobj,
+				   struct attribute *attr, const char *buffer,
+				   size_t count)
 {
-	struct osd_device *osd = osd_dt_dev((struct dt_device *)data);
-	int                rc, val;
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *osd = osd_dt_dev(dt);
+	bool val;
+	int rc;
 
-	LASSERT(osd != NULL);
+	LASSERT(osd);
+	if (!osd->od_os)
+		return -EINPROGRESS;
 
-	rc = lprocfs_write_helper(buffer, count, &val);
+	rc = kstrtobool(buffer, &val);
 	if (rc)
 		return rc;
 
-	osd->od_quota_iused_est = !!val;
+	osd->od_nonrotational = val;
+	return count;
+}
+LUSTRE_RW_ATTR(nonrotational);
 
+static ssize_t index_backup_show(struct kobject *kobj, struct attribute *attr,
+				 char *buf)
+{
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *dev = osd_dt_dev(dt);
+
+	LASSERT(dev);
+	if (!dev->od_os)
+		return -EINPROGRESS;
+
+	return sprintf(buf, "%d\n", dev->od_index_backup_policy);
+}
+
+ssize_t index_backup_store(struct kobject *kobj, struct attribute *attr,
+			   const char *buffer, size_t count)
+{
+	struct dt_device *dt = container_of(kobj, struct dt_device,
+					    dd_kobj);
+	struct osd_device *dev = osd_dt_dev(dt);
+	int val;
+	int rc;
+
+	LASSERT(dev);
+	if (!dev->od_os)
+		return -EINPROGRESS;
+
+	rc = kstrtoint(buffer, 0, &val);
+	if (rc)
+		return rc;
+
+	dev->od_index_backup_policy = val;
 	return count;
 }
+LUSTRE_RW_ATTR(index_backup);
 
-struct lprocfs_vars lprocfs_osd_obd_vars[] = {
-	{ "blocksize",       lprocfs_osd_rd_blksize,     0, 0 },
-	{ "kbytestotal",     lprocfs_osd_rd_kbytestotal, 0, 0 },
-	{ "kbytesfree",      lprocfs_osd_rd_kbytesfree,  0, 0 },
-	{ "kbytesavail",     lprocfs_osd_rd_kbytesavail, 0, 0 },
-	{ "filestotal",      lprocfs_osd_rd_filestotal,  0, 0 },
-	{ "filesfree",       lprocfs_osd_rd_filesfree,   0, 0 },
-	{ "fstype",          lprocfs_osd_rd_fstype,      0, 0 },
-	{ "mntdev",          lprocfs_osd_rd_mntdev,      0, 0 },
-	{ "force_sync",      0, lprocfs_osd_wr_force_sync     },
-	{ "quota_iused_estimate",  lprocfs_osd_rd_iused_est,
-		lprocfs_osd_wr_iused_est,   0, 0 },
-	{ 0 }
+static int zfs_osd_readcache_seq_show(struct seq_file *m, void *data)
+{
+	struct osd_device *osd = osd_dt_dev((struct dt_device *)m->private);
+
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_os == NULL))
+		return -EINPROGRESS;
+
+	seq_printf(m, "%llu\n", osd->od_readcache_max_filesize);
+	return 0;
+}
+
+static ssize_t
+zfs_osd_readcache_seq_write(struct file *file, const char __user *buffer,
+			    size_t count, loff_t *off)
+{
+	struct seq_file *m = file->private_data;
+	struct dt_device *dt = m->private;
+	struct osd_device *osd = osd_dt_dev(dt);
+	char kernbuf[22] = "";
+	u64 val;
+	int rc;
+
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_os == NULL))
+		return -EINPROGRESS;
+
+	if (count >= sizeof(kernbuf))
+		return -EINVAL;
+
+	if (copy_from_user(kernbuf, buffer, count))
+		return -EFAULT;
+	kernbuf[count] = 0;
+
+	rc = sysfs_memparse(kernbuf, count, &val, "B");
+	if (rc < 0)
+		return rc;
+
+	osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ?
+					 OSD_MAX_CACHE_SIZE : val;
+	return count;
+}
+LDEBUGFS_SEQ_FOPS(zfs_osd_readcache);
+
+static struct attribute *zfs_attrs[] = {
+	&lustre_attr_fstype.attr,
+	&lustre_attr_mntdev.attr,
+	&lustre_attr_force_sync.attr,
+	&lustre_attr_nonrotational.attr,
+	&lustre_attr_index_backup.attr,
+	&lustre_attr_auto_scrub.attr,
+	NULL,
 };
 
-struct lprocfs_vars lprocfs_osd_module_vars[] = {
-	{ "num_refs",        lprocfs_rd_numrefs,         0, 0 },
+struct lprocfs_vars lprocfs_osd_obd_vars[] = {
+	{ .name	=	"oi_scrub",
+	  .fops	=	&zfs_osd_oi_scrub_fops		},
+	{ .name =	"readcache_max_filesize",
+	  .fops =	&zfs_osd_readcache_fops		},
 	{ 0 }
 };
 
 int osd_procfs_init(struct osd_device *osd, const char *name)
 {
 	struct obd_type *type;
-	int		 rc;
-	ENTRY;
+	int rc;
 
-	if (osd->od_proc_entry)
-		RETURN(0);
+	ENTRY;
 
 	/* at the moment there is no linkage between lu_type
-	 * and obd_type, so we lookup obd_type this way */
+	 * and obd_type, so we lookup obd_type this way
+	 */
 	type = class_search_type(LUSTRE_OSD_ZFS_NAME);
 
-	LASSERT(name != NULL);
-	LASSERT(type != NULL);
+	LASSERT(type);
+	LASSERT(name);
+
+	/* put reference taken by class_search_type */
+	kobject_put(&type->typ_kobj);
+
+	osd->od_dt_dev.dd_ktype.default_attrs = zfs_attrs;
+	rc = dt_tunables_init(&osd->od_dt_dev, type, name,
+			      lprocfs_osd_obd_vars);
+	if (rc) {
+		CERROR("%s: cannot setup sysfs / debugfs entry: %d\n",
+		       name, rc);
+		GOTO(out, rc);
+	}
+
+	if (osd->od_proc_entry)
+		RETURN(0);
 
 	osd->od_proc_entry = lprocfs_register(name, type->typ_procroot,
-			lprocfs_osd_obd_vars, &osd->od_dt_dev);
+					      NULL, &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);
@@ -235,7 +490,7 @@ int osd_procfs_fini(struct osd_device *osd)
 		osd->od_proc_entry = NULL;
 	}
 
-	RETURN(0);
+	return dt_tunables_fini(&osd->od_dt_dev);
 }
 
 #endif