X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosd-zfs%2Fosd_lproc.c;h=bedc4787e0eeb1e46c5fc590499c18f6a0350fa4;hp=88c16009c7150161b3bf6a43682e370e72261f71;hb=9b924e86b27df0cb7a6f0d4c04ff96f867413485;hpb=11afef00b6af407b8987076bd4f1ec9bc77eb75e diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c index 88c1600..bedc478 100644 --- a/lustre/osd-zfs/osd_lproc.c +++ b/lustre/osd-zfs/osd_lproc.c @@ -23,7 +23,7 @@ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2012, 2016, Intel Corporation. + * Copyright (c) 2012, 2017, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -40,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) @@ -78,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)); @@ -124,8 +122,6 @@ static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats) &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; @@ -211,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"); @@ -245,7 +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_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); + s64 val; + int rc; + + LASSERT(osd != NULL); + if (unlikely(osd->od_os == NULL)) + return -EINPROGRESS; + + rc = lprocfs_str_with_units_to_s64(buffer, count, &val, '1'); + if (rc) + return rc; + if (val < 0) + return -ERANGE; + + osd->od_readcache_max_filesize = val > OSD_MAX_CACHE_SIZE ? + OSD_MAX_CACHE_SIZE : val; + return count; +} +LPROC_SEQ_FOPS(zfs_osd_readcache); LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_blksize); LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytestotal); @@ -267,12 +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 = "index_backup", + .fops = &zfs_osd_index_backup_fops }, + { .name = "readcache_max_filesize", + .fops = &zfs_osd_readcache_fops }, { 0 } };