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 06/18] vdpa_sim: add struct vdpasim_dev_attr for device attributes
Date: Tue, 15 Dec 2020 15:42:44 +0100 [thread overview]
Message-ID: <20201215144256.155342-7-sgarzare@redhat.com> (raw)
In-Reply-To: <20201215144256.155342-1-sgarzare@redhat.com>
vdpasim_dev_attr will contain device specific attributes. We starting
moving the number of virtqueues (i.e. nvqs) to vdpasim_dev_attr.
vdpasim_create() creates a new vDPA simulator following the device
attributes defined in the vdpasim_dev_attr parameter.
Co-developed-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: Max Gurtovoy <mgurtovoy@nvidia.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
drivers/vdpa/vdpa_sim/vdpa_sim.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 923f29076b1b..ae295dc57d7d 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -65,11 +65,16 @@ static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) |
(1ULL << VIRTIO_F_ACCESS_PLATFORM) |
(1ULL << VIRTIO_NET_F_MAC);
+struct vdpasim_dev_attr {
+ int nvqs;
+};
+
/* State of each vdpasim device */
struct vdpasim {
struct vdpa_device vdpa;
struct vdpasim_virtqueue *vqs;
struct work_struct work;
+ struct vdpasim_dev_attr dev_attr;
/* spinlock to synchronize virtqueue state */
spinlock_t lock;
struct virtio_net_config config;
@@ -78,7 +83,6 @@ struct vdpasim {
u32 status;
u32 generation;
u64 features;
- int nvqs;
/* spinlock to synchronize iommu table */
spinlock_t iommu_lock;
};
@@ -143,7 +147,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim)
{
int i;
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i < vdpasim->dev_attr.nvqs; i++)
vdpasim_vq_reset(&vdpasim->vqs[i]);
spin_lock(&vdpasim->iommu_lock);
@@ -344,7 +348,7 @@ static const struct dma_map_ops vdpasim_dma_ops = {
static const struct vdpa_config_ops vdpasim_config_ops;
static const struct vdpa_config_ops vdpasim_batch_config_ops;
-static struct vdpasim *vdpasim_create(void)
+static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)
{
const struct vdpa_config_ops *ops;
struct vdpasim *vdpasim;
@@ -356,11 +360,12 @@ static struct vdpasim *vdpasim_create(void)
else
ops = &vdpasim_config_ops;
- vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops, VDPASIM_VQ_NUM);
+ vdpasim = vdpa_alloc_device(struct vdpasim, vdpa, NULL, ops,
+ dev_attr->nvqs);
if (!vdpasim)
goto err_alloc;
- vdpasim->nvqs = VDPASIM_VQ_NUM;
+ vdpasim->dev_attr = *dev_attr;
INIT_WORK(&vdpasim->work, vdpasim_work);
spin_lock_init(&vdpasim->lock);
spin_lock_init(&vdpasim->iommu_lock);
@@ -371,7 +376,7 @@ 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),
+ vdpasim->vqs = kcalloc(dev_attr->nvqs, sizeof(struct vdpasim_virtqueue),
GFP_KERNEL);
if (!vdpasim->vqs)
goto err_iommu;
@@ -394,7 +399,7 @@ static struct vdpasim *vdpasim_create(void)
eth_random_addr(vdpasim->config.mac);
}
- for (i = 0; i < vdpasim->nvqs; i++)
+ for (i = 0; i < dev_attr->nvqs; i++)
vringh_set_iotlb(&vdpasim->vqs[i].vring, vdpasim->iommu);
vdpasim->vdpa.dma_dev = dev;
@@ -722,7 +727,11 @@ static const struct vdpa_config_ops vdpasim_batch_config_ops = {
static int __init vdpasim_dev_init(void)
{
- vdpasim_dev = vdpasim_create();
+ struct vdpasim_dev_attr dev_attr = {};
+
+ dev_attr.nvqs = VDPASIM_VQ_NUM;
+
+ vdpasim_dev = vdpasim_create(&dev_attr);
if (!IS_ERR(vdpasim_dev))
return 0;
--
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:44 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 ` [PATCH v4 03/18] vdpa_sim: remove hard-coded virtq count Stefano Garzarella
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 ` Stefano Garzarella [this message]
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-7-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).