Skip to content

Commit a3f9bce

Browse files
Algodev-githubaxboe
authored andcommitted
block, bfq: bring forward seek&think time update
Until the base value for request service times gets finally computed for a bfq_queue, the inject limit for that queue does depend on the think-time state (short|long) of the queue. A timely update of the think time then guarantees a quicker activation or deactivation of the injection. Fortunately, the think time of a bfq_queue is updated in the same code path as the inject limit; but after the inject limit. This commits moves the update of the think time before the update of the inject limit. For coherence, it moves the update of the seek time too. Reported-by: Srivatsa S. Bhat (VMware) <[email protected]> Tested-by: Srivatsa S. Bhat (VMware) <[email protected]> Signed-off-by: Paolo Valente <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent 24792ad commit a3f9bce

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

block/bfq-iosched.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4979,19 +4979,9 @@ static void bfq_update_has_short_ttime(struct bfq_data *bfqd,
49794979
static void bfq_rq_enqueued(struct bfq_data *bfqd, struct bfq_queue *bfqq,
49804980
struct request *rq)
49814981
{
4982-
struct bfq_io_cq *bic = RQ_BIC(rq);
4983-
49844982
if (rq->cmd_flags & REQ_META)
49854983
bfqq->meta_pending++;
49864984

4987-
bfq_update_io_thinktime(bfqd, bfqq);
4988-
bfq_update_has_short_ttime(bfqd, bfqq, bic);
4989-
bfq_update_io_seektime(bfqd, bfqq, rq);
4990-
4991-
bfq_log_bfqq(bfqd, bfqq,
4992-
"rq_enqueued: has_short_ttime=%d (seeky %d)",
4993-
bfq_bfqq_has_short_ttime(bfqq), BFQQ_SEEKY(bfqq));
4994-
49954985
bfqq->last_request_pos = blk_rq_pos(rq) + blk_rq_sectors(rq);
49964986

49974987
if (bfqq == bfqd->in_service_queue && bfq_bfqq_wait_request(bfqq)) {
@@ -5079,6 +5069,10 @@ static bool __bfq_insert_request(struct bfq_data *bfqd, struct request *rq)
50795069
bfqq = new_bfqq;
50805070
}
50815071

5072+
bfq_update_io_thinktime(bfqd, bfqq);
5073+
bfq_update_has_short_ttime(bfqd, bfqq, RQ_BIC(rq));
5074+
bfq_update_io_seektime(bfqd, bfqq, rq);
5075+
50825076
waiting = bfqq && bfq_bfqq_wait_request(bfqq);
50835077
bfq_add_request(rq);
50845078
idle_timer_disabled = waiting && !bfq_bfqq_wait_request(bfqq);

0 commit comments

Comments
 (0)