diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-05-18 07:31:01 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-05-18 19:42:54 -0600 |
| commit | dd6216bb16e83e349d5d987227328031b0b0d30d (patch) | |
| tree | a0f848cac75d999c7fa488d387cfecbc67f3f5b1 /block/blk-mq.h | |
| parent | fdcab6cddef24a26b86d798814b3c25057e53c21 (diff) | |
| download | linux-dd6216bb16e83e349d5d987227328031b0b0d30d.tar.gz linux-dd6216bb16e83e349d5d987227328031b0b0d30d.tar.bz2 linux-dd6216bb16e83e349d5d987227328031b0b0d30d.zip | |
blk-mq: make sure elevator callbacks aren't called for passthrough request
In case of q->elevator, passthrough request can still be marked as
RQF_ELV, so some elevator callbacks will be called for them.
Fix this by splitting RQF_SCHED_TAGS, which is set for all requests that
are issued on a queue that uses an I/O scheduler, and RQF_USE_SCHED for
non-flush, non-passthrough requests on such a queue.
Roughly based on two different patches from
Ming Lei <ming.lei@redhat.com>.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Link: https://lore.kernel.org/r/20230518053101.760632-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-mq.h')
| -rw-r--r-- | block/blk-mq.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/block/blk-mq.h b/block/blk-mq.h index e876584d3516..d15981db34b9 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -226,9 +226,9 @@ static inline bool blk_mq_is_shared_tags(unsigned int flags) static inline struct blk_mq_tags *blk_mq_tags_from_data(struct blk_mq_alloc_data *data) { - if (!(data->rq_flags & RQF_ELV)) - return data->hctx->tags; - return data->hctx->sched_tags; + if (data->rq_flags & RQF_SCHED_TAGS) + return data->hctx->sched_tags; + return data->hctx->tags; } static inline bool blk_mq_hctx_stopped(struct blk_mq_hw_ctx *hctx) |