[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 22/33] vhost: Move log_dirty check
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-devel] [PULL 22/33] vhost: Move log_dirty check |
Date: |
Tue, 16 Jan 2018 14:27:37 +0100 |
On Tue, 16 Jan 2018 06:48:06 +0200
"Michael S. Tsirkin" <address@hidden> wrote:
> From: "Dr. David Alan Gilbert" <address@hidden>
>
> Move the log_dirty check into vhost_section.
>
> Signed-off-by: Dr. David Alan Gilbert <address@hidden>
> Reviewed-by: Michael S. Tsirkin <address@hidden>
> Signed-off-by: Michael S. Tsirkin <address@hidden>
As it change looks unsafe to me with current vhost_set_memory(),
I'd leave it out and merge only after switching new
table generation algorithm.
David agreed to take care of it on respin.
> ---
> hw/virtio/vhost.c | 20 +++++++++++++-------
> hw/virtio/trace-events | 3 +++
> 2 files changed, 16 insertions(+), 7 deletions(-)
>
> diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
> index 8a85dde..83df043 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
> @@ -567,18 +568,12 @@ static void vhost_set_memory(MemoryListener *listener,
> memory_listener);
> hwaddr start_addr = section->offset_within_address_space;
> ram_addr_t size = int128_get64(section->size);
> - bool log_dirty =
> - memory_region_get_dirty_log_mask(section->mr) & ~(1 <<
> DIRTY_MEMORY_MIGRATION);
> int s = offsetof(struct vhost_memory, regions) +
> (dev->mem->nregions + 1) * sizeof dev->mem->regions[0];
> void *ram;
>
> dev->mem = g_realloc(dev->mem, s);
>
> - if (log_dirty) {
> - add = false;
> - }
> -
> assert(size);
>
> /* Optimize no-change case. At least cirrus_vga does this a lot at this
> time. */
> @@ -611,8 +606,19 @@ static void vhost_set_memory(MemoryListener *listener,
>
> 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)
> diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
> index 775461a..4a493bc 100644
> --- a/hw/virtio/trace-events
> +++ b/hw/virtio/trace-events
> @@ -1,5 +1,8 @@
> # See docs/devel/tracing.txt for syntax documentation.
>
> +# hw/virtio/vhost.c
> +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"
> virtqueue_fill(void *vq, const void *elem, unsigned int len, unsigned int
> idx) "vq %p elem %p len %u idx %u"
- [Qemu-devel] [PULL 12/33] intel-iommu: Extend address width to 48 bits, (continued)
- [Qemu-devel] [PULL 12/33] intel-iommu: Extend address width to 48 bits, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 13/33] hw/pci-bridge: fix QEMU crash because of pcie-root-port, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 15/33] hw/acpi-build: Make next_base easy to follow, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 16/33] vhost-user-test: fix features mask, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 17/33] vhost-user-test: extract read-guest-mem test from main loop, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 18/33] vhost-user-test: setup virtqueues in all tests, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 19/33] vhost-user-test: make features mask an init_virtio_dev() argument, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 20/33] vhost-user-test: use init_virtio_dev in multiqueue test, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 21/33] vhost: Build temporary section list and deref after commit, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 22/33] vhost: Move log_dirty check, Michael S. Tsirkin, 2018/01/15
- Re: [Qemu-devel] [PULL 22/33] vhost: Move log_dirty check,
Igor Mammedov <=
- [Qemu-devel] [PULL 24/33] vhost: Merge sections added to temporary list, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 23/33] vhost: Simplify ring verification checks, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 26/33] x86_iommu: check if machine has PCI bus, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 28/33] tests: acpi: init table descriptor in test_dst_table(), Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 29/33] tests: acpi: rename test_acpi_tables()/test_dst_table() to reflect its usage, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 27/33] tests: acpi: move tested tables array allocation outside of test_acpi_dsdt_table(), Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 30/33] tests: acpi: add comments to fetch_rsdt_referenced_tables/data->tables usage, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 25/33] x86_iommu: Move machine check to x86_iommu_realize(), Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 31/33] vhost-user: factor out msg head and payload, Michael S. Tsirkin, 2018/01/15
- [Qemu-devel] [PULL 32/33] vhost-user: fix misaligned access to payload, Michael S. Tsirkin, 2018/01/15