1 files changed, 8 insertions, 0 deletions

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index eb55492e6875..bab4bff15f42 100644
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -261,6 +261,14 @@ static int bt_get(struct blk_mq_alloc_data *data,
                  */
                 blk_mq_run_hw_queue(hctx, false);
 
+                /*
+                 * Retry tag allocation after running the hardware queue,
+                 * as running the queue may also have found completions.
+                 */
+                tag = __bt_get(hctx, bt, last_tag);
+                if (tag != -1)
+                        break;
+
                 blk_mq_put_ctx(data->ctx);
 
                 io_schedule();