Merge tag 'f2fs-for-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk...

[linux-2.6-microblaze.git] / fs / f2fs / sysfs.c

diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index 3162f46..e877c59 100644 (file)
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -15,6 +15,7 @@
 #include "f2fs.h"
 #include "segment.h"
 #include "gc.h"
+#include <trace/events/f2fs.h>
 
 static struct proc_dir_entry *f2fs_proc_root;
 
@@ -372,7 +373,6 @@ out:
                return count;
        }
 
-
        if (!strcmp(a->attr.name, "iostat_enable")) {
                sbi->iostat_enable = !!t;
                if (!sbi->iostat_enable)
@@ -380,6 +380,15 @@ out:
                return count;
        }
 
+       if (!strcmp(a->attr.name, "iostat_period_ms")) {
+               if (t < MIN_IOSTAT_PERIOD_MS || t > MAX_IOSTAT_PERIOD_MS)
+                       return -EINVAL;
+               spin_lock(&sbi->iostat_lock);
+               sbi->iostat_period_ms = (unsigned int)t;
+               spin_unlock(&sbi->iostat_lock);
+               return count;
+       }
+
        *ui = (unsigned int)t;
 
        return count;
@@ -538,6 +547,7 @@ F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_idle_interval, interval_time[GC_TIME]);
 F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info,
                umount_discard_timeout, interval_time[UMOUNT_DISCARD_TIMEOUT]);
 F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, iostat_enable, iostat_enable);
+F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, iostat_period_ms, iostat_period_ms);
 F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, readdir_ra, readdir_ra);
 F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, gc_pin_file_thresh, gc_pin_file_threshold);
 F2FS_RW_ATTR(F2FS_SBI, f2fs_super_block, extension_list, extension_list);
@@ -545,6 +555,8 @@ F2FS_RW_ATTR(F2FS_SBI, f2fs_super_block, extension_list, extension_list);
 F2FS_RW_ATTR(FAULT_INFO_RATE, f2fs_fault_info, inject_rate, inject_rate);
 F2FS_RW_ATTR(FAULT_INFO_TYPE, f2fs_fault_info, inject_type, inject_type);
 #endif
+F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, data_io_flag, data_io_flag);
+F2FS_RW_ATTR(F2FS_SBI, f2fs_sb_info, node_io_flag, node_io_flag);
 F2FS_GENERAL_RO_ATTR(dirty_segments);
 F2FS_GENERAL_RO_ATTR(free_segments);
 F2FS_GENERAL_RO_ATTR(lifetime_write_kbytes);
