LU-11771 osd: avoid use of HZ in brw_stats

[fs/lustre-release.git] / lustre / osd-zfs / osd_lproc.c

diff --git a/lustre/osd-zfs/osd_lproc.c b/lustre/osd-zfs/osd_lproc.c
index 0997a4b..895eb13 100644 (file)
--- a/lustre/osd-zfs/osd_lproc.c
+++ b/lustre/osd-zfs/osd_lproc.c
@@ -46,8 +46,6 @@
 
 #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));
 
@@ -117,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;
@@ -330,6 +326,44 @@ static ssize_t zfs_osd_index_backup_seq_write(struct file *file,
 }
 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);
 LPROC_SEQ_FOPS_RO_TYPE(zfs, dt_kbytesfree);
@@ -362,6 +396,8 @@ struct lprocfs_vars lprocfs_osd_obd_vars[] = {
          .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 }
 };