diff options
| author | Christoph Hellwig <hch@lst.de> | 2023-04-13 08:40:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-04-13 14:52:30 +0200 |
| commit | a1e948b81ad21d635b99c1284f945423cb02b4c4 (patch) | |
| tree | 76c7ad2ca20d75903448e3e52e7f0b23c862a968 /block | |
| parent | blk-mq: refactor passthrough vs flush handling in blk_mq_insert_request (diff) | |
| download | linux-a1e948b81ad21d635b99c1284f945423cb02b4c4.tar.xz linux-a1e948b81ad21d635b99c1284f945423cb02b4c4.zip | |
blk-mq: refactor the DONTPREP/SOFTBARRIER andling in blk_mq_requeue_work
Split the RQF_DONTPREP and RQF_SOFTBARRIER in separate branches to make
the code more readable.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20230413064057.707578-12-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-mq.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index c3de03217f4f..d17871c237f7 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -1427,20 +1427,21 @@ static void blk_mq_requeue_work(struct work_struct *work) spin_unlock_irq(&q->requeue_lock); list_for_each_entry_safe(rq, next, &rq_list, queuelist) { - if (!(rq->rq_flags & (RQF_SOFTBARRIER | RQF_DONTPREP))) - continue; - - rq->rq_flags &= ~RQF_SOFTBARRIER; - list_del_init(&rq->queuelist); /* - * If RQF_DONTPREP, rq has contained some driver specific - * data, so insert it to hctx dispatch list to avoid any - * merge. + * If RQF_DONTPREP ist set, the request has been started by the + * driver already and might have driver-specific data allocated + * already. Insert it into the hctx dispatch list to avoid + * block layer merges for the request. */ - if (rq->rq_flags & RQF_DONTPREP) + if (rq->rq_flags & RQF_DONTPREP) { + rq->rq_flags &= ~RQF_SOFTBARRIER; + list_del_init(&rq->queuelist); blk_mq_request_bypass_insert(rq, false, false); - else + } else if (rq->rq_flags & RQF_SOFTBARRIER) { + rq->rq_flags &= ~RQF_SOFTBARRIER; + list_del_init(&rq->queuelist); blk_mq_insert_request(rq, true, false, false); + } } while (!list_empty(&rq_list)) { |