From: Stefano Garzarella <sgarzare@redhat.com> To: virtualization@lists.linux-foundation.org Cc: Stefan Hajnoczi <stefanha@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Oren Duer <oren@nvidia.com>, Jason Wang <jasowang@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, linux-kernel@vger.kernel.org, Max Gurtovoy <mgurtovoy@nvidia.com>, Shahaf Shuler <shahafs@nvidia.com>, Eli Cohen <elic@nvidia.com> Subject: [PATCH v3 03/19] vdpa_sim: remove hard-coded virtq count Date: Thu, 3 Dec 2020 18:04:55 +0100 [thread overview] Message-ID: <20201203170511.216407-4-sgarzare@redhat.com> (raw) In-Reply-To: <20201203170511.216407-1-sgarzare@redhat.com> From: Max Gurtovoy <mgurtovoy@nvidia.com> Add a new attribute that will define the number of virt queues to be created for the vdpasim device. Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> [sgarzare: replace kmalloc_array() with kcalloc()] Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- v1: - use kcalloc() instead of kmalloc_array() since some function expects variables initialized to zero --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index b08f28d20d8d..295a770caac0 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -60,7 +60,7 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) | /* State of each vdpasim device */ struct vdpasim { struct vdpa_device vdpa; - struct vdpasim_virtqueue vqs[VDPASIM_VQ_NUM]; + struct vdpasim_virtqueue *vqs; struct work_struct work; /* spinlock to synchronize virtqueue state */ spinlock_t lock; @@ -70,6 +70,7 @@ struct vdpasim { u32 status; u32 generation; u64 features; + int nvqs; /* spinlock to synchronize iommu table */ spinlock_t iommu_lock; }; @@ -134,7 +135,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim) { int i; - for (i = 0; i < VDPASIM_VQ_NUM; i++) + for (i = 0; i < vdpasim->nvqs; i++) vdpasim_vq_reset(&vdpasim->vqs[i]); spin_lock(&vdpasim->iommu_lock); @@ -340,7 +341,7 @@ static struct vdpasim *vdpasim_create(void) const struct vdpa_config_ops *ops; struct vdpasim *vdpasim; struct device *dev; - int ret = -ENOMEM; + int i, ret = -ENOMEM; if (batch_mapping) ops = &vdpasim_net_batch_config_ops; @@ -351,6 +352,7 @@ static struct vdpasim *vdpasim_create(void) if (!vdpasim) goto err_alloc; + vdpasim->nvqs = VDPASIM_VQ_NUM; INIT_WORK(&vdpasim->work, vdpasim_work); spin_lock_init(&vdpasim->lock); spin_lock_init(&vdpasim->iommu_lock); @@ -361,6 +363,11 @@ static struct vdpasim *vdpasim_create(void) goto err_iommu; set_dma_ops(dev, &vdpasim_dma_ops); + vdpasim->vqs = kcalloc(vdpasim->nvqs, sizeof(struct vdpasim_virtqueue), + GFP_KERNEL); + if (!vdpasim->vqs) + goto err_iommu; + vdpasim->iommu = vhost_iotlb_alloc(2048, 0); if (!vdpasim->iommu) goto err_iommu; @@ -379,8 +386,8 @@ static struct vdpasim *vdpasim_create(void) eth_random_addr(vdpasim->config.mac); } - vringh_set_iotlb(&vdpasim->vqs[0].vring, vdpasim->iommu); - vringh_set_iotlb(&vdpasim->vqs[1].vring, vdpasim->iommu); + for (i = 0; i < vdpasim->nvqs; i++) + vringh_set_iotlb(&vdpasim->vqs[i].vring, vdpasim->iommu); vdpasim->vdpa.dma_dev = dev; ret = vdpa_register_device(&vdpasim->vdpa); @@ -649,6 +656,7 @@ static void vdpasim_free(struct vdpa_device *vdpa) kfree(vdpasim->buffer); if (vdpasim->iommu) vhost_iotlb_free(vdpasim->iommu); + kfree(vdpasim->vqs); } static const struct vdpa_config_ops vdpasim_net_config_ops = { -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Garzarella <sgarzare@redhat.com> To: virtualization@lists.linux-foundation.org Cc: Laurent Vivier <lvivier@redhat.com>, Max Gurtovoy <mgurtovoy@nvidia.com>, "Michael S. Tsirkin" <mst@redhat.com>, linux-kernel@vger.kernel.org, Shahaf Shuler <shahafs@nvidia.com>, Stefan Hajnoczi <stefanha@redhat.com>, Eli Cohen <elic@nvidia.com>, Oren Duer <oren@nvidia.com> Subject: [PATCH v3 03/19] vdpa_sim: remove hard-coded virtq count Date: Thu, 3 Dec 2020 18:04:55 +0100 [thread overview] Message-ID: <20201203170511.216407-4-sgarzare@redhat.com> (raw) In-Reply-To: <20201203170511.216407-1-sgarzare@redhat.com> From: Max Gurtovoy <mgurtovoy@nvidia.com> Add a new attribute that will define the number of virt queues to be created for the vdpasim device. Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com> [sgarzare: replace kmalloc_array() with kcalloc()] Acked-by: Jason Wang <jasowang@redhat.com> Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- v1: - use kcalloc() instead of kmalloc_array() since some function expects variables initialized to zero --- drivers/vdpa/vdpa_sim/vdpa_sim.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c index b08f28d20d8d..295a770caac0 100644 --- a/drivers/vdpa/vdpa_sim/vdpa_sim.c +++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c @@ -60,7 +60,7 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) | /* State of each vdpasim device */ struct vdpasim { struct vdpa_device vdpa; - struct vdpasim_virtqueue vqs[VDPASIM_VQ_NUM]; + struct vdpasim_virtqueue *vqs; struct work_struct work; /* spinlock to synchronize virtqueue state */ spinlock_t lock; @@ -70,6 +70,7 @@ struct vdpasim { u32 status; u32 generation; u64 features; + int nvqs; /* spinlock to synchronize iommu table */ spinlock_t iommu_lock; }; @@ -134,7 +135,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim) { int i; - for (i = 0; i < VDPASIM_VQ_NUM; i++) + for (i = 0; i < vdpasim->nvqs; i++) vdpasim_vq_reset(&vdpasim->vqs[i]); spin_lock(&vdpasim->iommu_lock); @@ -340,7 +341,7 @@ static struct vdpasim *vdpasim_create(void) const struct vdpa_config_ops *ops; struct vdpasim *vdpasim; struct device *dev; - int ret = -ENOMEM; + int i, ret = -ENOMEM; if (batch_mapping) ops = &vdpasim_net_batch_config_ops; @@ -351,6 +352,7 @@ static struct vdpasim *vdpasim_create(void) if (!vdpasim) goto err_alloc; + vdpasim->nvqs = VDPASIM_VQ_NUM; INIT_WORK(&vdpasim->work, vdpasim_work); spin_lock_init(&vdpasim->lock); spin_lock_init(&vdpasim->iommu_lock); @@ -361,6 +363,11 @@ static struct vdpasim *vdpasim_create(void) goto err_iommu; set_dma_ops(dev, &vdpasim_dma_ops); + vdpasim->vqs = kcalloc(vdpasim->nvqs, sizeof(struct vdpasim_virtqueue), + GFP_KERNEL); + if (!vdpasim->vqs) + goto err_iommu; + vdpasim->iommu = vhost_iotlb_alloc(2048, 0); if (!vdpasim->iommu) goto err_iommu; @@ -379,8 +386,8 @@ static struct vdpasim *vdpasim_create(void) eth_random_addr(vdpasim->config.mac); } - vringh_set_iotlb(&vdpasim->vqs[0].vring, vdpasim->iommu); - vringh_set_iotlb(&vdpasim->vqs[1].vring, vdpasim->iommu); + for (i = 0; i < vdpasim->nvqs; i++) + vringh_set_iotlb(&vdpasim->vqs[i].vring, vdpasim->iommu); vdpasim->vdpa.dma_dev = dev; ret = vdpa_register_device(&vdpasim->vdpa); @@ -649,6 +656,7 @@ static void vdpasim_free(struct vdpa_device *vdpa) kfree(vdpasim->buffer); if (vdpasim->iommu) vhost_iotlb_free(vdpasim->iommu); + kfree(vdpasim->vqs); } static const struct vdpa_config_ops vdpasim_net_config_ops = { -- 2.26.2 _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization
next prev parent reply other threads:[~2020-12-03 17:07 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-03 17:04 [PATCH v3 00/19] vdpa: generalize vdpa simulator Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-03 17:04 ` [PATCH v3 01/19] vdpa: remove unnecessary 'default n' in Kconfig entries Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-03 17:04 ` [PATCH v3 02/19] vdpa_sim: remove unnecessary headers inclusion Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-03 17:37 ` Randy Dunlap 2020-12-03 17:37 ` Randy Dunlap 2020-12-04 7:57 ` Stefano Garzarella 2020-12-04 7:57 ` Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella [this message] 2020-12-03 17:04 ` [PATCH v3 03/19] vdpa_sim: remove hard-coded virtq count Stefano Garzarella 2020-12-03 17:04 ` [PATCH v3 04/19] vhost/iotlb: add VHOST_IOTLB_UNLIMITED macro Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-07 3:55 ` Jason Wang 2020-12-07 3:55 ` Jason Wang 2020-12-03 17:04 ` [PATCH v3 05/19] vdpa_sim: remove the limit of IOTLB entries Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-07 4:00 ` Jason Wang 2020-12-07 4:00 ` Jason Wang 2020-12-09 10:58 ` Stefano Garzarella 2020-12-09 10:58 ` Stefano Garzarella 2020-12-10 4:03 ` Jason Wang 2020-12-10 4:03 ` Jason Wang 2020-12-03 17:04 ` [PATCH v3 06/19] vdpa_sim: rename vdpasim_config_ops variables Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-03 17:04 ` [PATCH v3 07/19] vdpa_sim: add struct vdpasim_dev_attr for device attributes Stefano Garzarella 2020-12-03 17:04 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 08/19] vdpa_sim: add device id field in vdpasim_dev_attr Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 09/19] vdpa_sim: add supported_features " Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 10/19] vdpa_sim: add work_fn " Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 11/19] vdpa_sim: store parsed MAC address in a buffer Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 12/19] vdpa_sim: make 'config' generic and usable for any device type Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-07 5:22 ` Jason Wang 2020-12-07 5:22 ` Jason Wang 2020-12-03 17:05 ` [PATCH v3 13/19] vdpa_sim: add get_config callback in vdpasim_dev_attr Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-07 5:29 ` Jason Wang 2020-12-07 5:29 ` Jason Wang 2020-12-09 11:07 ` Stefano Garzarella 2020-12-09 11:07 ` Stefano Garzarella 2020-12-15 11:43 ` Stefano Garzarella 2020-12-15 11:43 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 14/19] vdpa_sim: add set_config " Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-07 5:30 ` Jason Wang 2020-12-07 5:30 ` Jason Wang 2020-12-03 17:05 ` [PATCH v3 15/19] vdpa_sim: set vringh notify callback Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-07 5:30 ` Jason Wang 2020-12-07 5:30 ` Jason Wang 2020-12-03 17:05 ` [PATCH v3 16/19] vdpa_sim: use kvmalloc to allocate vdpasim->buffer Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 17/19] vdpa_sim: make vdpasim->buffer size configurable Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 18/19] vdpa_sim: split vdpasim_virtqueue's iov field in out_iov and in_iov Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:05 ` [PATCH v3 19/19] vdpa: split vdpasim to core and net modules Stefano Garzarella 2020-12-03 17:05 ` Stefano Garzarella 2020-12-03 17:25 ` Randy Dunlap 2020-12-03 17:25 ` Randy Dunlap 2020-12-04 7:48 ` Stefano Garzarella 2020-12-04 7:48 ` Stefano Garzarella 2020-12-07 5:33 ` Jason Wang 2020-12-07 5:33 ` Jason Wang
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=20201203170511.216407-4-sgarzare@redhat.com \ --to=sgarzare@redhat.com \ --cc=elic@nvidia.com \ --cc=jasowang@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=lvivier@redhat.com \ --cc=mgurtovoy@nvidia.com \ --cc=mst@redhat.com \ --cc=oren@nvidia.com \ --cc=shahafs@nvidia.com \ --cc=stefanha@redhat.com \ --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.