From: Mike Christie <michael.christie@oracle.com> To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Cc: Mike Christie <michael.christie@oracle.com> Subject: [PATCH V4 01/12] vhost: add vhost_worker pointer to vhost_virtqueue Date: Thu, 4 Nov 2021 14:04:51 -0500 [thread overview] Message-ID: <20211104190502.7053-2-michael.christie@oracle.com> (raw) In-Reply-To: <20211104190502.7053-1-michael.christie@oracle.com> This patchset allows userspace to map vqs to different workers. This patch adds a worker pointer to the vq so we can store that info. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/vhost/vhost.c | 24 +++++++++++++----------- drivers/vhost/vhost.h | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 9aa04fcdf210..9b4e7d74dab4 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -496,6 +496,7 @@ void vhost_dev_init(struct vhost_dev *dev, vq->log = NULL; vq->indirect = NULL; vq->heads = NULL; + vq->worker = NULL; vq->dev = dev; mutex_init(&vq->mutex); vhost_vq_reset(dev, vq); @@ -574,15 +575,14 @@ static void vhost_worker_free(struct vhost_dev *dev) kfree(worker); } -static int vhost_worker_create(struct vhost_dev *dev) +static struct vhost_worker *vhost_worker_create(struct vhost_dev *dev) { struct vhost_worker *worker; struct task_struct *task; - int ret; worker = kzalloc(sizeof(*worker), GFP_KERNEL_ACCOUNT); if (!worker) - return -ENOMEM; + return NULL; dev->worker = worker; worker->kcov_handle = kcov_common_handle(); @@ -594,25 +594,24 @@ static int vhost_worker_create(struct vhost_dev *dev) */ task = kernel_worker(vhost_worker, worker, NUMA_NO_NODE, CLONE_FS, KERN_WORKER_NO_FILES | KERN_WORKER_SIG_IGN); - if (IS_ERR(task)) { - ret = PTR_ERR(task); + if (IS_ERR(task)) goto free_worker; - } worker->task = task; kernel_worker_start(task, "vhost-%d", current->pid); - return 0; + return worker; free_worker: kfree(worker); dev->worker = NULL; - return ret; + return NULL; } /* Caller should have device mutex */ long vhost_dev_set_owner(struct vhost_dev *dev) { - int err; + struct vhost_worker *worker; + int err, i; /* Is there an owner already? */ if (vhost_dev_has_owner(dev)) { @@ -623,9 +622,12 @@ long vhost_dev_set_owner(struct vhost_dev *dev) vhost_attach_mm(dev); if (dev->use_worker) { - err = vhost_worker_create(dev); - if (err) + worker = vhost_worker_create(dev); + if (!worker) goto err_worker; + + for (i = 0; i < dev->nvqs; i++) + dev->vqs[i]->worker = worker; } err = vhost_dev_alloc_iovecs(dev); diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 09748694cb66..7ee38b4a2807 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -80,6 +80,7 @@ struct vhost_vring_call { /* The virtqueue structure describes a queue attached to a device. */ struct vhost_virtqueue { struct vhost_dev *dev; + struct vhost_worker *worker; /* The actual ring of buffers. */ struct mutex mutex; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Mike Christie <michael.christie@oracle.com> To: target-devel@vger.kernel.org, linux-scsi@vger.kernel.org, stefanha@redhat.com, pbonzini@redhat.com, jasowang@redhat.com, mst@redhat.com, sgarzare@redhat.com, virtualization@lists.linux-foundation.org Subject: [PATCH V4 01/12] vhost: add vhost_worker pointer to vhost_virtqueue Date: Thu, 4 Nov 2021 14:04:51 -0500 [thread overview] Message-ID: <20211104190502.7053-2-michael.christie@oracle.com> (raw) In-Reply-To: <20211104190502.7053-1-michael.christie@oracle.com> This patchset allows userspace to map vqs to different workers. This patch adds a worker pointer to the vq so we can store that info. Signed-off-by: Mike Christie <michael.christie@oracle.com> --- drivers/vhost/vhost.c | 24 +++++++++++++----------- drivers/vhost/vhost.h | 1 + 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 9aa04fcdf210..9b4e7d74dab4 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -496,6 +496,7 @@ void vhost_dev_init(struct vhost_dev *dev, vq->log = NULL; vq->indirect = NULL; vq->heads = NULL; + vq->worker = NULL; vq->dev = dev; mutex_init(&vq->mutex); vhost_vq_reset(dev, vq); @@ -574,15 +575,14 @@ static void vhost_worker_free(struct vhost_dev *dev) kfree(worker); } -static int vhost_worker_create(struct vhost_dev *dev) +static struct vhost_worker *vhost_worker_create(struct vhost_dev *dev) { struct vhost_worker *worker; struct task_struct *task; - int ret; worker = kzalloc(sizeof(*worker), GFP_KERNEL_ACCOUNT); if (!worker) - return -ENOMEM; + return NULL; dev->worker = worker; worker->kcov_handle = kcov_common_handle(); @@ -594,25 +594,24 @@ static int vhost_worker_create(struct vhost_dev *dev) */ task = kernel_worker(vhost_worker, worker, NUMA_NO_NODE, CLONE_FS, KERN_WORKER_NO_FILES | KERN_WORKER_SIG_IGN); - if (IS_ERR(task)) { - ret = PTR_ERR(task); + if (IS_ERR(task)) goto free_worker; - } worker->task = task; kernel_worker_start(task, "vhost-%d", current->pid); - return 0; + return worker; free_worker: kfree(worker); dev->worker = NULL; - return ret; + return NULL; } /* Caller should have device mutex */ long vhost_dev_set_owner(struct vhost_dev *dev) { - int err; + struct vhost_worker *worker; + int err, i; /* Is there an owner already? */ if (vhost_dev_has_owner(dev)) { @@ -623,9 +622,12 @@ long vhost_dev_set_owner(struct vhost_dev *dev) vhost_attach_mm(dev); if (dev->use_worker) { - err = vhost_worker_create(dev); - if (err) + worker = vhost_worker_create(dev); + if (!worker) goto err_worker; + + for (i = 0; i < dev->nvqs; i++) + dev->vqs[i]->worker = worker; } err = vhost_dev_alloc_iovecs(dev); diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index 09748694cb66..7ee38b4a2807 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h @@ -80,6 +80,7 @@ struct vhost_vring_call { /* The virtqueue structure describes a queue attached to a device. */ struct vhost_virtqueue { struct vhost_dev *dev; + struct vhost_worker *worker; /* The actual ring of buffers. */ struct mutex mutex; -- 2.25.1 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2021-11-04 19:05 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-04 19:04 [PATCH V4 00/12] vhost: multiple worker support Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` Mike Christie [this message] 2021-11-04 19:04 ` [PATCH V4 01/12] vhost: add vhost_worker pointer to vhost_virtqueue Mike Christie 2021-11-04 19:04 ` [PATCH V4 02/12] vhost, vhost-net: add helper to check if vq has work Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 03/12] vhost: take worker or vq instead of dev for queueing Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 04/12] vhost: take worker or vq instead of dev for flushing Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 05/12] vhost: convert poll work to be vq based Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 06/12] vhost-sock: convert to vq helpers Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 07/12] vhost-scsi: make SCSI cmd completion per vq Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 08/12] vhost-scsi: convert to vq helpers Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:04 ` [PATCH V4 09/12] vhost-scsi: flush IO vqs then send TMF rsp Mike Christie 2021-11-04 19:04 ` Mike Christie 2021-11-04 19:05 ` [PATCH V4 10/12] vhost: remove device wide queu/flushing helpers Mike Christie 2021-11-04 19:05 ` Mike Christie 2021-11-04 19:05 ` [PATCH V4 11/12] vhost: allow userspace to create workers Mike Christie 2021-11-04 19:05 ` Mike Christie 2021-11-04 19:05 ` [PATCH V4 12/12] vhost: allow worker attachment after initial setup Mike Christie 2021-11-04 19:05 ` 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=20211104190502.7053-2-michael.christie@oracle.com \ --to=michael.christie@oracle.com \ --cc=jasowang@redhat.com \ --cc=linux-scsi@vger.kernel.org \ --cc=mst@redhat.com \ --cc=pbonzini@redhat.com \ --cc=sgarzare@redhat.com \ --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: linkBe 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.