diff --git a/block/blk-core.c b/block/blk-core.c index 7afe44d09741355f6bdde8d236589ee1c97b1e19..ba3b7ac5b47823c9fe53ce3fb6b95816c65c96e1 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1802,6 +1802,7 @@ bool bio_attempt_back_merge(struct request_queue *q, struct request *req, return false; trace_block_bio_backmerge(q, req, bio); + rq_qos_merge(req->q, req, bio); if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) blk_rq_set_mixed_merge(req); @@ -1824,6 +1825,7 @@ bool bio_attempt_front_merge(struct request_queue *q, struct request *req, return false; trace_block_bio_frontmerge(q, req, bio); + rq_qos_merge(req->q, req, bio); if ((req->cmd_flags & REQ_FAILFAST_MASK) != ff) blk_rq_set_mixed_merge(req); @@ -1850,6 +1852,8 @@ bool bio_attempt_discard_merge(struct request_queue *q, struct request *req, blk_rq_get_max_sectors(req, blk_rq_pos(req))) goto no_merge; + rq_qos_merge(q, req, bio); + req->biotail->bi_next = bio; req->biotail = bio; req->__data_len += bio->bi_iter.bi_size; diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c index 43bcd4e7a7f9ae5da1fa005b5bca0110e7be9aa9..7600c36f81220f25985ef380bde40dfc381308b0 100644 --- a/block/blk-rq-qos.c +++ b/block/blk-rq-qos.c @@ -88,6 +88,17 @@ void rq_qos_track(struct request_queue *q, struct request *rq, struct bio *bio) } } +void rq_qos_merge(struct request_queue *q, struct request *rq, struct bio *bio) +{ + struct rq_qos *rqos; + + for (rqos = q->rq_qos; rqos; rqos = rqos->next) { + if (rqos->ops->merge) + rqos->ops->merge(rqos, rq, bio); + } +} + + void rq_qos_done_bio(struct request_queue *q, struct bio *bio) { struct rq_qos *rqos; diff --git a/block/blk-rq-qos.h b/block/blk-rq-qos.h index 98caba3e962eeb63bd9bbdc78ce0398d6fa414ca..c4d798543f1a7841cb4409f79f4eed9c740b8f7d 100644 --- a/block/blk-rq-qos.h +++ b/block/blk-rq-qos.h @@ -27,6 +27,7 @@ struct rq_qos { struct rq_qos_ops { void (*throttle)(struct rq_qos *, struct bio *, spinlock_t *); void (*track)(struct rq_qos *, struct request *, struct bio *); + void (*merge)(struct rq_qos *, struct request *, struct bio *); void (*issue)(struct rq_qos *, struct request *); void (*requeue)(struct rq_qos *, struct request *); void (*done)(struct rq_qos *, struct request *); @@ -102,5 +103,6 @@ void rq_qos_requeue(struct request_queue *, struct request *); void rq_qos_done_bio(struct request_queue *q, struct bio *bio); void rq_qos_throttle(struct request_queue *, struct bio *, spinlock_t *); void rq_qos_track(struct request_queue *q, struct request *, struct bio *); +void rq_qos_merge(struct request_queue *q, struct request *rq, struct bio *bio); void rq_qos_exit(struct request_queue *); #endif