X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosd-ldiskfs%2Fosd_lproc.c;h=51718632c56ec1b1943ac2549d1337ed1d7febce;hb=b40f6327bb19b682bb920cee5d33055fe5f3e20f;hp=6cb96a70a5d4ab0bb24f1bb45a187a80a66fdcff;hpb=35920b759ed78441db0cd9de6ac8ec66da862f22;p=fs%2Flustre-release.git diff --git a/lustre/osd-ldiskfs/osd_lproc.c b/lustre/osd-ldiskfs/osd_lproc.c index 6cb96a7..5171863 100644 --- a/lustre/osd-ldiskfs/osd_lproc.c +++ b/lustre/osd-ldiskfs/osd_lproc.c @@ -27,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/ @@ -41,8 +41,6 @@ #define DEBUG_SUBSYSTEM S_CLASS #include -#include - #include #include "osd_internal.h" @@ -65,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); @@ -127,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], @@ -154,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], @@ -195,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) { @@ -230,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; @@ -239,14 +237,6 @@ 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; @@ -273,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; @@ -288,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); @@ -298,23 +284,10 @@ int osd_procfs_fini(struct osd_device *osd) RETURN(0); } -void osd_lprocfs_time_start(const struct lu_env *env) -{ - lu_lprocfs_time_start(env); -} - -void osd_lprocfs_time_end(const struct lu_env *env, struct osd_device *osd, - int idx) -{ - lu_lprocfs_time_end(env, osd->od_stats, idx); -} - - - static int lprocfs_osd_rd_fstype(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct obd_device *osd = data; + struct osd_device *osd = osd_dt_dev(data); LASSERT(osd != NULL); return snprintf(page, count, "ldiskfs\n"); @@ -329,14 +302,92 @@ static int lprocfs_osd_rd_mntdev(char *page, char **start, off_t off, int count, if (unlikely(osd->od_mnt == NULL)) return -EINPROGRESS; - LASSERT(mnt_get_devname(osd->od_mnt)); *eof = 1; - return snprintf(page, count, "%s\n", - mnt_get_devname(osd->od_mnt)); + 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 = osd_dt_dev(data); + + LASSERT(osd != NULL); + if (unlikely(osd->od_mnt == NULL)) + return -EINPROGRESS; + + return snprintf(page, count, "%u\n", osd->od_read_cache); +} + +static int lprocfs_osd_wr_cache(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct osd_device *osd = osd_dt_dev(data); + int val, rc; + + LASSERT(osd != NULL); + if (unlikely(osd->od_mnt == NULL)) + return -EINPROGRESS; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + osd->od_read_cache = !!val; + return count; +} + +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); +} + +static int lprocfs_osd_wr_wcache(struct file *file, const char *buffer, + unsigned long count, void *data) +{ + struct osd_device *osd = osd_dt_dev(data); + int val, rc; + + LASSERT(osd != NULL); + if (unlikely(osd->od_mnt == NULL)) + return -EINPROGRESS; + + rc = lprocfs_write_helper(buffer, count, &val); + if (rc) + return rc; + + osd->od_writethrough_cache = !!val; + return count; +} + +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; } -#ifdef HAVE_LDISKFS_PDO static int lprocfs_osd_rd_pdo(char *page, char **start, off_t off, int count, int *eof, void *data) { @@ -359,25 +410,24 @@ static int lprocfs_osd_wr_pdo(struct file *file, const char *buffer, return count; } -#endif static int lprocfs_osd_rd_auto_scrub(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct osd_device *dev = data; + struct osd_device *dev = osd_dt_dev(data); LASSERT(dev != NULL); if (unlikely(dev->od_mnt == NULL)) return -EINPROGRESS; *eof = 1; - return snprintf(page, count, "%d\n", !dev->od_scrub.os_no_scrub); + return snprintf(page, count, "%d\n", !dev->od_noscrub); } static int lprocfs_osd_wr_auto_scrub(struct file *file, const char *buffer, unsigned long count, void *data) { - struct osd_device *dev = data; + struct osd_device *dev = osd_dt_dev(data); int val, rc; LASSERT(dev != NULL); @@ -388,14 +438,39 @@ static int lprocfs_osd_wr_auto_scrub(struct file *file, const char *buffer, if (rc) return rc; - dev->od_scrub.os_no_scrub = !val; + dev->od_noscrub = !val; + return count; +} + +static int lprocfs_osd_rd_track_declares_assert(char *page, char **start, + off_t off, int count, + int *eof, void *data) +{ + *eof = 1; + + return snprintf(page, count, "%d\n", ldiskfs_track_declares_assert); +} + +static int lprocfs_osd_wr_track_declares_assert(struct file *file, + const char *buffer, + unsigned long count, void *data) +{ + int track_declares_assert; + int rc; + + rc = lprocfs_write_helper(buffer, count, &track_declares_assert); + if (rc != 0) + return rc; + + ldiskfs_track_declares_assert = !!track_declares_assert; + return count; } static int lprocfs_osd_rd_oi_scrub(char *page, char **start, off_t off, int count, int *eof, void *data) { - struct osd_device *dev = data; + struct osd_device *dev = osd_dt_dev(data); LASSERT(dev != NULL); if (unlikely(dev->od_mnt == NULL)) @@ -405,26 +480,68 @@ static int lprocfs_osd_rd_oi_scrub(char *page, char **start, off_t off, return osd_scrub_dump(dev, page, count); } +int lprocfs_osd_rd_readcache(char *page, char **start, off_t off, int count, + int *eof, void *data) +{ + struct osd_device *osd = osd_dt_dev(data); + int rc; + + LASSERT(osd != NULL); + if (unlikely(osd->od_mnt == NULL)) + return -EINPROGRESS; + + rc = snprintf(page, count, LPU64"\n", osd->od_readcache_max_filesize); + return rc; +} + +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; +} + 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 { "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 } };