@@ -618,6 +630,7 @@ static struct attribute *f2fs_attrs[] = {
        ATTR_LIST(gc_idle_interval),
        ATTR_LIST(umount_discard_timeout),
        ATTR_LIST(iostat_enable),
+       ATTR_LIST(iostat_period_ms),
        ATTR_LIST(readdir_ra),
        ATTR_LIST(gc_pin_file_thresh),
        ATTR_LIST(extension_list),
@@ -625,6 +638,8 @@ static struct attribute *f2fs_attrs[] = {
        ATTR_LIST(inject_rate),
        ATTR_LIST(inject_type),
 #endif
+       ATTR_LIST(data_io_flag),
+       ATTR_LIST(node_io_flag),
        ATTR_LIST(dirty_segments),
        ATTR_LIST(free_segments),
        ATTR_LIST(unusable),
@@ -754,6 +769,33 @@ static int __maybe_unused segment_bits_seq_show(struct seq_file *seq,
        return 0;
 }
 
+void f2fs_record_iostat(struct f2fs_sb_info *sbi)
+{
+       unsigned long long iostat_diff[NR_IO_TYPE];
+       int i;
+
+       if (time_is_after_jiffies(sbi->iostat_next_period))
+               return;
+
+       /* Need double check under the lock */
+       spin_lock(&sbi->iostat_lock);
+       if (time_is_after_jiffies(sbi->iostat_next_period)) {
+               spin_unlock(&sbi->iostat_lock);
+               return;
+       }
+       sbi->iostat_next_period = jiffies +
+                               msecs_to_jiffies(sbi->iostat_period_ms);
+
+       for (i = 0; i < NR_IO_TYPE; i++) {
+               iostat_diff[i] = sbi->rw_iostat[i] -
+                               sbi->prev_rw_iostat[i];
+               sbi->prev_rw_iostat[i] = sbi->rw_iostat[i];
+       }
+       spin_unlock(&sbi->iostat_lock);
+
+       trace_f2fs_iostat(sbi, iostat_diff);
+}
+
 static int __maybe_unused iostat_info_seq_show(struct seq_file *seq,
                                               void *offset)
 {
@@ -766,33 +808,58 @@ static int __maybe_unused iostat_info_seq_show(struct seq_file *seq,
 
        seq_printf(seq, "time:          %-16llu\n", now);
 
-       /* print app IOs */
+       /* print app write IOs */
+       seq_puts(seq, "[WRITE]\n");
        seq_printf(seq, "app buffered:  %-16llu\n",
-                               sbi->write_iostat[APP_BUFFERED_IO]);
+                               sbi->rw_iostat[APP_BUFFERED_IO]);
        seq_printf(seq, "app direct:    %-16llu\n",
-                               sbi->write_iostat[APP_DIRECT_IO]);
+                               sbi->rw_iostat[APP_DIRECT_IO]);
        seq_printf(seq, "app mapped:    %-16llu\n",
-                               sbi->write_iostat[APP_MAPPED_IO]);
+                               sbi->rw_iostat[APP_MAPPED_IO]);
 
-       /* print fs IOs */
+       /* print fs write IOs */
        seq_printf(seq, "fs data:       %-16llu\n",
-                               sbi->write_iostat[FS_DATA_IO]);
+                               sbi->rw_iostat[FS_DATA_IO]);
        seq_printf(seq, "fs node:       %-16llu\n",
-                               sbi->write_iostat[FS_NODE_IO]);
+                               sbi->rw_iostat[FS_NODE_IO]);
        seq_printf(seq, "fs meta:       %-16llu\n",
-                               sbi->write_iostat[FS_META_IO]);
+                               sbi->rw_iostat[FS_META_IO]);
        seq_printf(seq, "fs gc data:    %-16llu\n",
-                               sbi->write_iostat[FS_GC_DATA_IO]);
+                               sbi->rw_iostat[FS_GC_DATA_IO]);
        seq_printf(seq, "fs gc node:    %-16llu\n",
-                               sbi->write_iostat[FS_GC_NODE_IO]);
+                               sbi->rw_iostat[FS_GC_NODE_IO]);
        seq_printf(seq, "fs cp data:    %-16llu\n",
-                               sbi->write_iostat[FS_CP_DATA_IO]);
+                               sbi->rw_iostat[FS_CP_DATA_IO]);
        seq_printf(seq, "fs cp node:    %-16llu\n",
-                               sbi->write_iostat[FS_CP_NODE_IO]);
+                               sbi->rw_iostat[FS_CP_NODE_IO]);
        seq_printf(seq, "fs cp meta:    %-16llu\n",
-                               sbi->write_iostat[FS_CP_META_IO]);
+                               sbi->rw_iostat[FS_CP_META_IO]);
+
+       /* print app read IOs */
+       seq_puts(seq, "[READ]\n");
+       seq_printf(seq, "app buffered:  %-16llu\n",
+                               sbi->rw_iostat[APP_BUFFERED_READ_IO]);
+       seq_printf(seq, "app direct:    %-16llu\n",
+                               sbi->rw_iostat[APP_DIRECT_READ_IO]);
+       seq_printf(seq, "app mapped:    %-16llu\n",
+                               sbi->rw_iostat[APP_MAPPED_READ_IO]);
+
+       /* print fs read IOs */
+       seq_printf(seq, "fs data:       %-16llu\n",
+                               sbi->rw_iostat[FS_DATA_READ_IO]);
+       seq_printf(seq, "fs gc data:    %-16llu\n",
+                               sbi->rw_iostat[FS_GDATA_READ_IO]);
+       seq_printf(seq, "fs compr_data: %-16llu\n",
+                               sbi->rw_iostat[FS_CDATA_READ_IO]);
+       seq_printf(seq, "fs node:       %-16llu\n",
+                               sbi->rw_iostat[FS_NODE_READ_IO]);
+       seq_printf(seq, "fs meta:       %-16llu\n",
+                               sbi->rw_iostat[FS_META_READ_IO]);
+
+       /* print other IOs */
+       seq_puts(seq, "[OTHER]\n");
        seq_printf(seq, "fs discard:    %-16llu\n",
-                               sbi->write_iostat[FS_DISCARD]);
+                               sbi->rw_iostat[FS_DISCARD]);
 
        return 0;
 }