Fix race on io_u->flags

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index 96683954a0378f5ad5eb6163ea6e424e401d73ca..4be958da9641df0328b499713fd7d89a53d0fd06 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -345,7 +345,7 @@ static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
        odir = ddir ^ 1;
        if (td_rw(td) && __should_check_rate(td, odir))
                td->rate_pending_usleep[odir] -= usec;
-       
+
        return ddir;
 }
 
@@ -413,7 +413,6 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
 {
        td_io_u_lock(td);
 
-       assert((io_u->flags & IO_U_F_FREE) == 0);
        io_u->flags |= IO_U_F_FREE;
        io_u->flags &= ~IO_U_F_FREE_DEF;
 
@@ -421,9 +420,10 @@ void put_io_u(struct thread_data *td, struct io_u *io_u)
                put_file_log(td, io_u->file);
 
        io_u->file = NULL;
+       if (io_u->flags & IO_U_F_IN_CUR_DEPTH)
+               td->cur_depth--;
        flist_del_init(&io_u->list);
        flist_add(&io_u->list, &td->io_u_freelist);
-       td->cur_depth--;
        td_io_u_unlock(td);
        td_io_u_free_notify(td);
 }
@@ -447,10 +447,10 @@ void requeue_io_u(struct thread_data *td, struct io_u **io_u)
                td->io_issues[__io_u->ddir]--;
 
        __io_u->flags &= ~IO_U_F_FLIGHT;
-
+       if (__io_u->flags & IO_U_F_IN_CUR_DEPTH)
+               td->cur_depth--;
        flist_del(&__io_u->list);
        flist_add_tail(&__io_u->list, &td->io_u_requeues);
-       td->cur_depth--;
        td_io_u_unlock(td);
        *io_u = NULL;
 }
@@ -754,7 +754,8 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
                        opened = 1;
                }
 
-               dprint(FD_FILE, "goodf=%x, badf=%x, ff=%x\n", goodf, badf, f->flags);
+               dprint(FD_FILE, "goodf=%x, badf=%x, ff=%x\n", goodf, badf,
+                                                               f->flags);
                if ((!goodf || (f->flags & goodf)) && !(f->flags & badf))
                        break;
 
@@ -823,7 +824,8 @@ static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
                io_u->file = NULL;
                fio_file_set_done(f);
                td->nr_done_files++;
-               dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name, td->nr_done_files, td->o.nr_files);
+               dprint(FD_FILE, "%s: is done (%d of %d)\n", f->file_name,
+                                       td->nr_done_files, td->o.nr_files);
        } while (1);
 
        return 0;
@@ -858,13 +860,13 @@ again:
 
        if (io_u) {
                assert(io_u->flags & IO_U_F_FREE);
-               io_u->flags &= ~IO_U_F_FREE;
-               io_u->flags &= ~IO_U_F_FREE_DEF;
+               io_u->flags &= ~(IO_U_F_FREE | IO_U_F_FREE_DEF);
 
                io_u->error = 0;
                flist_del(&io_u->list);
                flist_add(&io_u->list, &td->io_u_busylist);
                td->cur_depth++;
+               io_u->flags |= IO_U_F_IN_CUR_DEPTH;
        }
 
        td_io_u_unlock(td);
@@ -967,8 +969,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 
        dprint_io_u(io_u, "io complete");
 
+       td_io_u_lock(td);
        assert(io_u->flags & IO_U_F_FLIGHT);
        io_u->flags &= ~IO_U_F_FLIGHT;
+       td_io_u_unlock(td);
 
        if (ddir_sync(io_u->ddir)) {
                td->last_was_sync = 1;