david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vhost-user: send log shm fd along with log_base

Browse Source 
Send the shm for the dirty pages logging if the backend supports
VHOST_USER_PROTOCOL_F_LOG_SHMFD. Wait for a reply to make sure
the old log is no longer used.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Thibaut Collet <thibaut.collet@6wind.com>
This commit is contained in:
Marc-André Lureau 2015-10-09 17:17:26 +02:00 committed by Michael S. Tsirkin
parent 15324404f6
commit 9a78a5dd27
4 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/virtio/vhost-backend.c
View File

@ -67,7 +67,8 @@ static int vhost_kernel_memslots_limit(struct vhost_dev *dev)
return limit; return limit;
} }
static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base) static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base,
struct vhost_log *log)
{ {
return vhost_kernel_call(dev, VHOST_SET_LOG_BASE, &base); return vhost_kernel_call(dev, VHOST_SET_LOG_BASE, &base);
} }

27
hw/virtio/vhost-user.c
View File

@ -367,8 +367,13 @@ static int vhost_user_call(struct vhost_dev *dev, unsigned long int request,
return 0; return 0;
} }
static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base) static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base,
struct vhost_log *log)
{ {
int fds[VHOST_MEMORY_MAX_NREGIONS];
size_t fd_num = 0;
bool shmfd = virtio_has_feature(dev->protocol_features,
VHOST_USER_PROTOCOL_F_LOG_SHMFD);
VhostUserMsg msg = { VhostUserMsg msg = {
.request = VHOST_USER_SET_LOG_BASE, .request = VHOST_USER_SET_LOG_BASE,
.flags = VHOST_USER_VERSION, .flags = VHOST_USER_VERSION,
@ -376,7 +381,25 @@ static int vhost_set_log_base(struct vhost_dev *dev, uint64_t base)
.size = sizeof(m.u64), .size = sizeof(m.u64),
}; };
vhost_user_write(dev, &msg, NULL, 0); if (shmfd && log->fd != -1) {
fds[fd_num++] = log->fd;
}
vhost_user_write(dev, &msg, fds, fd_num);
if (shmfd) {
msg.size = 0;
if (vhost_user_read(dev, &msg) < 0) {
return 0;
}
if (msg.request != VHOST_USER_SET_LOG_BASE) {
error_report("Received unexpected msg type. "
"Expected %d received %d",
VHOST_USER_SET_LOG_BASE, msg.request);
return -1;
}
}
return 0; return 0;
} }

5
hw/virtio/vhost.c
View File

@ -388,7 +388,7 @@ static inline void vhost_dev_log_resize(struct vhost_dev *dev, uint64_t size)
/* inform backend of log switching, this must be done before /* inform backend of log switching, this must be done before
releasing the current log, to ensure no logging is lost */ releasing the current log, to ensure no logging is lost */
r = dev->vhost_ops->vhost_set_log_base(dev, log_base); r = dev->vhost_ops->vhost_set_log_base(dev, log_base, log);
assert(r >= 0); assert(r >= 0);
vhost_log_put(dev, true); vhost_log_put(dev, true);
dev->log = log; dev->log = log;
@ -1205,7 +1205,8 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
vhost_dev_log_is_shared(hdev)); vhost_dev_log_is_shared(hdev));
log_base = (uintptr_t)hdev->log->log; log_base = (uintptr_t)hdev->log->log;
r = hdev->vhost_ops->vhost_set_log_base(hdev, r = hdev->vhost_ops->vhost_set_log_base(hdev,
hdev->log_size ? log_base : 0); hdev->log_size ? log_base : 0,
hdev->log);
if (r < 0) { if (r < 0) {
r = -errno; r = -errno;
goto fail_log; goto fail_log;

4
include/hw/virtio/vhost-backend.h
View File

@ -21,6 +21,7 @@ typedef enum VhostBackendType {
} VhostBackendType; } VhostBackendType;
struct vhost_dev; struct vhost_dev;
struct vhost_log;
typedef int (*vhost_call)(struct vhost_dev *dev, unsigned long int request, typedef int (*vhost_call)(struct vhost_dev *dev, unsigned long int request,
void *arg); void *arg);
@ -30,7 +31,8 @@ typedef int (*vhost_backend_get_vq_index)(struct vhost_dev *dev, int idx);
typedef int (*vhost_backend_set_vring_enable)(struct vhost_dev *dev, int enable); typedef int (*vhost_backend_set_vring_enable)(struct vhost_dev *dev, int enable);
typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev); typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev);
typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t base); typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev, uint64_t base,
struct vhost_log *log);
typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev); typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev);
typedef struct VhostOps { typedef struct VhostOps {