Skip to content

Commit e74191a

Browse files
shroffnigregkh
authored andcommitted
block: skip q->rq_qos check in rq_qos_done_bio()
[ Upstream commit 2753328 ] If a bio has BIO_QOS_THROTTLED or BIO_QOS_MERGED set, it implicitly guarantees that q->rq_qos is present. Avoid re-checking q->rq_qos in this case and call __rq_qos_done_bio() directly as a minor optimization. Suggested-by : Yu Kuai <yukuai1@huaweicloud.com> Signed-off-by: Nilay Shroff <nilay@linux.ibm.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Reviewed-by: Yu Kuai <yukuai3@huawei.com> Link: https://lore.kernel.org/r/20250814082612.500845-2-nilay@linux.ibm.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Stable-dep-of: 370ac28 ("block: avoid cpu_hotplug_lock depedency on freeze_lock") Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent a277d88 commit e74191a

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

block/blk-rq-qos.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,14 @@ static inline void rq_qos_done_bio(struct bio *bio)
142142
bio->bi_bdev && (bio_flagged(bio, BIO_QOS_THROTTLED) ||
143143
bio_flagged(bio, BIO_QOS_MERGED))) {
144144
struct request_queue *q = bdev_get_queue(bio->bi_bdev);
145-
if (q->rq_qos)
146-
__rq_qos_done_bio(q->rq_qos, bio);
145+
146+
/*
147+
* If a bio has BIO_QOS_xxx set, it implicitly implies that
148+
* q->rq_qos is present. So, we skip re-checking q->rq_qos
149+
* here as an extra optimization and directly call
150+
* __rq_qos_done_bio().
151+
*/
152+
__rq_qos_done_bio(q->rq_qos, bio);
147153
}
148154
}
149155

0 commit comments

Comments
 (0)