All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: linux-block@vger.kernel.org, linux-nvme@lists.infradead.org
Cc: Jens Axboe <axboe@kernel.dk>
Subject: [PATCH 4/7] virtio_blk: implement mq_ops->commit_rqs() hook
Date: Wed, 28 Nov 2018 06:35:35 -0700	[thread overview]
Message-ID: <20181128133538.20329-5-axboe@kernel.dk> (raw)
In-Reply-To: <20181128133538.20329-1-axboe@kernel.dk>

We need this for blk-mq to kick things into gear, if we told it that
we had more IO coming, but then failed to deliver on that promise.

Reviewed-by: Omar Sandoval <osandov@fb.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 drivers/block/virtio_blk.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 6e869d05f91e..912c4265e592 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -214,6 +214,20 @@ static void virtblk_done(struct virtqueue *vq)
 	spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags);
 }
 
+static void virtio_commit_rqs(struct blk_mq_hw_ctx *hctx)
+{
+	struct virtio_blk *vblk = hctx->queue->queuedata;
+	struct virtio_blk_vq *vq = &vblk->vqs[hctx->queue_num];
+	bool kick;
+
+	spin_lock_irq(&vq->lock);
+	kick = virtqueue_kick_prepare(vq->vq);
+	spin_unlock_irq(&vq->lock);
+
+	if (kick)
+		virtqueue_notify(vq->vq);
+}
+
 static blk_status_t virtio_queue_rq(struct blk_mq_hw_ctx *hctx,
 			   const struct blk_mq_queue_data *bd)
 {
@@ -638,6 +652,7 @@ static void virtblk_initialize_rq(struct request *req)
 
 static const struct blk_mq_ops virtio_mq_ops = {
 	.queue_rq	= virtio_queue_rq,
+	.commit_rqs	= virtio_commit_rqs,
 	.complete	= virtblk_request_done,
 	.init_request	= virtblk_init_request,
 #ifdef CONFIG_VIRTIO_BLK_SCSI
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: axboe@kernel.dk (Jens Axboe)
Subject: [PATCH 4/7] virtio_blk: implement mq_ops->commit_rqs() hook
Date: Wed, 28 Nov 2018 06:35:35 -0700	[thread overview]
Message-ID: <20181128133538.20329-5-axboe@kernel.dk> (raw)
In-Reply-To: <20181128133538.20329-1-axboe@kernel.dk>

We need this for blk-mq to kick things into gear, if we told it that
we had more IO coming, but then failed to deliver on that promise.

Reviewed-by: Omar Sandoval <osandov at fb.com>
Acked-by: Michael S. Tsirkin <mst at redhat.com>
Reviewed-by: Christoph Hellwig <hch at lst.de>
Signed-off-by: Jens Axboe <axboe at kernel.dk>
---
 drivers/block/virtio_blk.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 6e869d05f91e..912c4265e592 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -214,6 +214,20 @@ static void virtblk_done(struct virtqueue *vq)
 	spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags);
 }
 
