block: don't reorder requests in blk_add_rq_to_plug

commit e70c301faece15b618e54b613b1fd6ece3dd05b4 upstream.

Add requests to the tail of the list instead of the front so that they
are queued up in submission order.

Remove the re-reordering in blk_mq_dispatch_plug_list, virtio_queue_rqs
and nvme_queue_rqs now that the list is ordered as expected.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20241113152050.157179-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/block/blk-mq.c b/block/blk-mq.c
index c7fb3722d6206d61b03cc0a76d102f104093407d..f26bee562693632084ab5a2f9a6ccfac230ae0da 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1386,7 +1386,7 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq)
         */
        if (!plug->has_elevator && (rq->rq_flags & RQF_SCHED_TAGS))
                plug->has_elevator = true;
-       rq_list_add_head(&plug->mq_list, rq);
+       rq_list_add_tail(&plug->mq_list, rq);
        plug->rq_count++;
 }
 
@@ -2840,7 +2840,7 @@ static void blk_mq_dispatch_plug_list(struct blk_plug *plug, bool from_sched)
                        rq_list_add_tail(&requeue_list, rq);
                        continue;
                }
-               list_add(&rq->queuelist, &list);
+               list_add_tail(&rq->queuelist, &list);
                depth++;
        } while (!rq_list_empty(&plug->mq_list));
 

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 2069bf9701f51d5ebfb404210de3a617d142fd6a..fd6c565f8a507c02e49818b9877a7e7990b40908 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -514,7 +514,7 @@ static void virtio_queue_rqs(struct rq_list *rqlist)
                vq = this_vq;
 
                if (virtblk_prep_rq_batch(req))
-                       rq_list_add_head(&submit_list, req); /* reverse order */
+                       rq_list_add_tail(&submit_list, req);
                else
                        rq_list_add_tail(&requeue_list, req);
        }

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e943c1be0fcadad53212ffd95bc7c9b9bbe708b0..e70618e8d35eb464ec6355e60dbe3c7fec356d16 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1026,7 +1026,7 @@ static void nvme_queue_rqs(struct rq_list *rqlist)
                nvmeq = req->mq_hctx->driver_data;
 
                if (nvme_prep_rq_batch(nvmeq, req))
-                       rq_list_add_head(&submit_list, req); /* reverse order */
+                       rq_list_add_tail(&submit_list, req);
                else
                        rq_list_add_tail(&requeue_list, req);
        }