[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 7/7] vhost: Move log_dirty check
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PATCH v6 7/7] vhost: Move log_dirty check |
Date: |
Tue, 16 Jan 2018 18:04:08 +0000 |
From: "Dr. David Alan Gilbert" <address@hidden>
Move the log_dirty check into vhost_section.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
hw/virtio/trace-events | 1 +
hw/virtio/vhost.c | 20 +++++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 606e4fc949..742ff0f90b 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -4,6 +4,7 @@
vhost_commit(bool started, bool changed) "Started: %d Changed: %d"
vhost_region_add_section(const char *name, uint64_t gpa, uint64_t size,
uint64_t host) "%s: 0x%"PRIx64"+0x%"PRIx64" @ 0x%"PRIx64
vhost_region_add_section_abut(const char *name, uint64_t new_size) "%s:
0x%"PRIx64
+vhost_section(const char *name, int r) "%s:%d"
# hw/virtio/virtio.c
virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned
out_num) "elem %p size %zd in_num %u out_num %u"
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 0c7ae94e6d..3062ad28d5 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -27,6 +27,7 @@
#include "hw/virtio/virtio-access.h"
#include "migration/blocker.h"
#include "sysemu/dma.h"
+#include "trace.h"
/* enabled until disconnected backend stabilizes */
#define _VHOST_DEBUG 1
@@ -373,8 +374,19 @@ static int vhost_verify_ring_mappings(struct vhost_dev
*dev,
static bool vhost_section(MemoryRegionSection *section)
{
- return memory_region_is_ram(section->mr) &&
+ bool result;
+ bool log_dirty = memory_region_get_dirty_log_mask(section->mr) &
+ ~(1 << DIRTY_MEMORY_MIGRATION);
+ result = memory_region_is_ram(section->mr) &&
!memory_region_is_rom(section->mr);
+
+ /* Vhost doesn't handle any block which is doing dirty-tracking other
+ * than migration; this typically fires on VGA areas.
+ */
+ result &= !log_dirty;
+
+ trace_vhost_section(section->mr->name, result);
+ return result;
}
static void vhost_begin(MemoryListener *listener)
@@ -504,12 +516,6 @@ static void vhost_region_add_section(struct vhost_dev *dev,
trace_vhost_region_add_section(section->mr->name, mrs_gpa, mrs_size,
mrs_host);
- bool log_dirty = memory_region_get_dirty_log_mask(section->mr) &
- ~(1 << DIRTY_MEMORY_MIGRATION);
- if (log_dirty) {
- return;
- }
-
if (dev->n_tmp_sections) {
/* Since we already have at least one section, lets see if
* this extends it; since we're scanning in order, we only
--
2.14.3
- [Qemu-devel] [PATCH v6 0/7] Rework vhost memory region updates, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 1/7] vhost: Build temporary section list and deref after commit, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 2/7] vhost: Simplify ring verification checks, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 5/7] vhost: Clean out old vhost_set_memory and friends, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 3/7] vhost: Merge sections added to temporary list, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 4/7] vhost: Regenerate region list from changed sections list, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 6/7] vhost: Merge and delete unused callbacks, Dr. David Alan Gilbert (git), 2018/01/16
- [Qemu-devel] [PATCH v6 7/7] vhost: Move log_dirty check,
Dr. David Alan Gilbert (git) <=
- Re: [Qemu-devel] [PATCH v6 0/7] Rework vhost memory region updates, Michael S. Tsirkin, 2018/01/18