X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=89ece538c570391b8812957f2e4a428d1ab1bb65;hp=ebfa0d45a324111a3cda91a087909cf57e063cbe;hb=bca4ed4de445a07af393ac8bfcb9dd6aad09e5df;hpb=165faf16657c17b924a84e5601e17a516c76c135

diff --git a/io_u.c b/io_u.c
index ebfa0d45..89ece538 100644
--- a/io_u.c
+++ b/io_u.c
@@ -27,13 +27,16 @@ static int random_map_free(struct thread_data *td, struct fio_file *f,
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
 			    struct io_u *io_u)
 {
-	unsigned int min_bs = td->min_bs[io_u->ddir];
+	unsigned int min_bs = td->rw_min_bs;
 	unsigned long long block;
 	unsigned int blocks;
+	unsigned int nr_blocks;
 
 	block = io_u->offset / (unsigned long long) min_bs;
 	blocks = 0;
-	while (blocks < (io_u->buflen / min_bs)) {
+	nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
+
+	while (blocks < nr_blocks) {
 		unsigned int idx, bit;
 
 		if (!random_map_free(td, f, block))
@@ -61,11 +64,12 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 {
 	int i;
 
-	*b = 0;
-	i = 0;
+	i = f->last_free_lookup;
+	*b = (i * BLOCKS_PER_MAP);
 	while ((*b) * td->rw_min_bs < f->real_file_size) {
 		if (f->file_map[i] != -1UL) {
 			*b += ffz(f->file_map[i]);
+			f->last_free_lookup = i;
 			return 0;
 		}
 
@@ -82,14 +86,15 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,
-			   unsigned long long *offset, int ddir)
+			   struct io_u *io_u)
 {
+	const int ddir = io_u->ddir;
 	unsigned long long b, rb;
 	long r;
 
 	if (!td->sequential) {
 		unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
-		int loops = 50;
+		int loops = 5;
 
 		do {
 			r = os_random_long(&td->random_state);
@@ -100,22 +105,26 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
 			loops--;
 		} while (!random_map_free(td, f, rb) && loops);
 
-		if (!loops) {
-			if (get_next_free_block(td, f, &b))
-				return 1;
-		}
+		/*
+		 * if we failed to retrieve a truly random offset within
+		 * the loops assigned, see if there are free ones left at all
+		 */
+		if (!loops && get_next_free_block(td, f, &b))
+			return 1;
 	} else
 		b = f->last_pos / td->min_bs[ddir];
 
-	*offset = (b * td->min_bs[ddir]) + f->file_offset;
-	if (*offset > f->real_file_size)
+	io_u->offset = (b * td->min_bs[ddir]) + f->file_offset;
+	if (io_u->offset >= f->real_file_size)
 		return 1;
 
 	return 0;
 }
 
-static unsigned int get_next_buflen(struct thread_data *td, int ddir)
+static unsigned int get_next_buflen(struct thread_data *td, struct fio_file *f,
+				    struct io_u *io_u)
 {
+	const int ddir = io_u->ddir;
 	unsigned int buflen;
 	long r;
 
@@ -128,7 +137,7 @@ static unsigned int get_next_buflen(struct thread_data *td, int ddir)
 			buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
 	}
 
-	if (buflen > td->io_size - td->this_io_bytes[ddir]) {
+	while (buflen + io_u->offset > f->real_file_size) {
 		/*
 		 * if using direct/raw io, we may not be able to
 		 * shrink the size. so just fail it.
@@ -136,7 +145,10 @@ static unsigned int get_next_buflen(struct thread_data *td, int ddir)
 		if (td->io_ops->flags & FIO_RAWIO)
 			return 0;
 
-		buflen = td->io_size - td->this_io_bytes[ddir];
+		if (buflen == td->min_bs[ddir])
+			return 0;
+
+		buflen = td->min_bs[ddir];
 	}
 
 	return buflen;
@@ -208,23 +220,30 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
 	io_u->ddir = get_rw_ddir(td);
 
 	/*
-	 * No log, let the seq/rand engine retrieve the next position.
+	 * No log, let the seq/rand engine retrieve the next buflen and
+	 * position.
 	 */
-	if (!get_next_offset(td, f, &io_u->offset, io_u->ddir)) {
-		io_u->buflen = get_next_buflen(td, io_u->ddir);
-		if (io_u->buflen) {
-			/*
-			 * If using a write iolog, store this entry.
-			 */
-			if (td->write_iolog_file)
-				write_iolog_put(td, io_u);
-
-			io_u->file = f;
-			return 0;
-		}
-	}
+	if (get_next_offset(td, f, io_u))
+		return 1;
 
-	return 1;
+	io_u->buflen = get_next_buflen(td, f, io_u);
+	if (!io_u->buflen)
+		return 1;
+
+	/*
+	 * mark entry before potentially trimming io_u
+	 */
+	if (!td->read_iolog && !td->sequential && !td->norandommap)
+		mark_random_map(td, f, io_u);
+
+	/*
+	 * If using a write iolog, store this entry.
+	 */
+	if (td->write_iolog_file)
+		write_iolog_put(td, io_u);
+
+	io_u->file = f;
+	return 0;
 }
 
 static void io_u_mark_depth(struct thread_data *td)
@@ -308,9 +327,6 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 			return NULL;
 		}
 
-		if (!td->read_iolog && !td->sequential && !td->norandommap)
-			mark_random_map(td, f, io_u);
-
 		f->last_pos += io_u->buflen;
 
 		if (td->verify != VERIFY_NONE)