[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC 05/10] vdpa-dev: implement the realize interface
|
From: |
Longpeng(Mike) |
|
Subject: |
[RFC 05/10] vdpa-dev: implement the realize interface |
|
Date: |
Wed, 5 Jan 2022 08:58:55 +0800 |
From: Longpeng <longpeng2@huawei.com>
Implements the .realize interface.
Signed-off-by: Longpeng <longpeng2@huawei.com>
---
hw/virtio/vdpa-dev.c | 114 +++++++++++++++++++++++++++++++++++
include/hw/virtio/vdpa-dev.h | 8 +++
2 files changed, 122 insertions(+)
diff --git a/hw/virtio/vdpa-dev.c b/hw/virtio/vdpa-dev.c
index 790117fb3b..2d534d837a 100644
--- a/hw/virtio/vdpa-dev.c
+++ b/hw/virtio/vdpa-dev.c
@@ -15,9 +15,122 @@
#include "sysemu/sysemu.h"
#include "sysemu/runstate.h"
+static void
+vhost_vdpa_device_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq)
+{
+ /* Nothing to do */
+}
+
+static int vdpa_dev_get_info_by_fd(int fd, uint64_t cmd, Error **errp)
+{
+ int val;
+
+ if (ioctl(fd, cmd, &val) < 0) {
+ error_setg(errp, "vhost-vdpa-device: cmd 0x%lx failed: %s",
+ cmd, strerror(errno));
+ return -1;
+ }
+
+ return val;
+}
+
+static inline int vdpa_dev_get_queue_size(int fd, Error **errp)
+{
+ return vdpa_dev_get_info_by_fd(fd, VHOST_VDPA_GET_VRING_NUM, errp);
+}
+
+static inline int vdpa_dev_get_vqs_num(int fd, Error **errp)
+{
+ return vdpa_dev_get_info_by_fd(fd, VHOST_VDPA_GET_VQS_NUM, errp);
+}
+
+static inline int vdpa_dev_get_config_size(int fd, Error **errp)
+{
+ return vdpa_dev_get_info_by_fd(fd, VHOST_VDPA_GET_CONFIG_SIZE, errp);
+}
+
static void vhost_vdpa_device_realize(DeviceState *dev, Error **errp)
{
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ VhostVdpaDevice *s = VHOST_VDPA_DEVICE(vdev);
+ uint32_t device_id;
+ int max_queue_size;
+ int fd;
+ int i, ret;
+
+ fd = qemu_open(s->vdpa_dev, O_RDWR, errp);
+ if (fd == -1) {
+ return;
+ }
+ s->vdpa.device_fd = fd;
+
+ max_queue_size = vdpa_dev_get_queue_size(fd, errp);
+ if (*errp) {
+ goto out;
+ }
+
+ if (s->queue_size > max_queue_size) {
+ error_setg(errp, "vhost-vdpa-device: invalid queue_size: %d (max:%d)",
+ s->queue_size, max_queue_size);
+ goto out;
+ } else if (!s->queue_size) {
+ s->queue_size = max_queue_size;
+ }
+
+ ret = vdpa_dev_get_vqs_num(fd, errp);
+ if (*errp) {
+ goto out;
+ }
+
+ s->dev.nvqs = ret;
+ s->dev.vqs = g_new0(struct vhost_virtqueue, s->dev.nvqs);
+ s->dev.vq_index = 0;
+ s->dev.vq_index_end = s->dev.nvqs;
+ s->dev.backend_features = 0;
+ s->started = false;
+
+ ret = vhost_dev_init(&s->dev, &s->vdpa, VHOST_BACKEND_TYPE_VDPA, 0, NULL);
+ if (ret < 0) {
+ error_setg(errp, "vhost-vdpa-device: vhost initialization failed: %s",
+ strerror(-ret));
+ goto out;
+ }
+
+ ret = s->dev.vhost_ops->vhost_get_device_id(&s->dev, &device_id);
+ if (ret < 0) {
+ error_setg(errp, "vhost-vdpa-device: vhost get device id failed: %s",
+ strerror(-ret));
+ goto vhost_cleanup;
+ }
+
+ s->config_size = vdpa_dev_get_config_size(fd, errp);
+ if (*errp) {
+ goto vhost_cleanup;
+ }
+
+ s->config = g_malloc0(s->config_size);
+
+ ret = vhost_dev_get_config(&s->dev, s->config, s->config_size, NULL);
+ if (ret < 0) {
+ error_setg(errp, "vhost-vdpa-device: get config failed");
+ goto config_err;
+ }
+
+ virtio_init(vdev, "vhost-vdpa", device_id, s->config_size);
+
+ s->virtqs = g_new0(VirtQueue *, s->dev.nvqs);
+ for (i = 0; i < s->dev.nvqs; i++) {
+ s->virtqs[i] = virtio_add_queue(vdev, s->queue_size,
+ vhost_vdpa_device_dummy_handle_output);
+ }
+
return;
+config_err:
+ g_free(s->config);
+vhost_cleanup:
+ vhost_dev_cleanup(&s->dev);
+out:
+ close(fd);
}
static void vhost_vdpa_device_unrealize(DeviceState *dev)
@@ -51,6 +164,7 @@ static void vhost_vdpa_device_set_status(VirtIODevice *vdev,
uint8_t status)
static Property vhost_vdpa_device_properties[] = {
DEFINE_PROP_STRING("vdpa-dev", VhostVdpaDevice, vdpa_dev),
+ DEFINE_PROP_UINT16("queue-size", VhostVdpaDevice, queue_size, 0),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/include/hw/virtio/vdpa-dev.h b/include/hw/virtio/vdpa-dev.h
index 7a0e6bdcf8..49f8145d61 100644
--- a/include/hw/virtio/vdpa-dev.h
+++ b/include/hw/virtio/vdpa-dev.h
@@ -13,6 +13,14 @@ struct VhostVdpaDevice {
VirtIODevice parent_obj;
char *vdpa_dev;
int32_t bootindex;
+ struct vhost_dev dev;
+ struct vhost_vdpa vdpa;
+ VirtQueue **virtqs;
+ uint8_t *config;
+ int config_size;
+ uint32_t num_queues;
+ uint16_t queue_size;
+ bool started;
};
#endif
--
2.23.0
- [RFC 07/10] vdpa-dev: implement the get_config/set_config interface, (continued)
- [RFC 04/10] vdpa-dev: implement the instance_init/class_init interface, Longpeng(Mike), 2022/01/04
- [RFC 05/10] vdpa-dev: implement the realize interface,
Longpeng(Mike) <=
- Re: [RFC 05/10] vdpa-dev: implement the realize interface, Stefan Hajnoczi, 2022/01/05
- RE: [RFC 05/10] vdpa-dev: implement the realize interface, Longpeng (Mike, Cloud Infrastructure Service Product Dept.), 2022/01/05
- Re: [RFC 05/10] vdpa-dev: implement the realize interface, Stefan Hajnoczi, 2022/01/06
- RE: [RFC 05/10] vdpa-dev: implement the realize interface, Longpeng (Mike, Cloud Infrastructure Service Product Dept.), 2022/01/17
- Re: [RFC 05/10] vdpa-dev: implement the realize interface, Stefan Hajnoczi, 2022/01/19
Re: [RFC 00/10] add generic vDPA device support, Stefan Hajnoczi, 2022/01/05