Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed88660a authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe
Browse files

block: move call of scheduler's ->completed_request() hook 



Commit 4bc6339a ("block: move blk_stat_add() to
__blk_mq_end_request()") consolidated some calls using ktime_get() so
we'd only need to call it once. Kyber's ->completed_request() hook also
calls ktime_get(), so let's move it to the same place, too.

Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 986d413b

block/blk-mq-sched.h

+2 −2
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ blk_mq_sched_allow_merge(struct request_queue *q, struct request *rq, 
	return true;

}



static inline void blk_mq_sched_completed_request(struct request *rq)

static inline void blk_mq_sched_completed_request(struct request *rq, u64 now)

{

	struct elevator_queue *e = rq->q->elevator;



	if (e && e->type->ops.mq.completed_request)

		e->type->ops.mq.completed_request(rq);

		e->type->ops.mq.completed_request(rq, now);

}



static inline void blk_mq_sched_started_request(struct request *rq)

block/blk-mq.c

+3 −2
Original line number Diff line number Diff line
@@ -528,6 +528,9 @@ inline void __blk_mq_end_request(struct request *rq, blk_status_t error) 
		blk_stat_add(rq, now);

	}



	if (rq->internal_tag != -1)

		blk_mq_sched_completed_request(rq, now);



	blk_account_io_done(rq, now);



	if (rq->end_io) {
@@ -564,8 +567,6 @@ static void __blk_mq_complete_request(struct request *rq) 


	if (!blk_mq_mark_complete(rq))

		return;

	if (rq->internal_tag != -1)

		blk_mq_sched_completed_request(rq);



	if (!test_bit(QUEUE_FLAG_SAME_COMP, &rq->q->queue_flags)) {

		rq->q->softirq_done_fn(rq);

block/kyber-iosched.c

+2 −3
Original line number Diff line number Diff line
@@ -558,12 +558,12 @@ static void kyber_finish_request(struct request *rq) 
	rq_clear_domain_token(kqd, rq);

}



static void kyber_completed_request(struct request *rq)

static void kyber_completed_request(struct request *rq, u64 now)

{

	struct request_queue *q = rq->q;

	struct kyber_queue_data *kqd = q->elevator->elevator_data;

	unsigned int sched_domain;

	u64 now, latency, target;

	u64 latency, target;



	/*

	 * Check if this request met our latency goal. If not, quickly gather
@@ -585,7 +585,6 @@ static void kyber_completed_request(struct request *rq) 
	if (blk_stat_is_active(kqd->cb))

		return;



	now = ktime_get_ns();

	if (now < rq->io_start_time_ns)

		return;

include/linux/elevator.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ struct elevator_mq_ops { 
	void (*insert_requests)(struct blk_mq_hw_ctx *, struct list_head *, bool);

	struct request *(*dispatch_request)(struct blk_mq_hw_ctx *);

	bool (*has_work)(struct blk_mq_hw_ctx *);

	void (*completed_request)(struct request *);

	void (*completed_request)(struct request *, u64);

	void (*started_request)(struct request *);

	void (*requeue_request)(struct request *);

	struct request *(*former_request)(struct request_queue *, struct request *);