X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_lproc.c;h=51718632c56ec1b1943ac2549d1337ed1d7febce;hb=bcdb90a56079ac9b7187f67f9c6052d4692d532b;hp=2bc3f372e0b756c8e82ba90f633b881b84a3ffc2;hpb=67076c3c7e2b11023b943db2f5031d9b9a11329c;p=fs%2Flustre-release.git

diff --git a/lustre/osd-ldiskfs/osd_lproc.c b/lustre/osd-ldiskfs/osd_lproc.c
index 2bc3f37..5171863 100644
--- a/lustre/osd-ldiskfs/osd_lproc.c
+++ b/lustre/osd-ldiskfs/osd_lproc.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.
@@ -29,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -43,8 +41,6 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <lprocfs_status.h>
-#include <lu_time.h>
-
 #include <lustre/lustre_idl.h>
 
 #include "osd_internal.h"
@@ -67,7 +63,7 @@ void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf)
         if (unlikely(nr_pages == 0))
                 return;
 
-        blocks_per_page = CFS_PAGE_SIZE >> osd_sb(osd)->s_blocksize_bits;
+	blocks_per_page = PAGE_CACHE_SIZE >> osd_sb(osd)->s_blocksize_bits;
 
         lprocfs_oh_tally_log2(&s->hist[BRW_R_PAGES+rw], nr_pages);
 
