Recent changes (master)
The following changes since commit ed31254c1bb4e88d1b3812c06212b50dcba795bc:
Merge branch 'fix-includes' of https://github.com/betonmischer86/fio (2025-10-08 08:15:36 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to b9b306b542afb8a3059c2035fb2034a89e4660d1:
stat: report zone reset count in json output format (2025-10-09 13:16:51 -0600)
----------------------------------------------------------------
Shin'ichiro Kawasaki (2):
stat: report zone reset count only when zonemode is set to zbd
stat: report zone reset count in json output format
client.c | 4 +++- server.c | 4 +++- server.h | 2 +- stat.c | 11 +++++++++-- stat.h | 9 +++++---- zbd.c | 4 ++++ 6 files changed, 25 insertions(+), 9 deletions(-)
---
Diff of recent changes:
client.c +3 -1
@@ -1027,7 +1027,6 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) dst->total_submit =le64_to_cpu (src->total_submit); dst->total_complete =le64_to_cpu (src->total_complete); - dst->nr_zone_resets =le64_to_cpu (src->nr_zone_resets);for (i =0 ; i <DDIR_RWDIR_CNT ; i++) { dst->io_bytes[i] =le64_to_cpu (src->io_bytes[i]);
@@ -1043,6 +1042,9 @@ static void convert_ts(struct thread_stat *dst, struct thread_stat *src) dst->sig_figs =le32_to_cpu (src->sig_figs); + dst->nr_zone_resets =le64_to_cpu (src->nr_zone_resets); + dst->count_zone_resets =le16_to_cpu (src->count_zone_resets); + dst->latency_depth =le32_to_cpu (src->latency_depth); dst->latency_target =le64_to_cpu (src->latency_target); dst->latency_window =le64_to_cpu (src->latency_window);
server.c +3 -1
@@ -1770,7 +1770,6 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) p.ts.total_submit =cpu_to_le64 (ts->total_submit); p.ts.total_complete =cpu_to_le64 (ts->total_complete); - p.ts.nr_zone_resets =cpu_to_le64 (ts->nr_zone_resets);for (i =0 ; i <DDIR_RWDIR_CNT ; i++) { p.ts.io_bytes[i] =cpu_to_le64 (ts->io_bytes[i]);
@@ -1784,6 +1783,9 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs) p.ts.kb_base =cpu_to_le32 (ts->kb_base); p.ts.unit_base =cpu_to_le32 (ts->unit_base); + p.ts.nr_zone_resets =cpu_to_le64 (ts->nr_zone_resets); + p.ts.count_zone_resets =cpu_to_le16 (ts->count_zone_resets); + p.ts.latency_depth =cpu_to_le32 (ts->latency_depth); p.ts.latency_target =cpu_to_le64 (ts->latency_target); p.ts.latency_window =cpu_to_le64 (ts->latency_window);
server.h +1 -1
@@ -51,7 +51,7 @@ struct fio_net_cmd_reply { };enum { -FIO_SERVER_VER =113 , +FIO_SERVER_VER =114 ,FIO_SERVER_MAX_FRAGMENT_PDU =1024 ,FIO_SERVER_MAX_CMD_MB =2048 ,
stat.c +9 -2
@@ -565,7 +565,7 @@ static void show_ddir_status(const struct group_run_stats *rs, struct thread_sta iops = (1000 * (uint64_t )ts->total_io_u[ddir]) / runt; iops_p =num2str (iops, ts->sig_figs,1 ,0 ,N2S_NONE ); -if (ddir ==DDIR_WRITE || ddir ==DDIR_TRIM ) +if (ts->count_zone_resets) post_st =zbd_write_status (ts);else if (ddir ==DDIR_READ && ts->cachehit && ts->cachemiss) {uint64_t total;
@@ -1946,6 +1946,10 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,json_object_add_value_array (data,"bw" , bw); } +if (ts->count_zone_resets) +json_object_add_value_int (root,"zone_resets" , + ts->nr_zone_resets); +return root; }
@@ -2360,7 +2364,10 @@ void sum_thread_stats(struct thread_stat *dst, const struct thread_stat *src) dst->total_run_time += src->total_run_time; dst->total_submit += src->total_submit; dst->total_complete += src->total_complete; - dst->nr_zone_resets += src->nr_zone_resets; +if (src->count_zone_resets) { + dst->count_zone_resets =1 ; + dst->nr_zone_resets += src->nr_zone_resets; + } dst->cachehit += src->cachehit; dst->cachemiss += src->cachemiss; }
stat.h +5 -4
@@ -233,17 +233,18 @@ struct thread_stat {uint32_t first_error;uint64_t total_err_count; -/* ZBD stats */ -uint64_t nr_zone_resets; -uint64_t nr_block_infos;uint32_t block_infos[MAX_NR_BLOCK_INFOS ];uint32_t kb_base;uint32_t unit_base; +/* ZBD stats */ +uint64_t nr_zone_resets; +uint16_t count_zone_resets;/* Flag to enable nr_zone_resets */ +uint16_t pad3; +uint32_t latency_depth; -uint32_t pad3;uint64_t latency_target;fio_fp64_t latency_percentile;uint64_t latency_window;
zbd.c +4 -0
@@ -1284,6 +1284,10 @@ int zbd_setup_files(struct thread_data *td)return 1 ; } +/* Enable zone reset stat report for write and trim workloads */ +if (td_write (td) ||td_trim (td)) + td->ts.count_zone_resets =1 ; +for_each_file (td, f, i) {struct zoned_block_device_info *zbd = f->zbd_info;struct fio_zone_info *z;