X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=blktrace.c;h=538bcd71b9091b02b558d362fafabc6b15b630c2;hp=5ed2619d2cf845a33fa9fa2f349b3f0485f254de;hb=cc3fc85511c47de463497f40b29c32a1bd67f81d;hpb=5e6c20673be9f46332f47ede0e3b657b2cc35ec4

diff --git a/blktrace.c b/blktrace.c
index 5ed2619d..538bcd71 100644
--- a/blktrace.c
+++ b/blktrace.c
@@ -34,6 +34,7 @@ static int refill_fifo(struct thread_data *td, struct fifo *fifo, int fd)
 	if (ret > 0)
 		ret = fifo_put(fifo, buf, ret);
 
+	dprint(FD_BLKTRACE, "refill: filled %d bytes\n", ret);
 	return ret;
 }
 
@@ -62,6 +63,7 @@ static int discard_pdu(struct thread_data *td, struct fifo *fifo, int fd,
 	if (t->pdu_len == 0)
 		return 0;
 
+	dprint(FD_BLKTRACE, "discard pdu len %u\n", t->pdu_len);
 	return trace_fifo_get(td, fifo, fd, NULL, t->pdu_len);
 }
 
@@ -75,10 +77,8 @@ int is_blktrace(const char *filename)
 	int fd, ret;
 
 	fd = open(filename, O_RDONLY);
-	if (fd < 0) {
-		perror("open blktrace");
+	if (fd < 0)
 		return 0;
-	}
 
 	ret = read(fd, &t, sizeof(t));
 	close(fd);
@@ -132,6 +132,7 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
 			continue;
 
 		if (maj == major(st.st_rdev) && min == minor(st.st_rdev)) {
+			dprint(FD_BLKTRACE, "device lookup: %d/%d\n", maj,min);
 			strcpy(path, full_path);
 			found = 1;
 			break;
@@ -142,11 +143,16 @@ static int lookup_device(char *path, unsigned int maj, unsigned int min)
 	return found;
 }
 
+#define FMINORBITS	20
+#define FMINORMASK	((1U << FMINORBITS) - 1)
+#define FMAJOR(dev)	((unsigned int) ((dev) >> FMINORBITS))
+#define FMINOR(dev)	((unsigned int) ((dev) & FMINORMASK))
+
 static void trace_add_file(struct thread_data *td, __u32 device)
 {
 	static unsigned int last_maj, last_min;
-	unsigned int maj = major(device);
-	unsigned int min = minor(device);
+	unsigned int maj = FMAJOR(device);
+	unsigned int min = FMINOR(device);
 	struct fio_file *f;
 	char dev[256];
 	unsigned int i;
@@ -165,8 +171,10 @@ static void trace_add_file(struct thread_data *td, __u32 device)
 			return;
 
 	strcpy(dev, "/dev");
-	if (lookup_device(dev, maj, min))
+	if (lookup_device(dev, maj, min)) {
+		dprint(FD_BLKTRACE, "add devices %s\n", dev);
 		add_file(td, dev);
+	}
 }
 
 /*
@@ -190,6 +198,9 @@ static void store_ipo(struct thread_data *td, unsigned long long offset,
 	else
 		ipo->ddir = DDIR_READ;
 
+	dprint(FD_BLKTRACE, "store ddir=%d, off=%llu, len=%lu, delay=%lu\n",
+							ipo->ddir, ipo->offset,
+							ipo->len, ipo->delay);
 	list_add_tail(&ipo->list, &td->io_log_list);
 }
 
@@ -230,7 +241,7 @@ int load_blktrace(struct thread_data *td, const char *filename)
 {
 	unsigned long long ttime, delay;
 	struct blk_io_trace t;
-	unsigned long ios[2];
+	unsigned long ios[2], skipped_writes;
 	unsigned int cpu;
 	unsigned int rw_bs[2];
 	struct fifo *fifo;
@@ -250,6 +261,7 @@ int load_blktrace(struct thread_data *td, const char *filename)
 	ttime = 0;
 	ios[0] = ios[1] = 0;
 	rw_bs[0] = rw_bs[1] = 0;
+	skipped_writes = 0;
 	do {
 		int ret = trace_fifo_get(td, fifo, fd, &t, sizeof(t));
 
@@ -278,6 +290,8 @@ int load_blktrace(struct thread_data *td, const char *filename)
 			log_err("fio: discarded %d of %d\n", ret, t.pdu_len);
 			goto err;
 		}
+		if (t.action & BLK_TC_ACT(BLK_TC_NOTIFY))
+			continue;
 		if (!ttime) {
 			ttime = t.time;
 			cpu = t.cpu;
@@ -285,7 +299,10 @@ int load_blktrace(struct thread_data *td, const char *filename)
 		delay = 0;
 		if (cpu == t.cpu)
 			delay = t.time - ttime;
-		handle_trace(td, &t, delay, ios, rw_bs);
+		if ((t.action & BLK_TC_ACT(BLK_TC_WRITE)) && read_only)
+			skipped_writes++;
+		else
+			handle_trace(td, &t, delay, ios, rw_bs);
 		ttime = t.time;
 		cpu = t.cpu;
 	} while (1);
@@ -293,6 +310,9 @@ int load_blktrace(struct thread_data *td, const char *filename)
 	fifo_free(fifo);
 	close(fd);
 
+	if (skipped_writes)
+		log_err("fio: <%s> skips replay of %lu writes due to read-only\n", td->o.name, skipped_writes);
+
 	if (!ios[DDIR_READ] && !ios[DDIR_WRITE]) {
 		log_err("fio: found no ios in blktrace data\n");
 		return 1;