blk-mq: fix dispatch from sw queue

When a request is added to rq list of sw queue(ctx), the rq may be from
a different type of hctx, especially after multi queue mapping is
introduced.

So when dispach request from sw queue via blk_mq_flush_busy_ctxs() or
blk_mq_dequeue_from_ctx(), one request belonging to other queue type of
hctx can be dispatched to current hctx in case that read queue or poll
queue is enabled.

This patch fixes this issue by introducing per-queue-type list.

Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Ming Lei <ming.lei@redhat.com>

Changed by me to not use separately cacheline aligned lists, just
place them all in the same cacheline where we had just the one list
and lock before.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

1 files changed, 8 insertions, 3 deletions

diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c
index 056fa9baf44e..140933e4a7d1 100644
--- a/block/blk-mq-sched.c
+++ b/block/blk-mq-sched.c
@@ -302,11 +302,14 @@ EXPORT_SYMBOL_GPL(blk_mq_bio_list_merge);
  * too much time checking for merges.
  */
 static bool blk_mq_attempt_merge(struct request_queue *q,
+                                 struct blk_mq_hw_ctx *hctx,
                                  struct blk_mq_ctx *ctx, struct bio *bio)
 {
+        enum hctx_type type = hctx->type;
+
         lockdep_assert_held(&ctx->lock);
 
-        if (blk_mq_bio_list_merge(q, &ctx->rq_list, bio)) {
+        if (blk_mq_bio_list_merge(q, &ctx->rq_lists[type], bio)) {
                 ctx->rq_merged++;
                 return true;
         }
@@ -320,17 +323,19 @@ bool __blk_mq_sched_bio_merge(struct request_queue *q, struct bio *bio)
         struct blk_mq_ctx *ctx = blk_mq_get_ctx(q);
         struct blk_mq_hw_ctx *hctx = blk_mq_map_queue(q, bio->bi_opf, ctx->cpu);
         bool ret = false;
+        enum hctx_type type;
 
         if (e && e->type->ops.bio_merge) {
                 blk_mq_put_ctx(ctx);
                 return e->type->ops.bio_merge(hctx, bio);
         }
 
+        type = hctx->type;
         if ((hctx->flags & BLK_MQ_F_SHOULD_MERGE) &&
-                        !list_empty_careful(&ctx->rq_list)) {
+                        !list_empty_careful(&ctx->rq_lists[type])) {
                 /* default per sw-queue merge */
                 spin_lock(&ctx->lock);
-                ret = blk_mq_attempt_merge(q, ctx, bio);
+                ret = blk_mq_attempt_merge(q, hctx, ctx, bio);
                 spin_unlock(&ctx->lock);
         }