Skip to content

fio replay: replay I/O from __BLK_TA_ISSUE action instead of __BLK_TA_QUEUE #2133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rorychen wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −14
Open

fio replay: replay I/O from __BLK_TA_ISSUE action instead of __BLK_TA_QUEUE #2133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions blktrace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,9 +317,27 @@ static bool queue_trace(struct thread_data *td, struct blk_io_trace *t,
unsigned long long *last_ttime = &td->io_log_last_ttime;
unsigned long long delay = 0;

if ((t->action & 0xffff) != __BLK_TA_QUEUE)
/* Ignore PC requests */
if ( t->action & BLK_TC_ACT(BLK_TC_PC))
return false;

/* Replay FLUSH/DISCARD/NOTIFY from Q(QUEUE) action,
* replay all other commands from D(ISSUE) action.
*/

if (t->action & (BLK_TC_ACT(BLK_TC_NOTIFY) |
BLK_TC_ACT(BLK_TC_DISCARD) |
BLK_TC_ACT(BLK_TC_FLUSH))) {

if ( (t->action & 0xffff) != __BLK_TA_QUEUE)
return false;
/* special cmd processing */
} else {
if ( (t->action & 0xffff) != __BLK_TA_ISSUE)
return false;
/* normal IO processing */
}

if (!(t->action & BLK_TC_ACT(BLK_TC_NOTIFY))) {
delay = delay_since_ttime(td, t->time);
*last_ttime = t->time;
Expand All @@ -332,6 +350,7 @@ static bool queue_trace(struct thread_data *td, struct blk_io_trace *t,
else if (t->action & BLK_TC_ACT(BLK_TC_DISCARD))
return handle_trace_discard(td, t, delay, ios, bs, cache);
else if (t->action & BLK_TC_ACT(BLK_TC_FLUSH))
/*Replay Flush with F category in Q(QUEUE) action*/
return handle_trace_flush(td, t, delay, ios, cache);
else
return handle_trace_fs(td, t, delay, ios, bs, cache);
Expand Down Expand Up @@ -378,15 +397,6 @@ static void depth_inc(struct blk_io_trace *t, int *depth)
depth[ddir]++;
}

static void depth_dec(struct blk_io_trace *t, int *depth)
{
enum fio_ddir ddir;

ddir = t_get_ddir(t);
if (ddir != DDIR_INVAL)
depth[ddir]--;
}

static void depth_end(struct blk_io_trace *t, int *this_depth, int *depth)
{
enum fio_ddir ddir = DDIR_INVAL;
Expand Down Expand Up @@ -496,11 +506,11 @@ bool read_blktrace(struct thread_data* td)
goto err;
}
if ((t.action & BLK_TC_ACT(BLK_TC_NOTIFY)) == 0) {
if ((t.action & 0xffff) == __BLK_TA_QUEUE)

/* Increase queue depth at the action of __BLK_TA_ISSUE "D" instead of __BLK_TA_QUEUE as the queued IO
* may be merged to send to the driver.*/
if ( ((t.action & 0xffff) == __BLK_TA_ISSUE) && ( (t.action & BLK_TC_ACT(BLK_TC_READ)) || (t.action & BLK_TC_ACT(BLK_TC_WRITE)) ) )
depth_inc(&t, this_depth);
else if (((t.action & 0xffff) == __BLK_TA_BACKMERGE) ||
((t.action & 0xffff) == __BLK_TA_FRONTMERGE))
depth_dec(&t, this_depth);
else if ((t.action & 0xffff) == __BLK_TA_COMPLETE)
depth_end(&t, this_depth, depth);

Expand Down
Loading