diff options
| author |  Jens Axboe <axboe@kernel.dk>
| 2021-11-03 05:49:07 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk>
| 2021-11-04 12:50:46 -0600 |
| commit | c5fc7b93173661336b9cc4e32fd5082a95e12b94 (patch) | |
| tree | 81f272f19dd6cc5c3be7b6f82a9b1c2951a4e372 /block/blk-core.c | |
| parent | blk-mq: update hctx->nr_active in blk_mq_end_request_batch() (diff) | |
| download | linux-c5fc7b93173661336b9cc4e32fd5082a95e12b94.tar.gz linux-c5fc7b93173661336b9cc4e32fd5082a95e12b94.tar.bz2 linux-c5fc7b93173661336b9cc4e32fd5082a95e12b94.zip | |
block: have plug stored requests hold references to the queue
Requests that were stored in the cache deliberately didn't hold an enter
reference to the queue, instead we grabbed one every time we pulled a
request out of there. That made for awkward logic on freeing the remainder
of the cached list, if needed, where we had to artificially raise the
queue usage count before each free.
Grab references up front for cached plug requests. That's safer, and also
more efficient.
Fixes: 47c122e35d7e ("block: pre-allocate requests if plug is started and is a batch")
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index fd389a16013c..35a87c06276e 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1643,7 +1643,13 @@ void blk_flush_plug(struct blk_plug *plug, bool from_schedule) flush_plug_callbacks(plug, from_schedule); if (!rq_list_empty(plug->mq_list)) blk_mq_flush_plug_list(plug, from_schedule); - if (unlikely(!from_schedule && plug->cached_rq)) + /* + * Unconditionally flush out cached requests, even if the unplug + * event came from schedule. Since we know hold references to the + * queue for cached requests, we don't want a blocked task holding + * up a queue freeze/quiesce event. + */ + if (unlikely(!rq_list_empty(plug->cached_rq))) blk_mq_free_plug_rqs(plug); } |