+static void virtio_commit_rqs(struct blk_mq_hw_ctx *hctx)
+{
+	struct virtio_blk *vblk = hctx->queue->queuedata;
+	struct virtio_blk_vq *vq = &vblk->vqs[hctx->queue_num];
+	bool kick;
+
+	spin_lock_irq(&vq->lock);
+	kick = virtqueue_kick_prepare(vq->vq);
+	spin_unlock_irq(&vq->lock);
+
+	if (kick)
+		virtqueue_notify(vq->vq);
+}
+
 static blk_status_t virtio_queue_rq(struct blk_mq_hw_ctx *hctx,
 			   const struct blk_mq_queue_data *bd)
 {
@@ -638,6 +652,7 @@ static void virtblk_initialize_rq(struct request *req)
 
 static const struct blk_mq_ops virtio_mq_ops = {
 	.queue_rq	= virtio_queue_rq,
+	.commit_rqs	= virtio_commit_rqs,
 	.complete	= virtblk_request_done,
 	.init_request	= virtblk_init_request,
 #ifdef CONFIG_VIRTIO_BLK_SCSI
-- 
2.17.1

  parent reply	other threads:[~2018-11-28 13:35 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-28 13:35 [PATCHSET v2 0/8] block plugging improvements Jens Axboe
2018-11-28 13:35 ` Jens Axboe
2018-11-28 13:35 ` [PATCH 1/7] block: improve logic around when to sort a plug list Jens Axboe
2018-11-28 13:35   ` Jens Axboe
2018-11-29 15:44   ` Christoph Hellwig
2018-11-29 15:44     ` Christoph Hellwig
2018-12-04  1:35   ` Sagi Grimberg
2018-12-04  1:35     ` Sagi Grimberg
2018-11-28 13:35 ` [PATCH 2/7] blk-mq: add mq_ops->commit_rqs() Jens Axboe
2018-11-28 13:35   ` Jens Axboe
2018-11-29 15:45   ` Christoph Hellwig
2018-11-29 15:45     ` Christoph Hellwig
2018-11-29 16:52     ` Jens Axboe
2018-11-29 16:52       ` Jens Axboe
2018-12-04  1:35   ` Sagi Grimberg
2018-12-04  1:35     ` Sagi Grimberg
2018-11-28 13:35 ` [PATCH 3/7] nvme: implement mq_ops->commit_rqs() hook Jens Axboe
2018-11-28 13:35   ` Jens Axboe
2018-11-29 15:47   ` Christoph Hellwig
2018-11-29 15:47     ` Christoph Hellwig
2018-11-29 17:02     ` Jens Axboe
2018-11-29 17:02       ` Jens Axboe
2018-11-29 17:04       ` Christoph Hellwig
2018-11-29 17:04         ` Christoph Hellwig
2018-11-29 17:06         ` Jens Axboe
2018-11-29 17:06           ` Jens Axboe
2018-11-29 17:38           ` Keith Busch
2018-11-29 17:38             ` Keith Busch
2018-11-29 17:42             ` Jens Axboe
2018-11-29 17:42               ` Jens Axboe
2018-11-28 13:35 ` Jens Axboe [this message]
2018-11-28 13:35   ` [PATCH 4/7] virtio_blk: " Jens Axboe
2018-12-04  1:36   ` Sagi Grimberg
2018-12-04  1:36     ` Sagi Grimberg
2018-11-28 13:35 ` [PATCH 5/7] ataflop: " Jens Axboe
2018-11-28 13:35   ` Jens Axboe
2018-11-29  7:03   ` Ming Lei
2018-11-29  7:03     ` Ming Lei
2018-11-29 15:47   ` Christoph Hellwig
2018-11-29 15:47     ` Christoph Hellwig
2018-12-04  1:37   ` Sagi Grimberg
2018-12-04  1:37     ` Sagi Grimberg
2018-11-28 13:35 ` [PATCH 6/7] blk-mq: use bd->last == true for list inserts Jens Axboe
2018-11-28 13:35   ` Jens Axboe
2018-11-29  7:01   ` Ming Lei
2018-11-29  7:01     ` Ming Lei
2018-11-29 15:49   ` Christoph Hellwig
2018-11-29 15:49     ` Christoph Hellwig
2018-12-04  1:39   ` Sagi Grimberg
2018-12-04  1:39     ` Sagi Grimberg
2018-11-28 13:35 ` [PATCH 7/7] blk-mq: use plug for devices that implement ->commits_rqs() Jens Axboe
2018-11-28 13:35   ` Jens Axboe
2018-11-29  7:13   ` Ming Lei
2018-11-29  7:13     ` Ming Lei
2018-11-29 15:49   ` Christoph Hellwig
2018-11-29 15:49     ` Christoph Hellwig
2018-11-29 15:50     ` Christoph Hellwig
2018-11-29 15:50       ` Christoph Hellwig
2018-11-29 17:05     ` Jens Axboe
2018-11-29 17:05       ` Jens Axboe
2018-12-04  1:39   ` Sagi Grimberg
2018-12-04  1:39     ` Sagi Grimberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181128133538.20329-5-axboe@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvme@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.