Recent changes (master)
The following changes since commit 2be18f6b266f3fcba89719b354672090f49d53d9:
t/io_uring: take advantage of new io_uring setup flags (2022-08-31 18:44:52 -0600)
are available in the Git repository at:
git://git.kernel.dk/fio.git master
for you to fetch changes up to e57758c12bdb24885e32ba143a04fcc8f98565ca:
Merge branch 'fiopr_compressfixes' of https://github.com/PCPartPicker/fio (2022-09-01 12:03:23 -0600)
----------------------------------------------------------------
Jens Axboe (2):
t/io_uring: minor optimizations to IO init fast path
Merge branch 'fiopr_compressfixes' of https://github.com/PCPartPicker/fio
aggieNick02 (1):
Fix fio silently dropping log entries when using log_compression
iolog.c | 6 +-- t/io_uring.c | 10 +++-- t/log_compression.py | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++ t/run-fio-tests.py | 8 ++++ 4 files changed, 139 insertions(+), 6 deletions(-) create mode 100755 t/log_compression.py
---
Diff of recent changes:
iolog.c +3 -3
@@ -1574,14 +1574,14 @@ void iolog_compress_exit(struct thread_data *td)* Queue work item to compress the existing log entries. We reset the * current log to a small size, and reference the existing log in the * data that we queue for compression. Once compression has been done, -* this old log is freed. If called with finish == true, will not return -* until the log compression has completed, and will flush all previous -* logs too +* this old log is freed. Will not return until the log compression +* has completed, and will flush all previous logs too */ static int iolog_flush (struct io_log *log) {struct iolog_flush_data *data; +workqueue_flush (&log->td->log_compress_wq); data =malloc (sizeof (*data));if (!data)return 1 ;
t/io_uring.c +7 -3
@@ -658,11 +658,12 @@ static int prep_more_ios_uring(struct submitter *s, int max_ios) {struct io_sq_ring *ring = &s->sq_ring;unsigned index, tail, next_tail, prepped =0 ; +unsigned int head =atomic_load_acquire (ring->head); next_tail = tail = *ring->tail; do { next_tail++; - if (next_tail == atomic_load_acquire(ring->head)) + if (next_tail == head) break; index = tail & sq_ring_mask;
@@ -670,7 +671,6 @@ static int prep_more_ios_uring(struct submitter *s, int max_ios)init_io_pt (s, index); elseinit_io (s ,index ); - ring->array[index] = index; prepped++; tail = next_tail; }while (prepped < max_ios);
@@ -908,7 +908,7 @@ static int setup_ring(struct submitter *s)struct io_sq_ring *sring = &s->sq_ring;struct io_cq_ring *cring = &s->cq_ring;struct io_uring_params p; -int ret, fd; +int ret, fd, i;void *ptr;size_t len;
@@ -1003,6 +1003,10 @@ static int setup_ring(struct submitter *s) cring->ring_entries = ptr + p.cq_off.ring_entries; cring->cqes = ptr + p.cq_off.cqes; cq_ring_mask = *cring->ring_mask; + +for (i =0 ; i < p.sq_entries; i++) + sring->array[i] = i; +return 0 ; }
t/log_compression.py new file +121 -0
121 lines not on this page · raw message
t/run-fio-tests.py +8 -0
@@ -1124,6 +1124,14 @@ TEST_LIST = [ 'success': SUCCESS_DEFAULT, 'requirements': [], }, + { + 'test_id': 1012, + 'test_class': FioExeTest, + 'exe': 't/log_compression.py', + 'parameters': ['-f', '{fio_path}'], + 'success': SUCCESS_DEFAULT, + 'requirements': [], + }, ]