Scramble on a 512b boundary

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 6a53bdaab074fcf9660c6e25e08c19408bd0dca2..f4c4aa2ca432532d894d61c9559940c7b1ee43b4 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -249,8 +249,12 @@ static int get_next_seq_block(struct thread_data *td, struct fio_file *f,
        assert(ddir_rw(ddir));
 
        if (f->last_pos < f->real_file_size) {
-               unsigned long long pos = f->last_pos - f->file_offset;
+               unsigned long long pos;
 
+               if (f->last_pos == f->file_offset && td->o.ddir_seq_add < 0)
+                       f->last_pos = f->real_file_size;
+
+               pos = f->last_pos - f->file_offset;
                if (pos)
                        pos += td->o.ddir_seq_add;
 
@@ -486,6 +490,16 @@ static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
        } else
                usec = td->rate_pending_usleep[ddir];
 
+       /*
+        * We are going to sleep, ensure that we flush anything pending as
+        * not to skew our latency numbers
+        */
+       if (td->cur_depth) {
+               int fio_unused ret;
+
+               ret = io_u_queued_complete(td, td->cur_depth, NULL);
+       }
+
        fio_gettime(&t, NULL);
        usec_sleep(td, usec);
        usec = utime_since_now(&t);
@@ -1106,6 +1120,39 @@ static int check_get_verify(struct thread_data *td, struct io_u *io_u)
        return 0;
 }
 
+/*
+ * Fill offset and start time into the buffer content, to prevent too
+ * easy compressible data for simple de-dupe attempts. Do this for every
+ * 512b block in the range, since that should be the smallest block size
+ * we can expect from a device.
+ */
+static void small_content_scramble(struct io_u *io_u)
+{
+       unsigned int i, nr_blocks = io_u->buflen / 512;
+       unsigned int offset;
+       void *p, *end;
+
+       if (!nr_blocks)
+               return;
+
+       p = io_u->xfer_buf;
+       for (i = 0; i < nr_blocks; i++) {
+               /*
+                * Fill the byte offset into a "random" start offset of
+                * the buffer, given by the product of the usec time
+                * and the actual offset.
+                */
+               offset = (io_u->start_time.tv_usec * io_u->offset) & 511;
+               if (offset >= 512 - sizeof(unsigned long long))
+                       offset -= sizeof(unsigned long long);
+               *((unsigned long long *) p + offset) = io_u->offset;
+
+               end = p + 512 - sizeof(io_u->start_time);
+               memcpy(end, &io_u->start_time, sizeof(io_u->start_time));
+               p += 512;
+       }
+}
+
 /*
  * Return an io_u to be processed. Gets a buflen and offset, sets direction,
  * etc. The returned io_u is fully ready to be prepped and submitted.
@@ -1114,6 +1161,7 @@ struct io_u *get_io_u(struct thread_data *td)
 {
        struct fio_file *f;
        struct io_u *io_u;
+       int do_scramble = 0;
 
        io_u = __get_io_u(td);
        if (!io_u) {
@@ -1159,6 +1207,8 @@ struct io_u *get_io_u(struct thread_data *td)
                        populate_verify_io_u(td, io_u);
                else if (td->o.refill_buffers && io_u->ddir == DDIR_WRITE)
                        io_u_fill_buffer(td, io_u, io_u->xfer_buflen);
+               else if (io_u->ddir == DDIR_WRITE)
+                       do_scramble = 1;
                else if (io_u->ddir == DDIR_READ) {
                        /*
                         * Reset the buf_filled parameters so next time if the
@@ -1179,6 +1229,8 @@ out:
        if (!td_io_prep(td, io_u)) {
                if (!td->o.disable_slat)
                        fio_gettime(&io_u->start_time, NULL);
+               if (do_scramble)
+                       small_content_scramble(io_u);
                return io_u;
        }
 err_put:
@@ -1436,7 +1488,7 @@ void io_u_fill_buffer(struct thread_data *td, struct io_u *io_u,
        io_u->buf_filled_len = 0;
 
        if (!td->o.zero_buffers)
-               fill_random_buf(io_u->buf, max_bs);
+               fill_random_buf(&td->buf_state, io_u->buf, max_bs);
        else
                memset(io_u->buf, 0, max_bs);
 }