From: Stefano Garzarella <sgarzare@redhat.com>
To: virtualization@lists.linux-foundation.org
Cc: Oren Duer <oren@nvidia.com>, Laurent Vivier <lvivier@redhat.com>,
Max Gurtovoy <mgurtovoy@nvidia.com>,
Randy Dunlap <rdunlap@infradead.org>,
Shahaf Shuler <shahafs@nvidia.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Eli Cohen <elic@nvidia.com>,
linux-kernel@vger.kernel.org,
Stefano Garzarella <sgarzare@redhat.com>,
Jason Wang <jasowang@redhat.com>
Subject: [PATCH v4 11/18] vdpa_sim: make 'config' generic and usable for any device type
Date: Tue, 15 Dec 2020 15:42:49 +0100 [thread overview]
Message-ID: <20201215144256.155342-12-sgarzare@redhat.com> (raw)
In-Reply-To: <20201215144256.155342-1-sgarzare@redhat.com>
Add new 'config_size' attribute in 'vdpasim_dev_attr' and allocates
'config' dynamically to support any device types.
Acked-by: Jason Wang <jasowang@redhat.com>
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 ccb40501cbd7..4a0a6cadb9ff 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -70,6 +70,7 @@ struct vdpasim_virtqueue {
struct vdpasim_dev_attr {
u64 supported_features;
+ size_t config_size;
int nvqs;
u32 id;
@@ -84,7 +85,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;
@@ -384,6 +386,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)
@@ -524,7 +530,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)))
@@ -596,8 +603,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,
@@ -684,6 +691,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 = {
@@ -746,6 +754,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-15 14:59 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 ` [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 ` Stefano Garzarella [this message]
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-12-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=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).