LU-11771 osd: avoid use of HZ in brw_stats

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

diff --git a/lustre/osd-ldiskfs/osd_lproc.c b/lustre/osd-ldiskfs/osd_lproc.c
index 6d905fe..d1708a3 100644 (file)
--- a/lustre/osd-ldiskfs/osd_lproc.c
+++ b/lustre/osd-ldiskfs/osd_lproc.c
@@ -78,8 +78,6 @@ void osd_brw_stats_update(struct osd_device *osd, struct osd_iobuf *iobuf)
         lprocfs_oh_tally(&s->hist[BRW_R_DISCONT_BLOCKS+rw], discont_blocks);
 }
 
         lprocfs_oh_tally(&s->hist[BRW_R_DISCONT_BLOCKS+rw], discont_blocks);
 }
 

-#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)
 {
 static void display_brw_stats(struct seq_file *seq, char *name, char *units,
         struct obd_histogram *read, struct obd_histogram *write, int scale)
 {


@@ -109,7 +107,7 @@ static void display_brw_stats(struct seq_file *seq, char *name, char *units,
                 else
                         seq_printf(seq, "%uM", scale << (i-20));
 
                 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));
 
                            r, pct(r, read_tot), pct(read_cum, read_tot),
                            w, pct(w, write_tot), pct(write_cum, write_tot));
 


@@ -150,16 +148,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],
 
        display_brw_stats(seq, "I/O time (1/1000s)", "ios",
                          &brw_stats->hist[BRW_R_IO_TIME],

-                         &brw_stats->hist[BRW_W_IO_TIME],
-                         jiffies_to_msecs(1000) / MSEC_PER_SEC);
+                         &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);
 }
 
 
         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;
 static int osd_brw_stats_seq_show(struct seq_file *seq, void *v)
 {
         struct osd_device *osd = seq->private;


@@ -277,18 +272,18 @@ ldiskfs_osd_cache_seq_write(struct file *file, const char __user *buffer,
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *osd = osd_dt_dev(dt);
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *osd = osd_dt_dev(dt);

+       bool val;

        int rc;
        int rc;

-       __s64 val;

 
        LASSERT(osd != NULL);
        if (unlikely(osd->od_mnt == NULL))
                return -EINPROGRESS;
 
 
        LASSERT(osd != NULL);
        if (unlikely(osd->od_mnt == NULL))
                return -EINPROGRESS;
 

-       rc = lprocfs_str_to_s64(buffer, count, &val);
+       rc = kstrtobool_from_user(buffer, count, &val);

        if (rc)
                return rc;
 
        if (rc)
                return rc;
 

-       osd->od_read_cache = !!val;
+       osd->od_read_cache = val;

        return count;
 }
 LPROC_SEQ_FOPS(ldiskfs_osd_cache);
        return count;
 }
 LPROC_SEQ_FOPS(ldiskfs_osd_cache);


@@ -312,18 +307,18 @@ ldiskfs_osd_wcache_seq_write(struct file *file, const char __user *buffer,
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *osd = osd_dt_dev(dt);
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *osd = osd_dt_dev(dt);

+       bool val;

        int rc;
        int rc;

-       __s64 val;

 
        LASSERT(osd != NULL);
        if (unlikely(osd->od_mnt == NULL))
                return -EINPROGRESS;
 
 
        LASSERT(osd != NULL);
        if (unlikely(osd->od_mnt == NULL))
                return -EINPROGRESS;
 

-       rc = lprocfs_str_to_s64(buffer, count, &val);
+       rc = kstrtobool_from_user(buffer, count, &val);

        if (rc)
                return rc;
 
        if (rc)
                return rc;
 

-       osd->od_writethrough_cache = !!val;
+       osd->od_writethrough_cache = val;

        return count;
 }
 LPROC_SEQ_FOPS(ldiskfs_osd_wcache);
        return count;
 }
 LPROC_SEQ_FOPS(ldiskfs_osd_wcache);


@@ -362,14 +357,14 @@ static ssize_t
 ldiskfs_osd_pdo_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {
 ldiskfs_osd_pdo_seq_write(struct file *file, const char __user *buffer,
                                size_t count, loff_t *off)
 {

+       bool pdo;

        int rc;
        int rc;

-       __s64 pdo;

 
 

-       rc = lprocfs_str_to_s64(buffer, count, &pdo);
+       rc = kstrtobool_from_user(buffer, count, &pdo);

        if (rc != 0)
                return rc;
 
        if (rc != 0)
                return rc;
 

-       ldiskfs_pdo = !!pdo;
+       ldiskfs_pdo = pdo;

 
        return count;
 }
 
        return count;
 }


@@ -394,14 +389,14 @@ ldiskfs_osd_auto_scrub_seq_write(struct file *file, const char __user *buffer,
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);

+       s64 val;

        int rc;
        int rc;

-       __s64 val;

 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 
 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 

-       rc = lprocfs_str_to_s64(buffer, count, &val);
+       rc = kstrtoll_from_user(buffer, count, 0, &val);

        if (rc)
                return rc;
 
        if (rc)
                return rc;
 


@@ -430,14 +425,14 @@ ldiskfs_osd_full_scrub_ratio_seq_write(struct file *file,
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);

