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>,
Randy Dunlap <rdunlap@infradead.org>,
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 v4 03/18] vdpa_sim: remove hard-coded virtq count
Date: Tue, 15 Dec 2020 15:42:41 +0100 [thread overview]
Message-ID: <20201215144256.155342-4-sgarzare@redhat.com> (raw)
In-Reply-To: <20201215144256.155342-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 63b85541fb5e..07ccc8609784 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -63,7 +63,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;
@@ -73,6 +73,7 @@ struct vdpasim {
u32 status;
u32 generation;
u64 features;
+ int nvqs;
/* spinlock to synchronize iommu table */
spinlock_t iommu_lock;
};
@@ -137,7 +138,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);
@@ -343,7 +344,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;
@@ -354,6 +355,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);
@@ -364,6 +366,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;
@@ -382,8 +389,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);
@@ -652,6 +659,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-15 14:43 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 14:42 [PATCH v4 00/18] vdpa: generalize vdpa simulator Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 01/18] vdpa: remove unnecessary 'default n' in Kconfig entries Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 02/18] vdpa_sim: remove unnecessary headers inclusion Stefano Garzarella
2020-12-15 14:42 ` Stefano Garzarella [this message]
2020-12-15 14:42 ` [PATCH v4 04/18] vdpa_sim: make IOTLB entries limit configurable Stefano Garzarella
2020-12-17 4:29 ` Jason Wang
2020-12-15 14:42 ` [PATCH v4 05/18] vdpa_sim: rename vdpasim_config_ops variables Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 06/18] vdpa_sim: add struct vdpasim_dev_attr for device attributes Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 07/18] vdpa_sim: add device id field in vdpasim_dev_attr Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 08/18] vdpa_sim: add supported_features " Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 09/18] vdpa_sim: add work_fn " Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 10/18] vdpa_sim: store parsed MAC address in a buffer Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 11/18] vdpa_sim: make 'config' generic and usable for any device type Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 12/18] vdpa_sim: add get_config callback in vdpasim_dev_attr Stefano Garzarella
2020-12-17 5:30 ` Jason Wang
2020-12-15 14:42 ` [PATCH v4 13/18] vdpa_sim: add set_config " Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 14/18] vdpa_sim: set vringh notify callback Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 15/18] vdpa_sim: use kvmalloc to allocate vdpasim->buffer Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 16/18] vdpa_sim: make vdpasim->buffer size configurable Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 17/18] vdpa_sim: split vdpasim_virtqueue's iov field in out_iov and in_iov Stefano Garzarella
2020-12-15 14:42 ` [PATCH v4 18/18] vdpa: split vdpasim to core and net modules Stefano Garzarella
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=20201215144256.155342-4-sgarzare@redhat.com \
--to=sgarzare@redhat.com \
--cc=elic@nvidia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lvivier@redhat.com \
--cc=mgurtovoy@nvidia.com \
--cc=mst@redhat.com \
--cc=oren@nvidia.com \
--cc=rdunlap@infradead.org \
--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: 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).