From: Mike Christie <michael.christie@oracle.com>
To: stefanha@redhat.com, qemu-devel@nongnu.org, fam@euphon.net,
linux-scsi@vger.kernel.org, target-devel@vger.kernel.org,
mst@redhat.com, jasowang@redhat.com, pbonzini@redhat.com,
virtualization@lists.linux-foundation.org
Subject: [PATCH 10/10] vhost-scsi: create a woker per IO vq
Date: Thu, 12 Nov 2020 23:19:10 +0000 [thread overview]
Message-ID: <1605223150-10888-12-git-send-email-michael.christie@oracle.com> (raw)
In-Reply-To: <1605223150-10888-1-git-send-email-michael.christie@oracle.com>
This patch has vhost-scsi create a worker thread per IO vq.
It also adds a modparam to enable the feature, because I was thinking
existing setups might not be expecting the extra threading use, so the
default is to use the old single thread multiple vq behavior.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
drivers/vhost/scsi.c | 38 +++++++++++++++++++++++++++++++++++++-
1 file changed, 37 insertions(+), 1 deletion(-)
diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index 612359d..3fb147f 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -62,6 +62,12 @@
*/
#define VHOST_SCSI_WEIGHT 256
+static bool vhost_scsi_worker_per_io_vq;
+module_param_named(thread_per_io_virtqueue, vhost_scsi_worker_per_io_vq, bool,
+ 0644);
+MODULE_PARM_DESC(thread_per_io_virtqueue,
+ "Create a worker thread per IO virtqueue. Set to true to turn on. Default is false where all virtqueues share a thread.");
+
struct vhost_scsi_inflight {
/* Wait for the flush operation to finish */
struct completion comp;
@@ -1805,6 +1811,36 @@ static int vhost_scsi_set_features(struct vhost_scsi *vs, u64 features)
return 0;
}
+static int vhost_scsi_enable_vring(struct vhost_virtqueue *vq, bool enable)
+{
+ struct vhost_scsi *vs = container_of(vq->dev, struct vhost_scsi, dev);
+ /*
+ * For compat, we have the evt, ctl and first IO vq share worker0 like
+ * is setup by default. Additional vqs get their own worker.
+ */
+ if (vq = &vs->vqs[VHOST_SCSI_VQ_CTL].vq ||
+ vq = &vs->vqs[VHOST_SCSI_VQ_EVT].vq ||
+ vq = &vs->vqs[VHOST_SCSI_VQ_IO].vq)
+ return 0;
+
+ if (enable) {
+ if (!vhost_scsi_worker_per_io_vq)
+ return 0;
+ if (vq->worker_id != 0)
+ return 0;
+ return vhost_vq_worker_add(vq->dev, vq);
+ } else {
+ if (vq->worker_id = 0)
+ return 0;
+ vhost_vq_worker_remove(vq->dev, vq);
+ return 0;
+ }
+}
+
+static struct vhost_dev_ops vhost_scsi_dev_ops = {
+ .enable_vring = vhost_scsi_enable_vring,
+};
+
static int vhost_scsi_open(struct inode *inode, struct file *f)
{
struct vhost_scsi_virtqueue *svq;
@@ -1843,7 +1879,7 @@ static int vhost_scsi_open(struct inode *inode, struct file *f)
svq->vq.handle_kick = vhost_scsi_handle_kick;
}
vhost_dev_init(&vs->dev, vqs, VHOST_SCSI_MAX_VQ, UIO_MAXIOV,
- VHOST_SCSI_WEIGHT, 0, true, NULL);
+ VHOST_SCSI_WEIGHT, 0, true, &vhost_scsi_dev_ops);
vhost_scsi_init_inflight(vs, NULL);
--
1.8.3.1
next prev parent reply other threads:[~2020-11-12 23:19 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-12 23:18 [PATCH 00/10] vhost/qemu: thread per IO SCSI vq Mike Christie
2020-11-12 23:19 ` [PATCH 1/1] qemu vhost scsi: add VHOST_SET_VRING_ENABLE support Mike Christie
2020-11-17 11:53 ` Stefan Hajnoczi
2020-12-02 9:59 ` Michael S. Tsirkin
2020-12-02 16:05 ` Michael Christie
2020-11-12 23:19 ` [PATCH 01/10] vhost: remove work arg from vhost_work_flush Mike Christie
2020-11-17 13:04 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 02/10] vhost scsi: remove extra flushes Mike Christie
2020-11-17 13:07 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 03/10] vhost poll: fix coding style Mike Christie
2020-11-17 13:07 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 04/10] vhost: support multiple worker threads Mike Christie
2020-11-12 23:19 ` [PATCH 05/10] vhost: poll support support multiple workers Mike Christie
2020-11-17 15:32 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 06/10] vhost scsi: make SCSI cmd completion per vq Mike Christie
2020-11-17 16:04 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 07/10] vhost, vhost-scsi: flush IO vqs then send TMF rsp Mike Christie
2020-11-17 16:05 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 08/10] vhost: move msg_handler to new ops struct Mike Christie
2020-11-17 16:08 ` Stefan Hajnoczi
2020-11-12 23:19 ` [PATCH 09/10] vhost: add VHOST_SET_VRING_ENABLE support Mike Christie
2020-11-17 16:14 ` Stefan Hajnoczi
2020-11-12 23:19 ` Mike Christie [this message]
2020-11-17 16:40 ` [PATCH 00/10] vhost/qemu: thread per IO SCSI vq Stefan Hajnoczi
2020-11-17 19:13 ` Mike Christie
2020-11-18 9:54 ` Michael S. Tsirkin
2020-11-19 14:00 ` Stefan Hajnoczi
2020-11-18 11:31 ` Stefan Hajnoczi
2020-11-19 14:46 ` Michael S. Tsirkin
2020-11-19 16:11 ` Mike Christie
2020-11-19 16:24 ` Stefan Hajnoczi
2020-11-19 16:43 ` Mike Christie
2020-11-19 17:08 ` Stefan Hajnoczi
2020-11-20 8:45 ` Stefan Hajnoczi
2020-11-20 12:31 ` Michael S. Tsirkin
2020-12-01 12:59 ` Stefan Hajnoczi
2020-12-01 13:45 ` Stefano Garzarella
2020-12-01 17:43 ` Stefan Hajnoczi
2020-12-02 10:35 ` Stefano Garzarella
2020-11-23 15:17 ` Stefano Garzarella
2020-11-18 5:17 ` Jason Wang
2020-11-18 6:57 ` Mike Christie
2020-11-18 7:19 ` Mike Christie
2020-11-18 7:54 ` Jason Wang
2020-11-18 20:06 ` Mike Christie
2020-11-19 4:35 ` Jason Wang
2020-11-19 15:49 ` Mike Christie
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=1605223150-10888-12-git-send-email-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=fam@euphon.net \
--cc=jasowang@redhat.com \
--cc=linux-scsi@vger.kernel.org \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=target-devel@vger.kernel.org \
--cc=virtualization@lists.linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).