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 12/19] vdpa_sim: make 'config' generic and usable for any device type
Date: Thu, 3 Dec 2020 18:05:04 +0100 [thread overview]
Message-ID: <20201203170511.216407-13-sgarzare@redhat.com> (raw)
In-Reply-To: <20201203170511.216407-1-sgarzare@redhat.com>
Add new 'config_size' attribute in 'vdpasim_dev_attr' and allocates
'config' dynamically to support any device types.
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
---
drivers/vdpa/vdpa_sim/vdpa_sim.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 949f4231d08a..fe71ed7890e1 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -62,6 +62,7 @@ struct vdpasim_virtqueue {
struct vdpasim_dev_attr {
u64 supported_features;
+ size_t config_size;
int nvqs;
u32 id;
@@ -76,7 +77,8 @@ struct vdpasim {
struct vdpasim_dev_attr dev_attr;
/* spinlock to synchronize virtqueue state */
spinlock_t lock;
- struct virtio_net_config config;
+ /* virtio config according to device type */
+ void *config;
struct vhost_iotlb *iommu;
void *buffer;
u32 status;
@@ -376,6 +378,10 @@ static struct vdpasim *vdpasim_create(struct vdpasim_dev_attr *dev_attr)
goto err_iommu;
set_dma_ops(dev, &vdpasim_dma_ops);
+ vdpasim->config = kzalloc(dev_attr->config_size, GFP_KERNEL);
+ if (!vdpasim->config)
+ goto err_iommu;
+
vdpasim->vqs = kcalloc(dev_attr->nvqs, sizeof(struct vdpasim_virtqueue),
GFP_KERNEL);
if (!vdpasim->vqs)
@@ -516,7 +522,8 @@ static u64 vdpasim_get_features(struct vdpa_device *vdpa)
static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features)
{
struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
- struct virtio_net_config *config = &vdpasim->config;
+ struct virtio_net_config *config =
+ (struct virtio_net_config *)vdpasim->config;
/* DMA mapping must be done by driver */
if (!(features & (1ULL << VIRTIO_F_ACCESS_PLATFORM)))
@@ -588,8 +595,8 @@ static void vdpasim_get_config(struct vdpa_device *vdpa, unsigned int offset,
{
struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
- if (offset + len < sizeof(struct virtio_net_config))
- memcpy(buf, (u8 *)&vdpasim->config + offset, len);
+ if (offset + len < vdpasim->dev_attr.config_size)
+ memcpy(buf, vdpasim->config + offset, len);
}
static void vdpasim_set_config(struct vdpa_device *vdpa, unsigned int offset,
@@ -676,6 +683,7 @@ static void vdpasim_free(struct vdpa_device *vdpa)
if (vdpasim->iommu)
vhost_iotlb_free(vdpasim->iommu);
kfree(vdpasim->vqs);
+ kfree(vdpasim->config);
}
static const struct vdpa_config_ops vdpasim_config_ops = {
@@ -738,6 +746,7 @@ static int __init vdpasim_dev_init(void)
dev_attr.id = VIRTIO_ID_NET;
dev_attr.supported_features = VDPASIM_NET_FEATURES;
dev_attr.nvqs = VDPASIM_VQ_NUM;
+ dev_attr.config_size = sizeof(struct virtio_net_config);
dev_attr.work_fn = vdpasim_net_work;
vdpasim_dev = vdpasim_create(&dev_attr);
--
2.26.2
next prev parent reply other threads:[~2020-12-03 17:09 UTC|newest]
Thread overview: 35+ 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 ` [PATCH v3 01/19] vdpa: remove unnecessary 'default n' in Kconfig entries Stefano Garzarella
2020-12-03 17:04 ` [PATCH v3 02/19] vdpa_sim: remove unnecessary headers inclusion Stefano Garzarella
2020-12-03 17:37 ` Randy Dunlap
2020-12-04 7:57 ` Stefano Garzarella
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-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-07 4:00 ` Jason Wang
2020-12-09 10:58 ` Stefano Garzarella
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 ` [PATCH v3 07/19] vdpa_sim: add struct vdpasim_dev_attr for device attributes 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 ` [PATCH v3 09/19] vdpa_sim: add supported_features " Stefano Garzarella
2020-12-03 17:05 ` [PATCH v3 10/19] vdpa_sim: add work_fn " 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 [this message]
2020-12-07 5:22 ` [PATCH v3 12/19] vdpa_sim: make 'config' generic and usable for any device type 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-07 5:29 ` Jason Wang
2020-12-09 11:07 ` 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-07 5:30 ` Jason Wang
2020-12-03 17:05 ` [PATCH v3 15/19] vdpa_sim: set vringh notify callback Stefano Garzarella
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 ` [PATCH v3 17/19] vdpa_sim: make vdpasim->buffer size configurable 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 ` [PATCH v3 19/19] vdpa: split vdpasim to core and net modules Stefano Garzarella
2020-12-03 17:25 ` Randy Dunlap
2020-12-04 7:48 ` Stefano Garzarella
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-13-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: 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).