Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Pull block fixes from Jens Axboe:
 "Three fixes, two regressions and one that poses a problem in blk-mq
  with the new nvmef code"

* 'for-linus' of git://git.kernel.dk/linux-block:
  blk-mq: skip unmapped queues in blk_mq_alloc_request_hctx
  nvme-rdma: only clear queue flags after successful connect
  blk-throttle: Extend slice if throttle group is not empty

3 files changed, 19 insertions, 5 deletions

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 13f5a6c1de76..c207fa9870eb 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -296,17 +296,29 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw,
         if (ret)
                 return ERR_PTR(ret);
 
+        /*
+         * Check if the hardware context is actually mapped to anything.
+         * If not tell the caller that it should skip this queue.
+         */
         hctx = q->queue_hw_ctx[hctx_idx];
+        if (!blk_mq_hw_queue_mapped(hctx)) {
+                ret = -EXDEV;
+                goto out_queue_exit;
+        }
         ctx = __blk_mq_get_ctx(q, cpumask_first(hctx->cpumask));
 
         blk_mq_set_alloc_data(&alloc_data, q, flags, ctx, hctx);
         rq = __blk_mq_alloc_request(&alloc_data, rw, 0);
         if (!rq) {
-                blk_queue_exit(q);
-                return ERR_PTR(-EWOULDBLOCK);
+                ret = -EWOULDBLOCK;
+                goto out_queue_exit;
         }
 
         return rq;
+
+out_queue_exit:
+        blk_queue_exit(q);
+        return ERR_PTR(ret);
 }
 EXPORT_SYMBOL_GPL(blk_mq_alloc_request_hctx);
 
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index f1aba26f4719..a3ea8260c94c 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -780,9 +780,11 @@ static bool tg_may_dispatch(struct throtl_grp *tg, struct bio *bio,
         /*
          * If previous slice expired, start a new one otherwise renew/extend
          * existing slice to make sure it is at least throtl_slice interval
-         * long since now.
+         * long since now. New slice is started only for empty throttle group.
+         * If there is queued bio, that means there should be an active
+         * slice and it should be extended instead.
          */
-        if (throtl_slice_used(tg, rw))
+        if (throtl_slice_used(tg, rw) && !(tg->service_queue.nr_queued[rw]))
                 throtl_start_new_slice(tg, rw);
         else {
                 if (time_before(tg->slice_end[rw], jiffies + throtl_slice))
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index c2c2c28e6eb5..fbdb2267e460 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -561,7 +561,6 @@ static int nvme_rdma_init_queue(struct nvme_rdma_ctrl *ctrl,
 
         queue = &ctrl->queues[idx];
         queue->ctrl = ctrl;
-        queue->flags = 0;
         init_completion(&queue->cm_done);
 
         if (idx > 0)
@@ -595,6 +594,7 @@ static int nvme_rdma_init_queue(struct nvme_rdma_ctrl *ctrl,
                 goto out_destroy_cm_id;
         }
 
+        clear_bit(NVME_RDMA_Q_DELETING, &queue->flags);
         set_bit(NVME_RDMA_Q_CONNECTED, &queue->flags);
 
         return 0;