+       s64 val;

        int rc;
        int rc;

-       __s64 val;

 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 
 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 

-       rc = lprocfs_str_to_s64(buffer, count, &val);
+       rc = kstrtoll_from_user(buffer, count, 0, &val);

        if (rc != 0)
                return rc;
 
        if (rc != 0)
                return rc;
 


@@ -471,20 +466,17 @@ ldiskfs_osd_full_scrub_threshold_rate_seq_write(struct file *file,
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);

+       u64 val;

        int rc;
        int rc;

-       __s64 val;

 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 
 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 

-       rc = lprocfs_str_to_s64(buffer, count, &val);
+       rc = kstrtoull_from_user(buffer, count, 0, &val);

        if (rc != 0)
                return rc;
 
        if (rc != 0)
                return rc;
 

-       if (val < 0)
-               return -EINVAL;
-

        dev->od_full_scrub_threshold_rate = val;
        return count;
 }
        dev->od_full_scrub_threshold_rate = val;
        return count;
 }


@@ -502,14 +494,14 @@ ldiskfs_osd_track_declares_assert_seq_write(struct file *file,
                                                const char __user *buffer,
                                                size_t count, loff_t *off)
 {
                                                const char __user *buffer,
                                                size_t count, loff_t *off)
 {

-       __s64 track_declares_assert;
+       bool track_declares_assert;

        int rc;
 
        int rc;
 

-       rc = lprocfs_str_to_s64(buffer, count, &track_declares_assert);
-       if (rc != 0)
+       rc = kstrtobool_from_user(buffer, count, &track_declares_assert);
+       if (rc)

                return rc;
 
                return rc;
 

-       ldiskfs_track_declares_assert = !!track_declares_assert;
+       ldiskfs_track_declares_assert = track_declares_assert;

 
        return count;
 }
 
        return count;
 }


@@ -547,7 +539,7 @@ ldiskfs_osd_readcache_seq_write(struct file *file, const char __user *buffer,
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *osd = osd_dt_dev(dt);
        struct seq_file *m = file->private_data;
        struct dt_device *dt = m->private;
        struct osd_device *osd = osd_dt_dev(dt);

-       __s64 val;
+       s64 val;

        int rc;
 
        LASSERT(osd != NULL);
        int rc;
 
        LASSERT(osd != NULL);


@@ -589,19 +581,19 @@ ldiskfs_osd_index_in_idif_seq_write(struct file *file,
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);
        struct lu_target *tgt;
        struct dt_device *dt = m->private;
        struct osd_device *dev = osd_dt_dev(dt);
        struct lu_target *tgt;

-       __s64 val;
+       bool val;

        int rc;
 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 
        int rc;
 
        LASSERT(dev != NULL);
        if (unlikely(dev->od_mnt == NULL))
                return -EINPROGRESS;
 

-       rc = lprocfs_str_to_s64(buffer, count, &val);
+       rc = kstrtobool_from_user(buffer, count, &val);

        if (rc != 0)
                return rc;
 
        if (dev->od_index_in_idif) {
        if (rc != 0)
                return rc;
 
        if (dev->od_index_in_idif) {

-               if (val != 0)
+               if (val)

                        return count;
 
                LCONSOLE_WARN("%s: OST-index in IDIF has been enabled, "
                        return count;
 
                LCONSOLE_WARN("%s: OST-index in IDIF has been enabled, "


@@ -609,7 +601,7 @@ ldiskfs_osd_index_in_idif_seq_write(struct file *file,
                return -EPERM;
        }
 
                return -EPERM;
        }
 

-       if (val == 0)
+       if (!val)

                return count;
 
        rc = lu_env_init(&env, LCT_DT_THREAD);
                return count;
 
        rc = lu_env_init(&env, LCT_DT_THREAD);


@@ -645,6 +637,41 @@ int osd_register_proc_index_in_idif(struct osd_device *osd)
 }
 #endif
 
 }
 #endif
 

+static int ldiskfs_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 (unlikely(dev->od_mnt == NULL))
+               return -EINPROGRESS;
+
+       seq_printf(m, "%d\n", dev->od_index_backup_policy);
+       return 0;
+}
+
+static ssize_t ldiskfs_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 (unlikely(dev->od_mnt == NULL))
+               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(ldiskfs_osd_index_backup);
+

 LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_blksize);
 LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytestotal);
 LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytesfree);
 LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_blksize);
 LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytestotal);
 LPROC_SEQ_FOPS_RO_TYPE(ldiskfs, dt_kbytesfree);


@@ -687,6 +714,8 @@ struct lprocfs_vars lprocfs_osd_obd_vars[] = {
          .fops =       &ldiskfs_osd_wcache_fops        },
        { .name =       "readcache_max_filesize",
          .fops =       &ldiskfs_osd_readcache_fops     },
          .fops =       &ldiskfs_osd_wcache_fops        },
        { .name =       "readcache_max_filesize",
          .fops =       &ldiskfs_osd_readcache_fops     },

+       { .name =       "index_backup",
+         .fops =       &ldiskfs_osd_index_backup_fops  },

        { NULL }
 };
 
        { NULL }
 };