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 08/18] vdpa_sim: add supported_features field in vdpasim_dev_attr
Date: Tue, 15 Dec 2020 15:42:46 +0100 [thread overview]
Message-ID: <20201215144256.155342-9-sgarzare@redhat.com> (raw)
In-Reply-To: <20201215144256.155342-1-sgarzare@redhat.com>
Introduce a new VDPASIM_FEATURES macro with the generic features
supported by the vDPA simulator, and VDPASIM_NET_FEATURES macro with
vDPA-net features.
Add 'supported_features' field in vdpasim_dev_attr, to allow devices
to specify their features.
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 | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/drivers/vdpa/vdpa_sim/vdpa_sim.c b/drivers/vdpa/vdpa_sim/vdpa_sim.c
index 3a8e57ac7762..6cf3c78b0e33 100644
--- a/drivers/vdpa/vdpa_sim/vdpa_sim.c
+++ b/drivers/vdpa/vdpa_sim/vdpa_sim.c
@@ -59,12 +59,15 @@ struct vdpasim_virtqueue {
#define VDPASIM_VQ_NUM 0x2
#define VDPASIM_NAME "vdpasim-netdev"
-static u64 vdpasim_features = (1ULL << VIRTIO_F_ANY_LAYOUT) |
- (1ULL << VIRTIO_F_VERSION_1) |
- (1ULL << VIRTIO_F_ACCESS_PLATFORM) |
- (1ULL << VIRTIO_NET_F_MAC);
+#define VDPASIM_FEATURES ((1ULL << VIRTIO_F_ANY_LAYOUT) | \
+ (1ULL << VIRTIO_F_VERSION_1) | \
+ (1ULL << VIRTIO_F_ACCESS_PLATFORM))
+
+#define VDPASIM_NET_FEATURES (VDPASIM_FEATURES | \
+ (1ULL << VIRTIO_NET_F_MAC))
struct vdpasim_dev_attr {
+ u64 supported_features;
int nvqs;
u32 id;
};
@@ -122,7 +125,7 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
{
struct vdpasim_virtqueue *vq = &vdpasim->vqs[idx];
- vringh_init_iotlb(&vq->vring, vdpasim_features,
+ vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
VDPASIM_QUEUE_MAX, false,
(struct vring_desc *)(uintptr_t)vq->desc_addr,
(struct vring_avail *)
@@ -131,7 +134,8 @@ static void vdpasim_queue_ready(struct vdpasim *vdpasim, unsigned int idx)
(uintptr_t)vq->device_addr);
}
-static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq)
+static void vdpasim_vq_reset(struct vdpasim *vdpasim,
+ struct vdpasim_virtqueue *vq)
{
vq->ready = false;
vq->desc_addr = 0;
@@ -139,8 +143,8 @@ static void vdpasim_vq_reset(struct vdpasim_virtqueue *vq)
vq->device_addr = 0;
vq->cb = NULL;
vq->private = NULL;
- vringh_init_iotlb(&vq->vring, vdpasim_features, VDPASIM_QUEUE_MAX,
- false, NULL, NULL, NULL);
+ vringh_init_iotlb(&vq->vring, vdpasim->dev_attr.supported_features,
+ VDPASIM_QUEUE_MAX, false, NULL, NULL, NULL);
}
static void vdpasim_reset(struct vdpasim *vdpasim)
@@ -148,7 +152,7 @@ static void vdpasim_reset(struct vdpasim *vdpasim)
int i;
for (i = 0; i < vdpasim->dev_attr.nvqs; i++)
- vdpasim_vq_reset(&vdpasim->vqs[i]);
+ vdpasim_vq_reset(vdpasim, &vdpasim->vqs[i]);
spin_lock(&vdpasim->iommu_lock);
vhost_iotlb_reset(vdpasim->iommu);
@@ -508,7 +512,9 @@ static u32 vdpasim_get_vq_align(struct vdpa_device *vdpa)
static u64 vdpasim_get_features(struct vdpa_device *vdpa)
{
- return vdpasim_features;
+ struct vdpasim *vdpasim = vdpa_to_sim(vdpa);
+
+ return vdpasim->dev_attr.supported_features;
}
static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features)
@@ -520,7 +526,7 @@ static int vdpasim_set_features(struct vdpa_device *vdpa, u64 features)
if (!(features & (1ULL << VIRTIO_F_ACCESS_PLATFORM)))
return -EINVAL;
- vdpasim->features = features & vdpasim_features;
+ vdpasim->features = features & vdpasim->dev_attr.supported_features;
/* We generally only know whether guest is using the legacy interface
* here, so generally that's the earliest we can set config fields.
@@ -732,6 +738,7 @@ static int __init vdpasim_dev_init(void)
struct vdpasim_dev_attr dev_attr = {};
dev_attr.id = VIRTIO_ID_NET;
+ dev_attr.supported_features = VDPASIM_NET_FEATURES;
dev_attr.nvqs = VDPASIM_VQ_NUM;
vdpasim_dev = vdpasim_create(&dev_attr);
--
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 ` [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 ` Stefano Garzarella [this message]
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-9-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).