blkcg: simplify stat reset

[mirror_ubuntu-bionic-kernel.git] / block / blk-cgroup.h

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 6c8e3e3454266741edad186727018173f9d14ef3..1fa3c5e8d87f4fa43d708fd534c4332237cd3d7b 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -131,21 +131,31 @@ struct blkio_group_stats {
 
        /* Total time spent waiting for it to be assigned a timeslice. */
        uint64_t group_wait_time;
-       uint64_t start_group_wait_time;
 
        /* Time spent idling for this blkio_group */
        uint64_t idle_time;
-       uint64_t start_idle_time;
        /*
         * Total time when we have requests queued and do not contain the
         * current active queue.
         */
        uint64_t empty_time;
+
+       /* fields after this shouldn't be cleared on stat reset */
+       uint64_t start_group_wait_time;
+       uint64_t start_idle_time;
        uint64_t start_empty_time;
        uint16_t flags;
 #endif
 };
 
+#ifdef CONFIG_DEBUG_BLK_CGROUP
+#define BLKG_STATS_DEBUG_CLEAR_START   \
+       offsetof(struct blkio_group_stats, unaccounted_time)
+#define BLKG_STATS_DEBUG_CLEAR_SIZE    \
+       (offsetof(struct blkio_group_stats, start_group_wait_time) - \
+        BLKG_STATS_DEBUG_CLEAR_START)
+#endif
+
 /* Per cpu blkio group stats */
 struct blkio_group_stats_cpu {
        uint64_t sectors;