Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jul 8

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit ed3e687f27802ae0daa60ae96ae9b798ee1b6511:

Merge branch 'fix-pending-log-iodepth-assert' of https://github.com/SAY-5/fio (2026-07-02 08:46:38 -0600)

are available in the Git repository at:

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

for you to fetch changes up to 179fb9c335020ab6993ace93d4c2de7487f05a09:

parse: use signed format specifier for debug print (2026-07-07 16:22:15 -0400)

----------------------------------------------------------------
Bart Van Assche (3):
io_ddir: add "syncfs" to io_ddir_name() array
ioengines: record all sync io_u completions under DDIR_SYNC in total_io_u
blktrace: fix error handling in merge_blktrace_iologs

Huilin Cen (1):
parse: ignore leading minus sign when splitting options

Jens Axboe (1):
Merge branch 'master' of github.com:bvanassche/fio

Vincent Fu (3):
engines/io_uring: set sync trim flag when async trim fails Merge branch 'fix-issue-1657' of https://github.com/cenhuil/fio
parse: use signed format specifier for debug print

 blktrace.c         |  7 +++----
 engines/io_uring.c |  2 ++
 io_ddir.h          | 15 +++++++++++----
 ioengines.c        | 11 +++++++----
 parse.c            | 14 ++++++++++++--
 5 files changed, 35 insertions(+), 14 deletions(-)

---

Diff of recent changes:

blktrace.c +3 -4
index 045c4eb6..71d21122 100644
@@ -710,7 +710,7 @@ int merge_blktrace_iologs(struct thread_data *td)
 					     nr_logs);
 	struct blktrace_cursor *bc;
 	FILE *merge_fp;
-	char *str, *ptr, *name, *merge_buf;
+	char *str, *ptr, *name, *merge_buf = NULL;
 	int i, ret;
 
 	ret = init_merge_param_list(td->o.merge_blktrace_scalars, bcs, nr_logs,

@@ -738,7 +738,7 @@ int merge_blktrace_iologs(struct thread_data *td)
 		goto err_out_file;
 	ret = setvbuf(merge_fp, merge_buf, _IOFBF, 128 * 1024);
 	if (ret)
-		goto err_merge_buf;
+		goto err_out_file;
 
 	/* setup input files */
 	str = ptr = strdup(td->o.read_iolog_file);

@@ -800,10 +800,9 @@ err_file:
 	for (i = 0; i < nr_logs; i++) {
 		fclose(bcs[i].f);
 	}
-err_merge_buf:
+err_out_file:
 	fflush(merge_fp);
 	fclose(merge_fp);
-err_out_file:
 	free(merge_buf);
 err_param:
 	free(bcs);
engines/io_uring.c +2 -0
index bc7e33da..fd5475cc 100644
@@ -889,6 +889,8 @@ static struct io_u *fio_ioring_event(struct thread_data *td, int event)
 
 	if (io_u->ddir == DDIR_TRIM) {
 		ld->async_trim_fail = 1;
+		td->io_ops->flags |= FIO_ASYNCIO_SYNC_TRIM;
+		td_set_ioengine_flags(td);
 		cqe->res = 0;
 	}
 	if (cqe->res > io_u->xfer_buflen)
io_ddir.h +11 -4
index 203b6898..c2b6266a 100644
@@ -22,11 +22,18 @@ enum fio_ddir {
 
 static inline const char *io_ddir_name(enum fio_ddir ddir)
 {
-	static const char *name[] = { "read", "write", "trim", "sync",
-					"datasync", "sync_file_range",
-					"wait", };
+	static const char *name[] = {
+		[DDIR_READ] = "read",
+		[DDIR_WRITE] = "write",
+		[DDIR_TRIM] = "trim",
+		[DDIR_SYNC] = "sync",
+		[DDIR_DATASYNC] = "datasync",
+		[DDIR_SYNC_FILE_RANGE] = "sync_file_range",
+		[DDIR_SYNCFS] = "syncfs",
+		[DDIR_WAIT] = "wait",
+	};
 
-	if (ddir >= 0 && ddir < DDIR_LAST)
+	if (ddir >= 0 && ddir < sizeof(name) / sizeof(name[0]) && name[ddir])
 		return name[ddir];
 
 	return "invalid";
ioengines.c +7 -4
index 60565e03..a2816817 100644
@@ -441,19 +441,22 @@ enum fio_q_status td_io_queue(struct thread_data *td, struct io_u *io_u)
 	}
 
 	if (ret == FIO_Q_COMPLETED) {
-		if (ddir_rw(io_u->ddir) ||
-		    (ddir_sync(io_u->ddir) && td->runstate != TD_FSYNCING)) {
+		if (ddir_rw(io_u->ddir)) {
 			io_u_mark_depth(td, 1);
 			td->ts.total_io_u[io_u->ddir]++;
+		} else if (ddir_sync(io_u->ddir) && td->runstate != TD_FSYNCING) {
+			io_u_mark_depth(td, 1);
+			td->ts.total_io_u[DDIR_SYNC]++;
 		}
 
 		td->last_ddir_issued = ddir;
 	} else if (ret == FIO_Q_QUEUED) {
 		td->io_u_queued++;
 
-		if (ddir_rw(io_u->ddir) ||
-		    (ddir_sync(io_u->ddir) && td->runstate != TD_FSYNCING))
+		if (ddir_rw(io_u->ddir))
 			td->ts.total_io_u[io_u->ddir]++;
+		else if (ddir_sync(io_u->ddir) && td->runstate != TD_FSYNCING)
+			td->ts.total_io_u[DDIR_SYNC]++;
 
 		if (td->io_u_queued >= td->o.iodepth_batch)
 			td_io_commit(td);
parse.c +12 -2
index 5bb55bff..e2ec4fcc 100644
@@ -650,7 +650,10 @@ static int __handle_option(const struct fio_option *o, const char *ptr,
 		else
 			ret = check_str_bytes(tmp, &ull, data);
 
-		dprint(FD_PARSE, "  ret=%d, out=%llu\n", ret, ull);
+		if (o->type == FIO_OPT_INT)
+			dprint(FD_PARSE, "  ret=%d, out=%lld\n", ret, ull);
+		else
+			dprint(FD_PARSE, "  ret=%d, out=%llu\n", ret, ull);
 
 		if (ret)
 			break;

@@ -1041,8 +1044,15 @@ static int handle_option(const struct fio_option *o, const char *__ptr,
 			if (o->type != FIO_OPT_STR_MULTI && o->type != FIO_OPT_RANGE) {
 				if (!ptr2)
 					ptr2 = strchr(ptr, ':');
-				if (!ptr2)
+				if (!ptr2) {
 					ptr2 = strchr(ptr, '-');
+					/*
+					 * If the first character is a minus sign, it's
+					 * likely a negative number, not a delimiter.
+					 */
+					if (ptr2 == ptr)
+						ptr2 = strchr(ptr + 1, '-');
+				}
 			}
 		} else if (ptr && o->type == FIO_OPT_FLOAT_LIST) {
 			ptr2 = strchr(ptr, ':');