[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 07/29] postcopy: Add vhost-user flag for postcopy and
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [RFC 07/29] postcopy: Add vhost-user flag for postcopy and check it |
Date: |
Wed, 28 Jun 2017 20:00:25 +0100 |
From: "Dr. David Alan Gilbert" <address@hidden>
Add a vhost feature flag for postcopy support, and
use the postcopy notifier to check it before allowing postcopy.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
contrib/libvhost-user/libvhost-user.h | 1 +
hw/virtio/vhost-user.c | 39 ++++++++++++++++++++++++++++++++++-
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/contrib/libvhost-user/libvhost-user.h
b/contrib/libvhost-user/libvhost-user.h
index 53ef222c0b..82a6bf4549 100644
--- a/contrib/libvhost-user/libvhost-user.h
+++ b/contrib/libvhost-user/libvhost-user.h
@@ -34,6 +34,7 @@ enum VhostUserProtocolFeature {
VHOST_USER_PROTOCOL_F_MQ = 0,
VHOST_USER_PROTOCOL_F_LOG_SHMFD = 1,
VHOST_USER_PROTOCOL_F_RARP = 2,
+ VHOST_USER_PROTOCOL_F_POSTCOPY = 6,
VHOST_USER_PROTOCOL_F_MAX
};
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 958ee09bcb..78eaf9b022 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -17,6 +17,8 @@
#include "sysemu/kvm.h"
#include "qemu/error-report.h"
#include "qemu/sockets.h"
+#include "migration/migration.h"
+#include "migration/postcopy-ram.h"
#include <sys/ioctl.h>
#include <sys/socket.h>
@@ -33,7 +35,7 @@ enum VhostUserProtocolFeature {
VHOST_USER_PROTOCOL_F_REPLY_ACK = 3,
VHOST_USER_PROTOCOL_F_NET_MTU = 4,
VHOST_USER_PROTOCOL_F_SLAVE_REQ = 5,
-
+ VHOST_USER_PROTOCOL_F_POSTCOPY = 6,
VHOST_USER_PROTOCOL_F_MAX
};
@@ -121,8 +123,10 @@ static VhostUserMsg m __attribute__ ((unused));
#define VHOST_USER_VERSION (0x1)
struct vhost_user {
+ struct vhost_dev *dev;
CharBackend *chr;
int slave_fd;
+ NotifierWithReturn postcopy_notifier;
};
static bool ioeventfd_enabled(void)
@@ -701,6 +705,33 @@ out:
return ret;
}
+static int vhost_user_postcopy_notifier(NotifierWithReturn *notifier,
+ void *opaque)
+{
+ struct PostcopyNotifyData *pnd = opaque;
+ struct vhost_user *u = container_of(notifier, struct vhost_user,
+ postcopy_notifier);
+ struct vhost_dev *dev = u->dev;
+
+ switch (pnd->reason) {
+ case POSTCOPY_NOTIFY_PROBE:
+ if (!virtio_has_feature(dev->protocol_features,
+ VHOST_USER_PROTOCOL_F_POSTCOPY)) {
+ /* TODO: Get the device name into this error somehow */
+ error_setg(pnd->errp,
+ "vhost-user backend not capable of postcopy");
+ return -ENOENT;
+ }
+ break;
+
+ default:
+ /* We ignore notifications we don't know */
+ break;
+ }
+
+ return 0;
+}
+
static int vhost_user_init(struct vhost_dev *dev, void *opaque)
{
uint64_t features, protocol_features;
@@ -712,6 +743,7 @@ static int vhost_user_init(struct vhost_dev *dev, void
*opaque)
u = g_new0(struct vhost_user, 1);
u->chr = opaque;
u->slave_fd = -1;
+ u->dev = dev;
dev->opaque = u;
err = vhost_user_get_features(dev, &features);
@@ -763,11 +795,15 @@ static int vhost_user_init(struct vhost_dev *dev, void
*opaque)
"VHOST_USER_PROTOCOL_F_LOG_SHMFD feature.");
}
+ u->postcopy_notifier.notify = vhost_user_postcopy_notifier;
+
err = vhost_setup_slave_channel(dev);
if (err < 0) {
return err;
}
+ postcopy_add_notifier(&u->postcopy_notifier);
+
return 0;
}
@@ -778,6 +814,7 @@ static int vhost_user_cleanup(struct vhost_dev *dev)
assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER);
u = dev->opaque;
+ postcopy_remove_notifier(&u->postcopy_notifier);
if (u->slave_fd >= 0) {
close(u->slave_fd);
u->slave_fd = -1;
--
2.13.0
- [Qemu-devel] [RFC 00/29] postcopy+vhost-user/shared ram, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 01/29] RAMBlock/migration: Add migration flags, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 02/29] migrate: Update ram_block_discard_range for shared, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 04/29] migration/ram: ramblock_recv_bitmap_test_byte_offset, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 03/29] qemu_ram_block_host_offset, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 05/29] postcopy: use UFFDIO_ZEROPAGE only when available, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 06/29] postcopy: Add notifier chain, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 07/29] postcopy: Add vhost-user flag for postcopy and check it,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [RFC 10/29] vhub: Open userfaultfd, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 09/29] vhub: Support sending fds back to qemu, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 08/29] vhost-user: Add 'VHOST_USER_POSTCOPY_ADVISE' message, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 11/29] postcopy: Allow registering of fd handler, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 12/29] vhost+postcopy: Register shared ufd with postcopy, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 13/29] vhost+postcopy: Transmit 'listen' to client, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 14/29] vhost+postcopy: Register new regions with the ufd, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 15/29] vhost+postcopy: Send address back to qemu, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 16/29] vhost+postcopy: Stash RAMBlock and offset, Dr. David Alan Gilbert (git), 2017/06/28
- [Qemu-devel] [RFC 17/29] vhost+postcopy: Send requests to source for shared pages, Dr. David Alan Gilbert (git), 2017/06/28