[PATCH v3 03/19] vdpa_sim: remove hard-coded virtq count

[Stefano Garzarella]

From: Max Gurtovoy <mgurto...@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 <mgurto...@nvidia.com>
[sgarzare: replace kmalloc_array() with kcalloc()]
Acked-by: Jason Wang <jasow...@redhat.com>
Signed-off-by: Stefano Garzarella <sgarz...@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