summaryrefslogtreecommitdiff
path: root/zone-dist.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-08-13 20:21:05 -0600
committerJens Axboe <axboe@kernel.dk>2018-08-13 20:21:05 -0600
commit0777612739319296ee25047c1bdb56207187c463 (patch)
treecd8422c0295e7fdda03064267d04cdadfa97a5c6 /zone-dist.c
parent922e390f69c8169a215187ea8ef5aca0deac11b8 (diff)
downloadfio-0777612739319296ee25047c1bdb56207187c463.tar.gz
fio-0777612739319296ee25047c1bdb56207187c463.tar.bz2
Fix double free of zone cache data
We can't set it up in the parsing callback, as that happens before we fork off the thread. Fixes a segfault with: ./fio --ioengine=libaio --randrepeat=0 --norandommap --thread --direct=1 --name=pre_test --rw=randwrite --bssplit=4k/67:8k/10:16k/7:32k/3:64k/13 --random_distribution=zoned:50/5:30/15:20/80 --iodepth=32 --runtime=60 --time_based --numjobs=2 --filename=/dev/nvme0n1p9 --group_reporting=1 Fixes: https://github.com/axboe/fio/issues/650 Fixes: e0a04ac15f61 ("Add support for zones of random IO, with varying frequency of access") Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'zone-dist.c')
-rw-r--r--zone-dist.c74
1 files changed, 74 insertions, 0 deletions
diff --git a/zone-dist.c b/zone-dist.c
new file mode 100644
index 00000000..819d531c
--- /dev/null
+++ b/zone-dist.c
@@ -0,0 +1,74 @@
+#include <stdlib.h>
+#include "fio.h"
+#include "zone-dist.h"
+
+static void __td_zone_gen_index(struct thread_data *td, enum fio_ddir ddir)
+{
+ unsigned int i, j, sprev, aprev;
+ uint64_t sprev_sz;
+
+ td->zone_state_index[ddir] = malloc(sizeof(struct zone_split_index) * 100);
+
+ sprev_sz = sprev = aprev = 0;
+ for (i = 0; i < td->o.zone_split_nr[ddir]; i++) {
+ struct zone_split *zsp = &td->o.zone_split[ddir][i];
+
+ for (j = aprev; j < aprev + zsp->access_perc; j++) {
+ struct zone_split_index *zsi = &td->zone_state_index[ddir][j];
+
+ zsi->size_perc = sprev + zsp->size_perc;
+ zsi->size_perc_prev = sprev;
+
+ zsi->size = sprev_sz + zsp->size;
+ zsi->size_prev = sprev_sz;
+ }
+
+ aprev += zsp->access_perc;
+ sprev += zsp->size_perc;
+ sprev_sz += zsp->size;
+ }
+}
+
+static bool has_zones(struct thread_data *td)
+{
+ int i, zones = 0;
+
+ for (i = 0; i < DDIR_RWDIR_CNT; i++)
+ zones += td->o.zone_split_nr[i];
+
+ return zones != 0;
+}
+
+/*
+ * Generate state table for indexes, so we don't have to do it inline from
+ * the hot IO path
+ */
+void td_zone_gen_index(struct thread_data *td)
+{
+ int i;
+
+ if (!has_zones(td))
+ return;
+
+ td->zone_state_index = malloc(DDIR_RWDIR_CNT *
+ sizeof(struct zone_split_index *));
+
+ for (i = 0; i < DDIR_RWDIR_CNT; i++)
+ __td_zone_gen_index(td, i);
+}
+
+void td_zone_free_index(struct thread_data *td)
+{
+ int i;
+
+ if (!td->zone_state_index)
+ return;
+
+ for (i = 0; i < DDIR_RWDIR_CNT; i++) {
+ free(td->zone_state_index[i]);
+ td->zone_state_index[i] = NULL;
+ }
+
+ free(td->zone_state_index);
+ td->zone_state_index = NULL;
+}