fio: Fix padding properly
Completely fix padding:
- use anonymous union for padding.
- move existing padding in thread_stat.
- add alignment checks.
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
diff --git a/libfio.c b/libfio.c
index b823bd4..1abf39a 100644
--- a/libfio.c
+++ b/libfio.c
@@ -305,6 +305,8 @@
* access (ARM).
*/
compiletime_assert((offsetof(struct thread_stat, percentile_list) % 8) == 0, "stat percentile_list");
+ compiletime_assert((offsetof(struct thread_stat, total_run_time) % 8) == 0, "total_run_time");
+ compiletime_assert((offsetof(struct thread_stat, total_err_count) % 8) == 0, "total_err_count");
compiletime_assert((offsetof(struct thread_stat, latency_percentile) % 8) == 0, "stat latency_percentile");
compiletime_assert((offsetof(struct thread_options_pack, zipf_theta) % 8) == 0, "zipf_theta");
compiletime_assert((offsetof(struct thread_options_pack, pareto_h) % 8) == 0, "pareto_h");
diff --git a/stat.h b/stat.h
index 16b3d1a..8aefe03 100644
--- a/stat.h
+++ b/stat.h
@@ -158,6 +158,8 @@
uint32_t io_u_lat_u[FIO_IO_U_LAT_U_NR];
uint32_t io_u_lat_m[FIO_IO_U_LAT_M_NR];
uint32_t io_u_plat[DDIR_RWDIR_CNT][FIO_IO_U_PLAT_NR];
+ uint32_t pad;
+
uint64_t total_io_u[3];
uint64_t short_io_u[3];
uint64_t drop_io_u[3];
@@ -171,8 +173,10 @@
/*
* IO Error related stats
*/
- uint16_t continue_on_error;
- uint16_t filler[3];
+ union {
+ uint16_t continue_on_error;
+ uint64_t pad2;
+ };
uint64_t total_err_count;
uint32_t first_error;
@@ -181,7 +185,6 @@
uint32_t latency_depth;
uint64_t latency_target;
- uint32_t pad;
fio_fp64_t latency_percentile;
uint64_t latency_window;
} __attribute__((packed));
