Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jun 9, 2023

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 1b4ba547cf45377fffc7a1e60728369997cc7a9b:

t/run-fio-tests: address issues identified by pylint (2023-06-01 14:12:41 -0400)

are available in the Git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to edaee5b96fd87c3c5fe7f64ec917a175cd9237fc:

t/zbd: test write zone accounting of trim workload (2023-06-08 14:39:07 -0400)

----------------------------------------------------------------
Shin'ichiro Kawasaki (7):
zbd: rename 'open zones' to 'write zones'
zbd: do not reset extra zones in open conditions
zbd: fix write zone accounting of almost full zones
zbd: fix write zone accounting of trim workload t/zbd: reset zones before tests with max_open_zones option t/zbd: test write zone accounting of almost full zones t/zbd: test write zone accounting of trim workload

Vincent Fu (17):
t/run-fio-tests: split source file
t/run-fio-tests: rename FioJobTest to FioJobFileTest t/run-fio-tests: move get_file outside of FioJobFileTest t/fiotestlib: use dictionaries for filenames and paths t/fiotestlib: use 'with' for opening files t/fiotestlib: use f-string for formatting t/fiotestlib: rearrange constructor and setup steps t/fiotestlib: record test command in more useful format t/fiotestlib: add class for command-line fio job t/random_seed: use logging module for debug prints t/random_seed: use methods provided in fiotestlib to run tests t/random_seed: fixes from pylint
t/readonly: adapt to use fiotestlib
t/nvmept: adapt to use fiotestlib
t/fiotestlib: add ability to ingest iops logs t/strided: adapt to use fiotestlib
t/strided: increase minumum recommended size to 64MiB

 engines/io_uring.c     |   2 +-
 fio.h                  |   2 +-
 io_u.c                 |   2 +-
 io_u.h                 |   2 +-
 options.c              |   4 +-
 t/fiotestcommon.py     | 176 +++++++++++++
 t/fiotestlib.py        | 485 ++++++++++++++++++++++++++++++++++
 t/nvmept.py            | 447 ++++++++++++--------------------
 t/random_seed.py       | 300 +++++++++------------
 t/readonly.py          | 220 +++++++++-------
 t/run-fio-tests.py     | 644 +++++----------------------------------------
 t/strided.py           | 691 ++++++++++++++++++++++++++++---------------------
 t/zbd/test-zbd-support |  64 ++++-
 zbd.c                  | 292 ++++++++++++---------
 zbd.h                  |  25 +-
 zbd_types.h            |   2 +-
 16 files changed, 1771 insertions(+), 1587 deletions(-)
 create mode 100644 t/fiotestcommon.py
 create mode 100755 t/fiotestlib.py

---

Diff of recent changes:

engines/io_uring.c +1 -1
index ff64fc9f..73e4a27a 100644
@@ -561,7 +561,7 @@ static inline void fio_ioring_cmdprio_prep(struct thread_data *td,
 		ld->sqes[io_u->index].ioprio = io_u->ioprio;
 }
 
-static int fio_ioring_cmd_io_u_trim(const struct thread_data *td,
+static int fio_ioring_cmd_io_u_trim(struct thread_data *td,
 				    struct io_u *io_u)
 {
 	struct fio_file *f = io_u->file;
fio.h +1 -1
index 6fc7fb9c..c5453d13 100644
@@ -275,7 +275,7 @@ struct thread_data {
 	unsigned long long num_unique_pages;
 
 	struct zone_split_index **zone_state_index;
-	unsigned int num_open_zones;
+	unsigned int num_write_zones;
 
 	unsigned int verify_batch;
 	unsigned int trim_batch;
io_u.c +1 -1
index 6f5fc94d..faf512e5 100644
@@ -2379,7 +2379,7 @@ int do_io_u_sync(const struct thread_data *td, struct io_u *io_u)
 	return ret;
 }
 
-int do_io_u_trim(const struct thread_data *td, struct io_u *io_u)
+int do_io_u_trim(struct thread_data *td, struct io_u *io_u)
 {
 #ifndef FIO_HAVE_TRIM
 	io_u->error = EINVAL;
io_u.h +1 -1
index 55b4d083..b432a540 100644
@@ -162,7 +162,7 @@ void io_u_mark_submit(struct thread_data *, unsigned int);
 bool queue_full(const struct thread_data *);
 
 int do_io_u_sync(const struct thread_data *, struct io_u *);
-int do_io_u_trim(const struct thread_data *, struct io_u *);
+int do_io_u_trim(struct thread_data *, struct io_u *);
 
 #ifdef FIO_INC_DEBUG
 static inline void dprint_io_u(struct io_u *io_u, const char *p)
options.c +2 -2
index 8193fb29..a7c4ef6e 100644
@@ -3618,7 +3618,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.lname	= "Per device/file maximum number of open zones",
 		.type	= FIO_OPT_INT,
 		.off1	= offsetof(struct thread_options, max_open_zones),
-		.maxval	= ZBD_MAX_OPEN_ZONES,
+		.maxval	= ZBD_MAX_WRITE_ZONES,
 		.help	= "Limit on the number of simultaneously opened sequential write zones with zonemode=zbd",
 		.def	= "0",
 		.category = FIO_OPT_C_IO,
@@ -3629,7 +3629,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
 		.lname	= "Job maximum number of open zones",
 		.type	= FIO_OPT_INT,
 		.off1	= offsetof(struct thread_options, job_max_open_zones),
-		.maxval	= ZBD_MAX_OPEN_ZONES,
+		.maxval	= ZBD_MAX_WRITE_ZONES,
 		.help	= "Limit on the number of simultaneously opened sequential write zones with zonemode=zbd by one thread/process",
 		.def	= "0",
 		.category = FIO_OPT_C_IO,
t/fiotestcommon.py new file +176 -0

176 lines not on this page · raw message

t/fiotestlib.py new file +485 -0

485 lines not on this page · raw message

t/nvmept.py +159 -288

547 lines not on this page · raw message

t/random_seed.py +123 -177

444 lines not on this page · raw message

t/readonly.py +121 -99

251 lines not on this page · raw message

t/run-fio-tests.py +67 -577

976 lines not on this page · raw message

t/strided.py +392 -299

73 lines not on this page · raw message

t/zbd/test-zbd-support +58 -6

64 lines not on this page · raw message

zbd.c +170 -122

292 lines not on this page · raw message

zbd.h +13 -12
index 05189555..f0ac9876 100644

Lines of this file are not shown. View the raw message.

zbd_types.h +1 -1
index 0a8630cb..5f44f308 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.