Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jul 5, 2018

lore

Share & tools

lore

Jens Axboe

author

2018-07-05 12:00 UTC #0 lore raw

The following changes since commit 354d50e771451f510e5886275768abb63b602798:

Fix compilation without cgroups (2018-06-29 08:00:29 -0600)

are available in the git repository at:

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

for you to fetch changes up to 19a8064ef4a2a826ee06ed061af970d1737cf840:

blktrace: just ignore zero byte traces (2018-07-04 14:59:18 -0600)

----------------------------------------------------------------
Jens Axboe (1):
blktrace: just ignore zero byte traces

 blktrace.c | 11 ++++++++++-
 debug.h    |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

---

Diff of recent changes:

blktrace.c +10 -1

index cda111a..36a7180 100644
@@ -303,6 +303,11 @@ static void handle_trace_discard(struct thread_data *td,
 	queue_io_piece(td, ipo);
 }
 
+static void dump_trace(struct blk_io_trace *t)
+{
+	log_err("blktrace: ignoring zero byte trace: action=%x\n", t->action);
+}
+
 static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
 			    unsigned long long ttime, unsigned long *ios,
 			    unsigned int *rw_bs)

@@ -323,7 +328,11 @@ static void handle_trace_fs(struct thread_data *td, struct blk_io_trace *t,
 			return;
 	}
 
-	assert(t->bytes);
+	if (!t->bytes) {
+		if (!fio_did_warn(FIO_WARN_BTRACE_ZERO))
+			dump_trace(t);
+		return;
+	}
 
 	if (t->bytes > rw_bs[rw])
 		rw_bs[rw] = t->bytes;

debug.h +1 -0

index 8a8cf87..e5e8040 100644
@@ -42,6 +42,7 @@ enum {
 	FIO_WARN_ZONED_BUG	= 4,
 	FIO_WARN_IOLOG_DROP	= 8,
 	FIO_WARN_FADVISE	= 16,
+	FIO_WARN_BTRACE_ZERO	= 32,
 };
 
 #ifdef FIO_INC_DEBUG