130 lines
5.3 KiB
Diff
130 lines
5.3 KiB
Diff
From 51c8cb0fa2481be78282e7ea8f24a3f97083e2fd Mon Sep 17 00:00:00 2001
|
|
From: fangyi <eric.fangyi@huawei.com>
|
|
Date: Mon, 4 Dec 2023 15:04:25 +0800
|
|
Subject: [PATCH] vhost-vdpa: add migration log ops for VhostOps
|
|
|
|
Implement vhost_set_log_size for setting buffer size for logging.
|
|
Implement vhost_set_log_fd to specify an eventfd to signal on log write.
|
|
Implement vhost_log_sync for getting dirtymap logged by vhost backend.
|
|
|
|
Signed-off-by: libai <libai12@huawei.com>
|
|
Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
|
---
|
|
hw/virtio/vhost-vdpa.c | 37 +++++++++++++++++++++++++++++++
|
|
include/hw/virtio/vhost-backend.h | 8 +++++++
|
|
linux-headers/linux/vhost.h | 4 ++++
|
|
3 files changed, 49 insertions(+)
|
|
|
|
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
|
|
index e1c90cf6c2..7663d78b43 100644
|
|
--- a/hw/virtio/vhost-vdpa.c
|
|
+++ b/hw/virtio/vhost-vdpa.c
|
|
@@ -1146,6 +1146,30 @@ static int vhost_vdpa_set_log_base(struct vhost_dev *dev, uint64_t base,
|
|
return vhost_vdpa_call(dev, VHOST_SET_LOG_BASE, &base);
|
|
}
|
|
|
|
+static int vhost_vdpa_set_log_fd(struct vhost_dev *dev, int fd,
|
|
+ struct vhost_log *log)
|
|
+{
|
|
+ struct vhost_vdpa *v = dev->opaque;
|
|
+ if (v->shadow_vqs_enabled || !vhost_vdpa_first_dev(dev)) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ return vhost_vdpa_call(dev, VHOST_SET_LOG_FD, &fd);
|
|
+}
|
|
+
|
|
+static int vhost_vdpa_set_log_size(struct vhost_dev *dev, uint64_t size,
|
|
+ struct vhost_log *log)
|
|
+{
|
|
+ struct vhost_vdpa *v = dev->opaque;
|
|
+ uint64_t logsize = size * sizeof(*(log->log));
|
|
+
|
|
+ if (v->shadow_vqs_enabled || !vhost_vdpa_first_dev(dev)) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ return vhost_vdpa_call(dev, VHOST_SET_LOG_SIZE, &logsize);
|
|
+}
|
|
+
|
|
static int vhost_vdpa_set_vring_addr(struct vhost_dev *dev,
|
|
struct vhost_vring_addr *addr)
|
|
{
|
|
@@ -1294,11 +1318,23 @@ static unsigned int vhost_vdpa_get_used_memslots(void)
|
|
return vhost_vdpa_used_memslots;
|
|
}
|
|
|
|
+static int vhost_vdpa_log_sync(struct vhost_dev *dev)
|
|
+{
|
|
+ struct vhost_vdpa *v = dev->opaque;
|
|
+ if (v->shadow_vqs_enabled || !vhost_vdpa_first_dev(dev)) {
|
|
+ return 0;
|
|
+ }
|
|
+
|
|
+ return vhost_vdpa_call(dev, VHOST_LOG_SYNC, NULL);
|
|
+}
|
|
+
|
|
const VhostOps vdpa_ops = {
|
|
.backend_type = VHOST_BACKEND_TYPE_VDPA,
|
|
.vhost_backend_init = vhost_vdpa_init,
|
|
.vhost_backend_cleanup = vhost_vdpa_cleanup,
|
|
.vhost_set_log_base = vhost_vdpa_set_log_base,
|
|
+ .vhost_set_log_size = vhost_vdpa_set_log_size,
|
|
+ .vhost_set_log_fd = vhost_vdpa_set_log_fd,
|
|
.vhost_set_vring_addr = vhost_vdpa_set_vring_addr,
|
|
.vhost_set_vring_num = vhost_vdpa_set_vring_num,
|
|
.vhost_set_vring_base = vhost_vdpa_set_vring_base,
|
|
@@ -1326,6 +1362,7 @@ const VhostOps vdpa_ops = {
|
|
.vhost_get_device_id = vhost_vdpa_get_device_id,
|
|
.vhost_vq_get_addr = vhost_vdpa_vq_get_addr,
|
|
.vhost_force_iommu = vhost_vdpa_force_iommu,
|
|
+ .vhost_log_sync = vhost_vdpa_log_sync,
|
|
.vhost_set_config_call = vhost_vdpa_set_config_call,
|
|
.vhost_set_used_memslots = vhost_vdpa_set_used_memslots,
|
|
.vhost_get_used_memslots = vhost_vdpa_get_used_memslots,
|
|
diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h
|
|
index bd1c7dfe4f..86154dd0b2 100644
|
|
--- a/include/hw/virtio/vhost-backend.h
|
|
+++ b/include/hw/virtio/vhost-backend.h
|
|
@@ -53,6 +53,11 @@ typedef int (*vhost_scsi_get_abi_version_op)(struct vhost_dev *dev,
|
|
int *version);
|
|
typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t base,
|
|
struct vhost_log *log);
|
|
+typedef int (*vhost_set_log_size_op)(struct vhost_dev *dev, uint64_t size,
|
|
+ struct vhost_log *log);
|
|
+typedef int (*vhost_set_log_fd_op)(struct vhost_dev *dev, int fd,
|
|
+ struct vhost_log *log);
|
|
+typedef int (*vhost_log_sync_op)(struct vhost_dev *dev);
|
|
typedef int (*vhost_set_mem_table_op)(struct vhost_dev *dev,
|
|
struct vhost_memory *mem);
|
|
typedef int (*vhost_set_vring_addr_op)(struct vhost_dev *dev,
|
|
@@ -141,6 +146,9 @@ typedef struct VhostOps {
|
|
vhost_scsi_clear_endpoint_op vhost_scsi_clear_endpoint;
|
|
vhost_scsi_get_abi_version_op vhost_scsi_get_abi_version;
|
|
vhost_set_log_base_op vhost_set_log_base;
|
|
+ vhost_set_log_size_op vhost_set_log_size;
|
|
+ vhost_set_log_fd_op vhost_set_log_fd;
|
|
+ vhost_log_sync_op vhost_log_sync;
|
|
vhost_set_mem_table_op vhost_set_mem_table;
|
|
vhost_set_vring_addr_op vhost_set_vring_addr;
|
|
vhost_set_vring_endian_op vhost_set_vring_endian;
|
|
diff --git a/linux-headers/linux/vhost.h b/linux-headers/linux/vhost.h
|
|
index b6ded7f831..65c6b49788 100644
|
|
--- a/linux-headers/linux/vhost.h
|
|
+++ b/linux-headers/linux/vhost.h
|
|
@@ -43,6 +43,10 @@
|
|
* The bit is set using an atomic 32 bit operation. */
|
|
/* Set base address for logging. */
|
|
#define VHOST_SET_LOG_BASE _IOW(VHOST_VIRTIO, 0x04, __u64)
|
|
+/* Set buffer size for logging */
|
|
+#define VHOST_SET_LOG_SIZE _IOW(VHOST_VIRTIO, 0x05, __u64)
|
|
+/* Logging sync */
|
|
+#define VHOST_LOG_SYNC _IO(VHOST_VIRTIO, 0x06)
|
|
/* Specify an eventfd file descriptor to signal on log write. */
|
|
#define VHOST_SET_LOG_FD _IOW(VHOST_VIRTIO, 0x07, int)
|
|
|
|
--
|
|
2.27.0
|
|
|