X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_lproc.c;h=895eb139975002512d5bcd9ee708f20d20f177ab;hp=0dfb483628b11ab94b1779a6d7234444accb1230;hb=8d83e946bc96df6535d9f501db400e2196a45668;hpb=1cd2189806c82c31256c5ef9756d1dbf97784844;ds=sidebyside diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c index 0dfb483..895eb13 100644 --- a/lustre/osd-zfs/osd_lproc.c +++ b/lustre/osd-zfs/osd_lproc.c @@ -15,11 +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 - * - * 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 */ @@ -27,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2015, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -44,14 +40,12 @@ #include #include #include -#include +#include #include "osd_internal.h" #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) @@ -82,7 +76,7 @@ static void display_brw_stats(struct seq_file *seq, char *name, char *units, else seq_printf(seq, "%uM", scale << (i-20)); - seq_printf(seq, ":\t\t%10lu %3lu %3lu | %4lu %3lu %3lu\n", + 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)); @@ -93,12 +87,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 timespec64 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); + 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], @@ -121,15 +115,13 @@ static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats) 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); + &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); } -#undef pct - static int osd_brw_stats_seq_show(struct seq_file *seq, void *v) { struct osd_device *osd = seq->private; @@ -215,6 +207,54 @@ out: RETURN(result); } +static int zfs_osd_auto_scrub_seq_show(struct seq_file *m, void *data) +{ + struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private); + + LASSERT(dev != NULL); + if (!dev->od_os) + return -EINPROGRESS; + + seq_printf(m, "%lld\n", dev->od_auto_scrub_interval); + return 0; +} + +static ssize_t +zfs_osd_auto_scrub_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 *dev = osd_dt_dev(dt); + int rc; + __s64 val; + + LASSERT(dev != NULL); + if (!dev->od_os) + return -EINPROGRESS; + + rc = kstrtoull_from_user(buffer, count, 0, &val); + if (rc) + return rc; + + dev->od_auto_scrub_interval = val; + return count; +} +LPROC_SEQ_FOPS(zfs_osd_auto_scrub); + +static int zfs_osd_oi_scrub_seq_show(struct seq_file *m, void *data) +{ + 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; +} +LPROC_SEQ_FOPS_RO(zfs_osd_oi_scrub); + static int zfs_osd_fstype_seq_show(struct seq_file *m, void *data) { seq_puts(m, "zfs\n"); @@ -249,38 +289,80 @@ lprocfs_osd_force_sync_seq_write(struct file *file, const char __user *buffer, return rc == 0 ? count : rc; } -LPROC_SEQ_FOPS_WO_TYPE(zfs, osd_force_sync); +LPROC_SEQ_FOPS_WR_ONLY(zfs, osd_force_sync); + +static int zfs_osd_index_backup_seq_show(struct seq_file *m, void *data) +{ + struct osd_device *dev = osd_dt_dev((struct dt_device *)m->private); + + LASSERT(dev != NULL); + if (!dev->od_os) + return -EINPROGRESS; + + seq_printf(m, "%d\n", dev->od_index_backup_policy); + return 0; +} + +static ssize_t zfs_osd_index_backup_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 *dev = osd_dt_dev(dt); + int val; + int rc; + + LASSERT(dev != NULL); + if (!dev->od_os) + return -EINPROGRESS; + + rc = kstrtoint_from_user(buffer, count, 0, &val); + if (rc) + return rc; + + dev->od_index_backup_policy = val; + return count; +} +LPROC_SEQ_FOPS(zfs_osd_index_backup); -static int zfs_osd_iused_est_seq_show(struct seq_file *m, void *data) +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, "%d\n", osd->od_quota_iused_est); + seq_printf(m, "%llu\n", osd->od_readcache_max_filesize); return 0; } static ssize_t -zfs_osd_iused_est_seq_write(struct file *file, const char __user *buffer, - size_t count, loff_t *off) +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); + s64 val; int rc; - __s64 val; LASSERT(osd != NULL); + if (unlikely(osd->od_os == NULL)) + return -EINPROGRESS; - rc = lprocfs_str_to_s64(buffer, count, &val); + rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1'); if (rc) return rc; + if (val < 0) + return -ERANGE; - osd->od_quota_iused_est = !!val; - + osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ? + OSD_MAX_CACHE_SIZE : val; return count; } -LPROC_SEQ_FOPS(zfs_osd_iused_est); +LPROC_SEQ_FOPS(zfs_osd_readcache); LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_blksize); LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytestotal); @@ -302,14 +384,20 @@ struct lprocfs_vars lprocfs_osd_obd_vars[] = { .fops = &zfs_dt_filestotal_fops }, { .name = "filesfree", .fops = &zfs_dt_filesfree_fops }, + { .name = "auto_scrub", + .fops = &zfs_osd_auto_scrub_fops }, + { .name = "oi_scrub", + .fops = &zfs_osd_oi_scrub_fops }, { .name = "fstype", .fops = &zfs_osd_fstype_fops }, { .name = "mntdev", .fops = &zfs_osd_mntdev_fops }, { .name = "force_sync", .fops = &zfs_osd_force_sync_fops }, - { .name = "quota_iused_estimate", - .fops = &zfs_osd_iused_est_fops }, + { .name = "index_backup", + .fops = &zfs_osd_index_backup_fops }, + { .name = "readcache_max_filesize", + .fops = &zfs_osd_readcache_fops }, { 0 } };