[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH RHEV 7.2.z] vhost-user: don't merge regions with di
From: |
Victor Kaplansky |
Subject: |
[Qemu-stable] [PATCH RHEV 7.2.z] vhost-user: don't merge regions with different fds |
Date: |
Sun, 28 Feb 2016 17:53:38 +0200 |
This fixes wrong memory region merging, which causes some memory
regions especially with several NUMA fragments to associate with
incorrect file handlers.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1286492
Brew build: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=10491202
From: "Michael S. Tsirkin" <address@hidden>
vhost currently merges regions with contiguious virtual and physical
addresses. This breaks for vhost-user since that also needs fds to
match.
Add a vhost_ops entry to compare the fds for vhost-user only.
Cc: address@hidden
Cc: Victor Kaplansky <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
(cherry picked from commit ffe42cc14c770549abc7995a90cf53bca3659b7f)
---
include/hw/virtio/vhost-backend.h | 4 ++++
hw/virtio/vhost-user.c | 20 ++++++++++++++++++++
hw/virtio/vhost.c | 7 +++++++
3 files changed, 31 insertions(+)
diff --git a/include/hw/virtio/vhost-backend.h
b/include/hw/virtio/vhost-backend.h
index 45a12342..e2c5c7c3 100644
--- a/include/hw/virtio/vhost-backend.h
+++ b/include/hw/virtio/vhost-backend.h
@@ -35,6 +35,9 @@ typedef int (*vhost_set_log_base_op)(struct vhost_dev *dev,
uint64_t base,
typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev);
typedef int (*vhost_migration_done_op)(struct vhost_dev *dev,
char *mac_addr);
+typedef bool (*vhost_backend_can_merge_op)(struct vhost_dev *dev,
+ uint64_t start1, uint64_t size1,
+ uint64_t start2, uint64_t size2);
typedef struct VhostOps {
VhostBackendType backend_type;
@@ -46,6 +49,7 @@ typedef struct VhostOps {
vhost_set_log_base_op vhost_set_log_base;
vhost_requires_shm_log_op vhost_requires_shm_log;
vhost_migration_done_op vhost_migration_done;
+ vhost_backend_can_merge_op vhost_backend_can_merge;
} VhostOps;
extern const VhostOps user_ops;
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 18818d22..e6b78ca3 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -541,6 +541,25 @@ static int vhost_user_migration_done(struct vhost_dev
*dev, char* mac_addr)
return -1;
}
+static bool vhost_user_can_merge(struct vhost_dev *dev,
+ uint64_t start1, uint64_t size1,
+ uint64_t start2, uint64_t size2)
+{
+ ram_addr_t ram_addr;
+ int mfd, rfd;
+ MemoryRegion *mr;
+
+ mr = qemu_ram_addr_from_host((void *)(uintptr_t)start1, &ram_addr);
+ assert(mr);
+ mfd = qemu_get_ram_fd(ram_addr);
+
+ mr = qemu_ram_addr_from_host((void *)(uintptr_t)start2, &ram_addr);
+ assert(mr);
+ rfd = qemu_get_ram_fd(ram_addr);
+
+ return mfd == rfd;
+}
+
const VhostOps user_ops = {
.backend_type = VHOST_BACKEND_TYPE_USER,
.vhost_call = vhost_user_call,
@@ -551,4 +570,5 @@ const VhostOps user_ops = {
.vhost_set_log_base = vhost_set_log_base,
.vhost_requires_shm_log = vhost_user_requires_shm_log,
.vhost_migration_done = vhost_user_migration_done,
+ .vhost_backend_can_merge = vhost_user_can_merge,
};
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 7cfb2e0f..caf44179 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -243,6 +243,13 @@ static void vhost_dev_assign_memory(struct vhost_dev *dev,
continue;
}
+ if (dev->vhost_ops->vhost_backend_can_merge &&
+ !dev->vhost_ops->vhost_backend_can_merge(dev, uaddr, size,
+ reg->userspace_addr,
+ reg->memory_size)) {
+ continue;
+ }
+
if (merged) {
--to;
assert(to >= 0);
--
Victor
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-stable] [PATCH RHEV 7.2.z] vhost-user: don't merge regions with different fds,
Victor Kaplansky <=