@@ -129,12 +125,12 @@ static void display_brw_stats(struct seq_file *seq, char *name, char *units,
 
 static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
 {
-        struct timeval now;
+	struct timeval now;
 
-        /* this sampling races with updates */
-        cfs_gettimeofday(&now);
-        seq_printf(seq, "snapshot_time:         %lu.%lu (secs.usecs)\n",
-                   now.tv_sec, now.tv_usec);
+	/* 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],
@@ -156,9 +152,9 @@ static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
                           &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 / CFS_HZ);
+	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],
@@ -197,7 +193,7 @@ static int osd_stats_init(struct osd_device *osd)
         ENTRY;
 
         for (i = 0; i < BRW_LAST; i++)
-                cfs_spin_lock_init(&osd->od_brw_stats.hist[i].oh_lock);
+		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) {
@@ -232,8 +228,8 @@ static int osd_stats_init(struct osd_device *osd)
                                      LPROCFS_CNTR_AVGMINMAX,
                                      "thandle closing", "usec");
 #endif
-                lprocfs_seq_create(osd->od_proc_entry, "brw_stats",
-                                   0444, &osd_brw_stats_fops, osd);
+		result = lprocfs_seq_create(osd->od_proc_entry, "brw_stats",
+					    0644, &osd_brw_stats_fops, osd);
         } else
                 result = -ENOMEM;
 
@@ -241,23 +237,16 @@ out:
         RETURN(result);
 }
 
-static const char *osd_counter_names[] = {
-#if OSD_THANDLE_STATS
-        [LPROC_OSD_THANDLE_STARTING] = "thandle starting",
-        [LPROC_OSD_THANDLE_OPEN]     = "thandle open",
-        [LPROC_OSD_THANDLE_CLOSING]  = "thandle closing"
-#endif
-};
-
 int osd_procfs_init(struct osd_device *osd, const char *name)
 {
         struct lprocfs_static_vars lvars;
-        struct lu_device    *ld = &osd->od_dt_dev.dd_lu_dev;
         struct obd_type     *type;
         int                  rc;
         ENTRY;
 
-        type = ld->ld_type->ldt_obd_type;
+	/* at the moment there is no linkage between lu_type
+	 * and obd_type, so we lookup obd_type this way */
+	type = class_search_type(LUSTRE_OSD_LDISKFS_NAME);
 
         LASSERT(name != NULL);
         LASSERT(type != NULL);
@@ -265,7 +254,7 @@ int osd_procfs_init(struct osd_device *osd, const char *name)
         /* Find the type procroot and add the proc entry for this device */
         lprocfs_osd_init_vars(&lvars);
         osd->od_proc_entry = lprocfs_register(name, type->typ_procroot,
-                                              lvars.obd_vars, osd);
+                                              lvars.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",
@@ -274,10 +263,6 @@ int osd_procfs_init(struct osd_device *osd, const char *name)
                 GOTO(out, rc);
         }
 
-        rc = lu_time_init(&osd->od_stats,
-                          osd->od_proc_entry,
-                          osd_counter_names, ARRAY_SIZE(osd_counter_names));
-
         rc = osd_stats_init(osd);
 
         EXIT;
@@ -289,8 +274,8 @@ out:
 
 int osd_procfs_fini(struct osd_device *osd)
 {
-        if (osd->od_stats)
-                lu_time_fini(&osd->od_stats);
+	if (osd->od_stats)
+		lprocfs_free_stats(&osd->od_stats);
 
         if (osd->od_proc_entry) {
                  lprocfs_remove(&osd->od_proc_entry);
@@ -299,207 +284,264 @@ int osd_procfs_fini(struct osd_device *osd)
         RETURN(0);
 }
 
-void osd_lprocfs_time_start(const struct lu_env *env)
+static int lprocfs_osd_rd_fstype(char *page, char **start, off_t off, int count,
+				 int *eof, void *data)
 {
-        lu_lprocfs_time_start(env);
+	struct osd_device *osd = osd_dt_dev(data);
+
+        LASSERT(osd != NULL);
+        return snprintf(page, count, "ldiskfs\n");
 }
 
-void osd_lprocfs_time_end(const struct lu_env *env, struct osd_device *osd,
-                          int idx)
+static int lprocfs_osd_rd_mntdev(char *page, char **start, off_t off, int count,
+                                 int *eof, void *data)
 {
-        lu_lprocfs_time_end(env, osd->od_stats, idx);
-}
+        struct osd_device *osd = osd_dt_dev(data);
 
+        LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+                return -EINPROGRESS;
 
+	*eof = 1;
 
-int lprocfs_osd_rd_blksize(char *page, char **start, off_t off, int count,
-                           int *eof, void *data)
+	return snprintf(page, count, "%s\n", osd->od_mntdev);
+}
+
+static int lprocfs_osd_rd_cache(char *page, char **start, off_t off,
+				int count, int *eof, void *data)
 {
-        struct osd_device *osd = data;
-        int rc;
+	struct osd_device *osd = osd_dt_dev(data);
 
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
 
-        rc = osd_statfs(NULL, &osd->od_dt_dev, &osd->od_kstatfs);
-        if (!rc) {
-                *eof = 1;
-                rc = snprintf(page, count, "%ld\n", osd->od_kstatfs.f_bsize);
-        }
-        return rc;
+	return snprintf(page, count, "%u\n", osd->od_read_cache);
 }
 
-int lprocfs_osd_rd_kbytestotal(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
+static int lprocfs_osd_wr_cache(struct file *file, const char *buffer,
+				unsigned long count, void *data)
 {
-        struct osd_device *osd = data;
-        int rc;
+	struct osd_device	*osd = osd_dt_dev(data);
+	int			 val, rc;
 
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
 
-        rc = osd_statfs(NULL, &osd->od_dt_dev, &osd->od_kstatfs);
-        if (!rc) {
-                __u32 blk_size = osd->od_kstatfs.f_bsize >> 10;
-                __u64 result = osd->od_kstatfs.f_blocks;
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
 
-                while (blk_size >>= 1)
-                        result <<= 1;
+	osd->od_read_cache = !!val;
+	return count;
+}
 
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", result);
-        }
-        return rc;
+static int lprocfs_osd_rd_wcache(char *page, char **start, off_t off,
+				 int count, int *eof, void *data)
+{
+	struct osd_device *osd = osd_dt_dev(data);
+
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
+
+	return snprintf(page, count, "%u\n", osd->od_writethrough_cache);
 }
 
-int lprocfs_osd_rd_kbytesfree(char *page, char **start, off_t off, int count,
-                              int *eof, void *data)
+static int lprocfs_osd_wr_wcache(struct file *file, const char *buffer,
+				 unsigned long count, void *data)
 {
-        struct osd_device *osd = data;
-        int rc;
+	struct osd_device	*osd = osd_dt_dev(data);
+	int			 val, rc;
 
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
 
-        rc = osd_statfs(NULL, &osd->od_dt_dev, &osd->od_kstatfs);
-        if (!rc) {
-                __u32 blk_size = osd->od_kstatfs.f_bsize >> 10;
-                __u64 result = osd->od_kstatfs.f_bfree;
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
 
-                while (blk_size >>= 1)
-                        result <<= 1;
+	osd->od_writethrough_cache = !!val;
+	return count;
+}
 
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", result);
-        }
-        return rc;
+static int lprocfs_osd_wr_force_sync(struct file *file, const char *buffer,
+				     unsigned long count, void *data)
+{
+	struct osd_device	*osd = osd_dt_dev(data);
+	struct dt_device	*dt = data;
+	struct lu_env		 env;
+	int			 rc;
+
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
+
+	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;
 }
 
-int lprocfs_osd_rd_kbytesavail(char *page, char **start, off_t off, int count,
-                               int *eof, void *data)
+static int lprocfs_osd_rd_pdo(char *page, char **start, off_t off, int count,
+                              int *eof, void *data)
 {
-        struct osd_device *osd = data;
-        int rc;
+        *eof = 1;
 
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+        return snprintf(page, count, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+}
+
+static int lprocfs_osd_wr_pdo(struct file *file, const char *buffer,
+                              unsigned long count, void *data)
+{
+        int     pdo;
+        int     rc;
 
-        rc = osd_statfs(NULL, &osd->od_dt_dev, &osd->od_kstatfs);
-        if (!rc) {
-                __u32 blk_size = osd->od_kstatfs.f_bsize >> 10;
-                __u64 result = osd->od_kstatfs.f_bavail;
+        rc = lprocfs_write_helper(buffer, count, &pdo);
+        if (rc != 0)
+                return rc;
 
-                while (blk_size >>= 1)
-                        result <<= 1;
+        ldiskfs_pdo = !!pdo;
 
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", result);
-        }
-        return rc;
+        return count;
 }
 
-int lprocfs_osd_rd_filestotal(char *page, char **start, off_t off, int count,
-                              int *eof, void *data)
+static int lprocfs_osd_rd_auto_scrub(char *page, char **start, off_t off,
+				     int count, int *eof, void *data)
 {
-        struct osd_device *osd = data;
-        int rc;
+	struct osd_device *dev = osd_dt_dev(data);
 
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+	LASSERT(dev != NULL);
+	if (unlikely(dev->od_mnt == NULL))
+		return -EINPROGRESS;
 
-        rc = osd_statfs(NULL, &osd->od_dt_dev, &osd->od_kstatfs);
-        if (!rc) {
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", osd->od_kstatfs.f_files);
-        }
-
-        return rc;
+	*eof = 1;
+	return snprintf(page, count, "%d\n", !dev->od_noscrub);
 }
 
-int lprocfs_osd_rd_filesfree(char *page, char **start, off_t off, int count,
-                             int *eof, void *data)
+static int lprocfs_osd_wr_auto_scrub(struct file *file, const char *buffer,
+				     unsigned long count, void *data)
 {
-        struct osd_device *osd = data;
-        int rc;
+	struct osd_device *dev = osd_dt_dev(data);
+	int val, rc;
 
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+	LASSERT(dev != NULL);
+	if (unlikely(dev->od_mnt == NULL))
+		return -EINPROGRESS;
 
-        rc = osd_statfs(NULL, &osd->od_dt_dev, &osd->od_kstatfs);
-        if (!rc) {
-                *eof = 1;
-                rc = snprintf(page, count, LPU64"\n", osd->od_kstatfs.f_ffree);
-        }
-        return rc;
+	rc = lprocfs_write_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	dev->od_noscrub = !val;
+	return count;
 }
 
-int lprocfs_osd_rd_fstype(char *page, char **start, off_t off, int count,
-                          int *eof, void *data)
+static int lprocfs_osd_rd_track_declares_assert(char *page, char **start,
+						off_t off, int count,
+						int *eof, void *data)
 {
-        struct obd_device *osd = data;
+	*eof = 1;
 
-        LASSERT(osd != NULL);
-        return snprintf(page, count, "ldiskfs\n");
+	return snprintf(page, count, "%d\n", ldiskfs_track_declares_assert);
 }
 
-static int lprocfs_osd_rd_mntdev(char *page, char **start, off_t off, int count,
-                                 int *eof, void *data)
+static int lprocfs_osd_wr_track_declares_assert(struct file *file,
+						const char *buffer,
+						unsigned long count, void *data)
 {
-        struct osd_device *osd = data;
+	int     track_declares_assert;
+	int     rc;
 
-        LASSERT(osd != NULL);
-        if (unlikely(osd->od_mount == NULL))
-                return -EINPROGRESS;
+	rc = lprocfs_write_helper(buffer, count, &track_declares_assert);
+	if (rc != 0)
+		return rc;
 
-        LASSERT(osd->od_mount->lmi_mnt->mnt_devname);
-        *eof = 1;
+	ldiskfs_track_declares_assert = !!track_declares_assert;
 
-        return snprintf(page, count, "%s\n",
-                        osd->od_mount->lmi_mnt->mnt_devname);
+	return count;
 }
 
-#ifdef HAVE_LDISKFS_PDO
-static int lprocfs_osd_rd_pdo(char *page, char **start, off_t off, int count,
-                              int *eof, void *data)
+static int lprocfs_osd_rd_oi_scrub(char *page, char **start, off_t off,
+				   int count, int *eof, void *data)
 {
-        *eof = 1;
+	struct osd_device *dev = osd_dt_dev(data);
 
-        return snprintf(page, count, "%s\n", ldiskfs_pdo ? "ON" : "OFF");
+	LASSERT(dev != NULL);
+	if (unlikely(dev->od_mnt == NULL))
+		return -EINPROGRESS;
+
+	*eof = 1;
+	return osd_scrub_dump(dev, page, count);
 }
 
-static int lprocfs_osd_wr_pdo(struct file *file, const char *buffer,
-                              unsigned long count, void *data)
+int lprocfs_osd_rd_readcache(char *page, char **start, off_t off, int count,
+			     int *eof, void *data)
 {
-        int     pdo;
-        int     rc;
+	struct osd_device	*osd = osd_dt_dev(data);
+	int			 rc;
 
-        rc = lprocfs_write_helper(buffer, count, &pdo);
-        if (rc != 0)
-                return rc;
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
 
-        ldiskfs_pdo = !!pdo;
+	rc = snprintf(page, count, LPU64"\n", osd->od_readcache_max_filesize);
+	return rc;
+}
 
-        return count;
+int lprocfs_osd_wr_readcache(struct file *file, const char *buffer,
+			     unsigned long count, void *data)
+{
+	struct osd_device	*osd = osd_dt_dev(data);
+	__u64			 val;
+	int			 rc;
+
+	LASSERT(osd != NULL);
+	if (unlikely(osd->od_mnt == NULL))
+		return -EINPROGRESS;
+
+	rc = lprocfs_write_u64_helper(buffer, count, &val);
+	if (rc)
+		return rc;
+
+	osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ?
+					 OSD_MAX_CACHE_SIZE : val;
+	return count;
 }
-#endif
 
 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 },
+	{ "blocksize",		lprocfs_dt_rd_blksize,	0, 0 },
+	{ "kbytestotal",	lprocfs_dt_rd_kbytestotal,	0, 0 },
+	{ "kbytesfree",		lprocfs_dt_rd_kbytesfree,	0, 0 },
+	{ "kbytesavail",	lprocfs_dt_rd_kbytesavail,	0, 0 },
+	{ "filestotal",		lprocfs_dt_rd_filestotal,	0, 0 },
+	{ "filesfree",		lprocfs_dt_rd_filesfree,	0, 0 },
         { "fstype",          lprocfs_osd_rd_fstype,      0, 0 },
         { "mntdev",          lprocfs_osd_rd_mntdev,      0, 0 },
-#ifdef HAVE_LDISKFS_PDO
+	{ "force_sync",      0, lprocfs_osd_wr_force_sync     },
         { "pdo",             lprocfs_osd_rd_pdo, lprocfs_osd_wr_pdo, 0 },
-#endif
-        { 0 }
+	{ "auto_scrub",      lprocfs_osd_rd_auto_scrub,
+			     lprocfs_osd_wr_auto_scrub,  0 },
+	{ "oi_scrub",	     lprocfs_osd_rd_oi_scrub,    0, 0 },
+	{ "force_sync",		0, lprocfs_osd_wr_force_sync },
+	{ "read_cache_enable",	lprocfs_osd_rd_cache, lprocfs_osd_wr_cache, 0 },
+	{ "writethrough_cache_enable",	lprocfs_osd_rd_wcache,
+					lprocfs_osd_wr_wcache, 0 },
+	{ "readcache_max_filesize",	lprocfs_osd_rd_readcache,
+					lprocfs_osd_wr_readcache, 0 },
+	{ 0 }
 };
 
 struct lprocfs_vars lprocfs_osd_module_vars[] = {
         { "num_refs",        lprocfs_rd_numrefs,     0, 0 },
+	{ "track_declares_assert",	lprocfs_osd_rd_track_declares_assert,
+					lprocfs_osd_wr_track_declares_assert,
+					0 },
         { 0 }
 };