Skip to content

Commit

Permalink
block: recursive merge requests
Browse files Browse the repository at this point in the history
In a workload, thread 1 accesses a, a+2, ..., thread 2 accesses a+1, a+3,....
When the requests are flushed to queue, a and a+1 are merged to (a, a+1), a+2
and a+3 too to (a+2, a+3), but (a, a+1) and (a+2, a+3) aren't merged.

If we do recursive merge for such interleave access, some workloads throughput
get improvement. A recent worload I'm checking on is swap, below change
boostes the throughput around 5% ~ 10%.

Signed-off-by: Shaohua Li <shli@fusionio.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Shaohua Li authored and Jens Axboe committed Nov 9, 2012
1 parent 3d106fb commit bee0393
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions block/elevator.c
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,7 @@ static bool elv_attempt_insert_merge(struct request_queue *q,
struct request *rq)
{
struct request *__rq;
bool ret;

if (blk_queue_nomerges(q))
return false;
Expand All @@ -471,14 +472,21 @@ static bool elv_attempt_insert_merge(struct request_queue *q,
if (blk_queue_noxmerges(q))
return false;

ret = false;
/*
* See if our hash lookup can find a potential backmerge.
*/
__rq = elv_rqhash_find(q, blk_rq_pos(rq));
if (__rq && blk_attempt_req_merge(q, __rq, rq))
return true;
while (1) {
__rq = elv_rqhash_find(q, blk_rq_pos(rq));
if (!__rq || !blk_attempt_req_merge(q, __rq, rq))
break;

return false;
/* The merged request could be merged with others, try again */
ret = true;
rq = __rq;
}

return ret;
}

void elv_merged_request(struct request_queue *q, struct request *rq, int type)
Expand Down

0 comments on commit bee0393

Please sign in to comment.