migration patches for VFIO
Subsystems (2)
v2 cover migration patches for VFIO
Hi
On this v2:
- Remove the stop of the guest to calculate the size
- Rebase on latest upstream.
Please review.
[v1/RFC]
VFIO migration has several requirements:
- the size of the state is only known when the guest is stopped
- they need to send possible lots of data.
this series only address the 1st set of problems.
What they do:
- res_compatible parameter was not used anywhere, just add that information to res_postcopy.
- Remove QEMUFILE parameter from save_live_pending
- Split save_live_pending into
* save_pending_estimate(): the pending state size without trying too hard
* save_pending_exact(): the real pending state size, it is called with the guest stopped.
- Now save_pending_* don't need the threshold parameter
- HACK a way to stop the guest before moving there.
ToDo:
- autoconverge test is broken, no real clue why, but it is possible that the test is wrong.
- Make an artifact to be able to send massive amount of data in the save state stage (probably more multifd channels).
- Be able to not having to start the guest between cheking the state pending size and migration_completion().
Please review.
Thanks, Juan.
Alex Bennée (4):
tests/qtests: override "force-legacy" for gpio virtio-mmio tests hw/virtio: add started_vu status field to vhost-user-gpio hw/virtio: generalise CHR_EVENT_CLOSED handling include/hw: VM state takes precedence in virtio_device_should_start
Evgeny Ermakov (2):
target/arm: Set TCGCPUOps.restore_state_to_opc for v7m hw/display/next-fb: Fix comment typo
Gerd Hoffmann (2):
update seabios source from 1.16.0 to 1.16.1
update seabios binaries to 1.16.1
Juan Quintela (9):
multifd: Create page_size fields into both MultiFD{Recv,Send}Params
multifd: Create page_count fields into both MultiFD{Recv,Send}Params
migration: Export ram_transferred_ram()
migration: Export ram_release_page()
migration: Remove res_compatible parameter
migration: No save_live_pending() method uses the QEMUFile parameter
migration: Split save_live_pending() into state_pending_*
migration: Remove unused threshold_size parameter
migration: simplify migration_iteration_run()
Klaus Jensen (5):
hw/nvme: fix aio cancel in format
hw/nvme: fix aio cancel in flush
hw/nvme: fix aio cancel in zone reset
hw/nvme: fix aio cancel in dsm
hw/nvme: remove copy bh scheduling
Paolo Bonzini (1):
target/i386: allow MMX instructions with CR4.OSFXSR=0
Peter Xu (15):
migration: Take bitmap mutex when completing ram migration
migration: Add postcopy_preempt_active()
migration: Cleanup xbzrle zero page cache update logic
migration: Trivial cleanup save_page_header() on same block check
migration: Remove RAMState.f references in compression code
migration: Yield bitmap_mutex properly when sending/sleeping
migration: Use atomic ops properly for page accountings
migration: Teach PSS about host page
migration: Introduce pss_channel
migration: Add pss_init()
migration: Make PageSearchStatus part of RAMState
migration: Move last_sent_block into PageSearchStatus
migration: Send requested page directly in rp-return thread
migration: Remove old preempt code around state maintainance
migration: Drop rs->f
Philippe Mathieu-Daudé (5):
hw/display/qxl: Have qxl_log_command Return early if no log_cmd
handler
hw/display/qxl: Document qxl_phys2virt()
hw/display/qxl: Pass requested buffer size to qxl_phys2virt() hw/display/qxl: Avoid buffer overrun in qxl_phys2virt (CVE-2022-4144) hw/display/qxl: Assert memory slot fits in preallocated MemoryRegion
Richard Henderson (2):
replay: Fix declaration of replay_read_next_clock target/i386: Always completely initialize TranslateFault
Stefan Hajnoczi (2):
block-backend: avoid bdrv_unregister_buf() NULL pointer deref Update VERSION for v7.2.0-rc3
Stefano Garzarella (1):
vhost: enable vrings in vhost_dev_start() for vhost-user devices
Thomas Huth (2):
tests/qtest/migration-test: Fix unlink error and memory leaks target/s390x/tcg: Fix and improve the SACF instruction
Xiaojuan Yang (1):
hw/loongarch/virt: Add cfi01 pflash device
Signature · 1 line
2.38.1
PATCH v2 1/51 update seabios source from 1.16.0 to 1.16.1
From: Gerd Hoffmann <[email protected]>
git shortlog rel-1.16.0..rel-1.16.1
===================================
Gerd Hoffmann (3):
malloc: use variable for ZoneHigh size
malloc: use large ZoneHigh when there is enough memory
virtio-blk: use larger default request size
Igor Mammedov (1):
acpi: parse Alias object
Volker Rümelin (2):
pci: refactor the pci_config_*() functions
reset: force standard PCI configuration access
Xiaofei Lee (1):
virtio-blk: Fix incorrect type conversion in virtio_blk_op()
Xuan Zhuo (2):
virtio-mmio: read/write the hi 32 features for mmio
virtio: finalize features before using device
--- roms/seabios | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
roms/seabios +1 -1
@@ -1 +1 @@ -Subproject commit d239552ce7220e448ae81f41515138f7b9e3c4db +Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0a
Signature · 1 line
2.38.1
PATCH v2 2/51 update seabios binaries to 1.16.1
In reply to Juan QuintelaFrom: Gerd Hoffmann <[email protected]>
--- pc-bios/bios-256k.bin | Bin 262144 -> 262144 bytes pc-bios/bios-microvm.bin | Bin 131072 -> 131072 bytes pc-bios/bios.bin | Bin 131072 -> 131072 bytes pc-bios/vgabios-ati.bin | Bin 39936 -> 39936 bytes pc-bios/vgabios-bochs-display.bin | Bin 28672 -> 28672 bytes pc-bios/vgabios-cirrus.bin | Bin 39424 -> 39424 bytes pc-bios/vgabios-qxl.bin | Bin 39424 -> 39936 bytes pc-bios/vgabios-ramfb.bin | Bin 28672 -> 29184 bytes pc-bios/vgabios-stdvga.bin | Bin 39424 -> 39936 bytes pc-bios/vgabios-virtio.bin | Bin 39424 -> 39936 bytes pc-bios/vgabios-vmware.bin | Bin 39424 -> 39936 bytes pc-bios/vgabios.bin | Bin 38912 -> 39424 bytes 12 files changed, 0 insertions(+), 0 deletions(-)
pc-bios/bios-256k.bin binary +0 -0
pc-bios/bios-microvm.bin binary +0 -0
pc-bios/bios.bin binary +0 -0
pc-bios/vgabios-ati.bin binary +0 -0
pc-bios/vgabios-bochs-display.bin binary +0 -0
pc-bios/vgabios-cirrus.bin binary +0 -0
pc-bios/vgabios-qxl.bin binary +0 -0
pc-bios/vgabios-ramfb.bin binary +0 -0
pc-bios/vgabios-stdvga.bin binary +0 -0
pc-bios/vgabios-virtio.bin binary +0 -0
pc-bios/vgabios-vmware.bin binary +0 -0
pc-bios/vgabios.bin binary +0 -0
Signature · 1 line
2.38.1
PATCH v2 3/51 replay: Fix declaration of replay_read_next_clock
In reply to Juan QuintelaFrom: Richard Henderson <[email protected]>
Fixes the build with gcc 13:
replay/replay-time.c:34:6: error: conflicting types for \
'replay_read_next_clock' due to enum/integer mismatch; \
have 'void(ReplayClockKind)' [-Werror=enum-int-mismatch]
34 | void replay_read_next_clock(ReplayClockKind kind)
| ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../qemu/replay/replay-time.c:14:
replay/replay-internal.h:139:6: note: previous declaration of \
'replay_read_next_clock' with type 'void(unsigned int)'
139 | void replay_read_next_clock(unsigned int kind);
| ^~~~~~~~~~~~~~~~~~~~~~Message-Id: <[email protected]>
--- replay/replay-internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
replay/replay-internal.h +1 -1
@@ -136,7 +136,7 @@ bool replay_next_event_is(int event);/*! Reads next clock value from the file. If clock kind read from the file is different from the parameter, the value is not used. */ -void replay_read_next_clock (unsigned int kind); +void replay_read_next_clock (ReplayClockKind kind);/* Asynchronous events queue */
Signature · 1 line
2.38.1
PATCH v2 4/51 hw/display/qxl: Have qxl_log_command Return early if no log_cmd handler
In reply to Juan QuintelaFrom: Philippe Mathieu-Daudé <[email protected]>
Only 3 command types are logged: no need to call qxl_phys2virt() for the other types. Using different cases will help to pass different structure sizes to qxl_phys2virt() in a pair of commits.
Message-Id: <[email protected]>
--- hw/display/qxl-logger.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
hw/display/qxl-logger.c +11 -0
@@ -247,6 +247,16 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext)qxl_name (qxl_type, ext->cmd.type), compat ? "(compat)" : ""); +switch (ext->cmd.type) { +case QXL_CMD_DRAW : +break ; +case QXL_CMD_SURFACE : +break ; +case QXL_CMD_CURSOR : +break ; +default : + goto out; + } data =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id);if (!data) {return 1 ;
@@ -269,6 +279,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext)qxl_log_cmd_cursor (qxl, data, ext->group_id);break ; } +out:fprintf (stderr,"\n" );return 0 ; }
Signature · 1 line
2.38.1
PATCH v2 5/51 hw/display/qxl: Document qxl_phys2virt()
In reply to Juan QuintelaFrom: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
--- hw/display/qxl.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
hw/display/qxl.h +19 -0
@@ -147,6 +147,25 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL)#define QXL_DEFAULT_REVISION (QXL_REVISION_STABLE_V12 + 1)/* qxl.c */ +/** +* qxl_phys2virt: Get a pointer within a PCI VRAM memory region. +* +* @qxl: QXL device +* @phys: physical offset of buffer within the VRAM +* @group_id: memory slot group +* +* Returns a host pointer to a buffer placed at offset @phys within the +* active slot @group_id of the PCI VGA RAM memory region associated with +* the @qxl device. If the slot is inactive, or the offset is out +* of the memory region, returns NULL. +* +* Use with care; by the time this function returns, the returned pointer is +* not protected by RCU anymore. If the caller is not within an RCU critical +* section and does not hold the iothread lock, it must have other means of +* protecting the pointer, such as a reference to the region that includes +* the incoming ram_addr_t. +* +*/ void *qxl_phys2virt (PCIQXLDevice *qxl,QXLPHYSICAL phys,int group_id); void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) G_GNUC_PRINTF(2, 3);
Signature · 1 line
2.38.1
PATCH v2 6/51 hw/display/qxl: Pass requested buffer size to qxl_phys2virt()
In reply to Juan QuintelaFrom: Philippe Mathieu-Daudé <[email protected]>
Currently qxl_phys2virt() doesn't check for buffer overrun. In order to do so in the next commit, pass the buffer size as argument.
For QXLCursor in qxl_render_cursor() -> qxl_cursor() we verify the size of the chunked data ahead, checking we can access 'sizeof(QXLCursor) + chunk->data_size' bytes. Since in the SPICE_CURSOR_TYPE_MONO case the cursor is assumed to fit in one chunk, no change are required. In SPICE_CURSOR_TYPE_ALPHA the ahead read is handled in qxl_unpack_chunks().
Message-Id: <[email protected]>
--- hw/display/qxl.h | 4 +++- hw/display/qxl-logger.c | 11 ++++++++--- hw/display/qxl-render.c | 20 ++++++++++++++++---- hw/display/qxl.c | 14 +++++++++----- 4 files changed, 36 insertions(+), 13 deletions(-)
hw/display/qxl.h +3 -1
@@ -153,6 +153,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL)* @qxl: QXL device * @phys: physical offset of buffer within the VRAM * @group_id: memory slot group +* @size: size of the buffer * * Returns a host pointer to a buffer placed at offset @phys within the * active slot @group_id of the PCI VGA RAM memory region associated with
@@ -166,7 +167,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL)* the incoming ram_addr_t. * */ -void *qxl_phys2virt (PCIQXLDevice *qxl,QXLPHYSICAL phys,int group_id); +void *qxl_phys2virt (PCIQXLDevice *qxl,QXLPHYSICAL phys,int group_id, +size_t size); void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) G_GNUC_PRINTF(2, 3);
hw/display/qxl-logger.c +8 -3
@@ -106,7 +106,7 @@ static int qxl_log_image(PCIQXLDevice *qxl, QXLPHYSICAL addr, int group_id)QXLImage *image;QXLImageDescriptor *desc; - image =qxl_phys2virt (qxl, addr, group_id); + image =qxl_phys2virt (qxl, addr, group_id,sizeof (QXLImage));if (!image) {return 1 ; }
@@ -214,7 +214,8 @@ int qxl_log_cmd_cursor(PCIQXLDevice *qxl, QXLCursorCmd *cmd, int group_id) cmd->u.set.position.y, cmd->u.set.visible ?"yes" :"no" , cmd->u.set.shape); - cursor =qxl_phys2virt (qxl, cmd->u.set.shape, group_id); + cursor =qxl_phys2virt (qxl, cmd->u.set.shape, group_id, +sizeof (QXLCursor));if (!cursor) {return 1 ; }
@@ -236,6 +237,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext) {bool compat = ext->flags &QXL_COMMAND_FLAG_COMPAT ;void *data; +size_t datasz;int ret;if (!qxl->cmdlog) {
@@ -249,15 +251,18 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext)switch (ext->cmd.type) {case QXL_CMD_DRAW : + datasz = compat ?sizeof (QXLCompatDrawable) :sizeof (QXLDrawable);break ;case QXL_CMD_SURFACE : + datasz =sizeof (QXLSurfaceCmd);break ;case QXL_CMD_CURSOR : + datasz =sizeof (QXLCursorCmd);break ;default : goto out; } - data =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id); + data =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id, datasz);if (!data) {return 1 ; }
hw/display/qxl-render.c +16 -4
@@ -107,7 +107,9 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) qxl->guest_primary.resized =0 ; qxl->guest_primary.data =qxl_phys2virt (qxl, qxl->guest_primary.surface.mem, -MEMSLOT_GROUP_GUEST ); +MEMSLOT_GROUP_GUEST , + qxl->guest_primary.abs_stride + * height);if (!qxl->guest_primary.data) { goto end; }
@@ -228,7 +230,8 @@ static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl,if (offset == size) {return ; } - chunk =qxl_phys2virt (qxl, chunk->next_chunk, group_id); + chunk =qxl_phys2virt (qxl, chunk->next_chunk, group_id, +sizeof (QXLDataChunk) + chunk->data_size);if (!chunk) {return ; }
@@ -295,7 +298,8 @@ fail:/* called from spice server thread context only */ int qxl_render_cursor (PCIQXLDevice *qxl,QXLCommandExt *ext) { -QXLCursorCmd *cmd =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id); +QXLCursorCmd *cmd =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id, +sizeof (QXLCursorCmd));QXLCursor *cursor;QEMUCursor *c;
@@ -314,7 +318,15 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext) }switch (cmd->type) {case QXL_CURSOR_SET : - cursor =qxl_phys2virt (qxl, cmd->u.set.shape, ext->group_id); +/* First read the QXLCursor to get QXLDataChunk::data_size ... */ + cursor =qxl_phys2virt (qxl, cmd->u.set.shape, ext->group_id, +sizeof (QXLCursor)); +if (!cursor) { +return 1 ; + } +/* Then read including the chunked data following QXLCursor. */ + cursor =qxl_phys2virt (qxl, cmd->u.set.shape, ext->group_id, +sizeof (QXLCursor) + cursor->chunk.data_size);if (!cursor) {return 1 ; }
hw/display/qxl.c +9 -5
@@ -274,7 +274,8 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay) QXL_IO_MONITORS_CONFIG_ASYNC)); } - cfg =qxl_phys2virt (qxl, qxl->guest_monitors_config,MEMSLOT_GROUP_GUEST ); + cfg =qxl_phys2virt (qxl, qxl->guest_monitors_config,MEMSLOT_GROUP_GUEST , +sizeof (QXLMonitorsConfig));if (cfg !=NULL && cfg->count ==1 ) { qxl->guest_primary.resized =1 ; qxl->guest_head0_width = cfg->heads[0 ].width;
@@ -459,7 +460,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)switch (le32_to_cpu (ext->cmd.type)) {case QXL_CMD_SURFACE : { -QXLSurfaceCmd *cmd =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id); +QXLSurfaceCmd *cmd =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id, +sizeof (QXLSurfaceCmd));if (!cmd) {return 1 ;
@@ -494,7 +496,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) }case QXL_CMD_CURSOR : { -QXLCursorCmd *cmd =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id); +QXLCursorCmd *cmd =qxl_phys2virt (qxl, ext->cmd.data, ext->group_id, +sizeof (QXLCursorCmd));if (!cmd) {return 1 ;
@@ -1456,7 +1459,8 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, }/* can be also called from spice server thread context */ -void *qxl_phys2virt (PCIQXLDevice *qxl,QXLPHYSICAL pqxl,int group_id) +void *qxl_phys2virt (PCIQXLDevice *qxl,QXLPHYSICAL pqxl,int group_id, +size_t size) {uint64_t offset;uint32_t slot;
@@ -1964,7 +1968,7 @@ static void qxl_dirty_surfaces(PCIQXLDevice *qxl) } cmd =qxl_phys2virt (qxl, qxl->guest_surfaces.cmds[i], -MEMSLOT_GROUP_GUEST ); +MEMSLOT_GROUP_GUEST ,sizeof (QXLSurfaceCmd));assert (cmd);assert (cmd->type ==QXL_SURFACE_CMD_CREATE ); qxl_dirty_one_surface(qxl, cmd->u.surface_create.data,
Signature · 1 line
2.38.1
PATCH v2 7/51 hw/display/qxl: Avoid buffer overrun in qxl_phys2virt (CVE-2022-4144)
In reply to Juan QuintelaFrom: Philippe Mathieu-Daudé <[email protected]>
Have qxl_get_check_slot_offset() return false if the requested buffer size does not fit within the slot memory region.
Similarly qxl_phys2virt() now returns NULL in such case, and qxl_dirty_one_surface() aborts.
This avoids buffer overrun in the host pointer returned by memory_region_get_ram_ptr().
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1336
Message-Id: <[email protected]>
--- hw/display/qxl.h | 2 +- hw/display/qxl.c | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-)
hw/display/qxl.h +1 -1
@@ -157,7 +157,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL)* * Returns a host pointer to a buffer placed at offset @phys within the * active slot @group_id of the PCI VGA RAM memory region associated with -* the @qxl device. If the slot is inactive, or the offset is out +* the @qxl device. If the slot is inactive, or the offset + size are out * of the memory region, returns NULL. * * Use with care; by the time this function returns, the returned pointer is
hw/display/qxl.c +23 -4
@@ -1424,11 +1424,13 @@ static void qxl_reset_surfaces(PCIQXLDevice *d)/* can be also called from spice server thread context */ static bool qxl_get_check_slot_offset (PCIQXLDevice *qxl,QXLPHYSICAL pqxl, -uint32_t *s,uint64_t *o) +uint32_t *s,uint64_t *o, +size_t size_requested) {uint64_t phys =le64_to_cpu (pqxl);uint32_t slot = (phys >> (64 -8 )) &0xff ;uint64_t offset = phys &0xffffffffffff ; +uint64_t size_available;if (slot >=NUM_MEMSLOTS ) { qxl_set_guest_bug(qxl, "slot too large %d >= %d", slot,
@@ -1452,6 +1454,23 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, slot, offset, qxl->guest_slots[slot].size);return false; } + size_available =memory_region_size (qxl->guest_slots[slot].mr); +if (qxl->guest_slots[slot].offset + offset >= size_available) { +qxl_set_guest_bug (qxl, +"slot %d offset %" PRIu64" > region size %" PRIu64"\n" , + slot, qxl->guest_slots[slot].offset + offset, + size_available); +return false; + } + size_available -= qxl->guest_slots[slot].offset + offset; +if (size_requested > size_available) { +qxl_set_guest_bug (qxl, +"slot %d offset %" PRIu64" size %zu: " +"overrun by %" PRIu64" bytes\n" , + slot, offset, size_requested, + size_requested - size_available); +return false; + } *s = slot; *o = offset;
@@ -1471,7 +1490,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id, offset =le64_to_cpu (pqxl) &0xffffffffffff ;return (void *)(intptr_t )offset;case MEMSLOT_GROUP_GUEST : -if (!qxl_get_check_slot_offset (qxl, pqxl, &slot, &offset)) { +if (!qxl_get_check_slot_offset (qxl, pqxl, &slot, &offset, size)) {return NULL ; } ptr =memory_region_get_ram_ptr (qxl->guest_slots[slot].mr);
@@ -1937,9 +1956,9 @@ static void qxl_dirty_one_surface(PCIQXLDevice *qxl, QXLPHYSICAL pqxl,uint32_t slot;bool rc; - rc =qxl_get_check_slot_offset (qxl, pqxl, &slot, &offset); -assert (rc == true); size = (uint64_t )height *abs (stride); + rc =qxl_get_check_slot_offset (qxl, pqxl, &slot, &offset, size); +assert (rc == true);trace_qxl_surfaces_dirty (qxl->id, offset, size); qxl_set_dirty(qxl->guest_slots[slot].mr, qxl->guest_slots[slot].offset + offset,
Signature · 1 line
2.38.1
PATCH v2 8/51 hw/display/qxl: Assert memory slot fits in preallocated MemoryRegion
In reply to Juan QuintelaFrom: Philippe Mathieu-Daudé <[email protected]>
Message-Id: <[email protected]>
--- hw/display/qxl.c | 1 + 1 file changed, 1 insertion(+)
hw/display/qxl.c +1 -0
@@ -1384,6 +1384,7 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,qxl_set_guest_bug (d,"%s: pci_region = %d" , __func__, pci_region);return 1 ; } +assert (guest_end - pci_start <=memory_region_size (mr)); virt_start = (intptr_t )memory_region_get_ram_ptr (mr); memslot.slot_id = slot_id;
Signature · 1 line
2.38.1
PATCH v2 9/51 block-backend: avoid bdrv_unregister_buf() NULL pointer deref
In reply to Juan QuintelaFrom: Stefan Hajnoczi <[email protected]>
bdrv_*() APIs expect a valid BlockDriverState. Calling them with bs=NULL leads to undefined behavior.
Jonathan Cameron reported this following NULL pointer dereference when a VM with a virtio-blk device and a memory-backend-file object is terminated:
1. qemu_cleanup() closes all drives, setting blk->root to NULL
2. qemu_cleanup() calls user_creatable_cleanup(), which results in a RAM block notifier callback because the memory-backend-file is destroyed.
3. blk_unregister_buf() is called by virtio-blk's BlockRamRegistrar notifier callback and undefined behavior occurs.
Message-Id: <[email protected]>
--- block/block-backend.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)
block/block-backend.c +13 -2
@@ -2576,14 +2576,25 @@ static void blk_root_drained_end(BdrvChild *child, int *drained_end_counter)bool blk_register_buf (BlockBackend *blk,void *host,size_t size,Error **errp) { +BlockDriverState *bs =blk_bs (blk); +GLOBAL_STATE_CODE (); -return bdrv_register_buf (blk_bs (blk), host, size, errp); + +if (bs) { +return bdrv_register_buf (bs, host, size, errp); + } +return true; }void blk_unregister_buf (BlockBackend *blk,void *host,size_t size) { +BlockDriverState *bs =blk_bs (blk); +GLOBAL_STATE_CODE (); -bdrv_unregister_buf (blk_bs (blk), host, size); + +if (bs) { +bdrv_unregister_buf (bs, host, size); + } } int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
Signature · 1 line
2.38.1
PATCH v2 10/51 target/arm: Set TCGCPUOps.restore_state_to_opc for v7m
In reply to Juan QuintelaFrom: Evgeny Ermakov <[email protected]>
This setting got missed, breaking v7m.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1347
Message-Id: <[email protected]>
--- target/arm/internals.h | 4 ++++ target/arm/cpu.c | 6 +++--- target/arm/cpu_tcg.c | 1 + 3 files changed, 8 insertions(+), 3 deletions(-)
target/arm/internals.h +4 -0
@@ -185,6 +185,10 @@ static inline int r14_bank_number(int mode)void arm_cpu_register_gdb_regs_for_features (ARMCPU *cpu);void arm_translate_init (void ); +void arm_restore_state_to_opc (CPUState *cs, +const TranslationBlock *tb, +const uint64_t *data); +#ifdef CONFIG_TCG void arm_cpu_synchronize_from_tb (CPUState *cs,const TranslationBlock *tb);#endif /* CONFIG_TCG */
target/arm/cpu.c +3 -3
@@ -91,9 +91,9 @@ void arm_cpu_synchronize_from_tb(CPUState *cs, } } -static void arm_restore_state_to_opc (CPUState *cs, -const TranslationBlock *tb, -const uint64_t *data) +void arm_restore_state_to_opc (CPUState *cs, +const TranslationBlock *tb, +const uint64_t *data) {CPUARMState *env = cs->env_ptr;
target/arm/cpu_tcg.c +1 -0
@@ -1035,6 +1035,7 @@ static const struct TCGCPUOps arm_v7m_tcg_ops = { .initialize = arm_translate_init, .synchronize_from_tb = arm_cpu_synchronize_from_tb, .debug_excp_handler = arm_debug_excp_handler, + .restore_state_to_opc = arm_restore_state_to_opc, #ifdef CONFIG_USER_ONLY .record_sigsegv = arm_cpu_record_sigsegv,
Signature · 1 line
2.38.1
PATCH v2 11/51 Update VERSION for v7.2.0-rc3
In reply to Juan QuintelaFrom: Stefan Hajnoczi <[email protected]>
--- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
VERSION +1 -1
@@ -1 +1 @@ -7.1.92 +7.1.93
Signature · 1 line
2.38.1
PATCH v2 12/51 tests/qtests: override "force-legacy" for gpio virtio-mmio tests
In reply to Juan QuintelaFrom: Alex Bennée <[email protected]>
The GPIO device is a VIRTIO_F_VERSION_1 devices but running with a legacy MMIO interface we miss out that feature bit causing confusion. For the GPIO test force the mmio bus to support non-legacy so we can properly test it.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1333
Message-Id: <[email protected]>
--- tests/qtest/libqos/virtio-gpio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tests/qtest/libqos/virtio-gpio.c +2 -1
@@ -154,7 +154,8 @@ static void virtio_gpio_register_nodes(void)QOSGraphEdgeOptions edge_opts = { };/* vhost-user-gpio-device */ - edge_opts.extra_device_opts ="id=gpio0,chardev=chr-vhost-user-test" ; + edge_opts.extra_device_opts ="id=gpio0,chardev=chr-vhost-user-test " +"-global virtio-mmio.force-legacy=false" ;qos_node_create_driver ("vhost-user-gpio-device" , virtio_gpio_device_create);qos_node_consumes ("vhost-user-gpio-device" ,"virtio-bus" , &edge_opts);
Signature · 1 line
2.38.1
PATCH v2 13/51 vhost: enable vrings in vhost_dev_start() for vhost-user devices
In reply to Juan QuintelaFrom: Stefano Garzarella <[email protected]>
Commit 02b61f38d3 ("hw/virtio: incorporate backend features in features") properly negotiates VHOST_USER_F_PROTOCOL_FEATURES with the vhost-user backend, but we forgot to enable vrings as specified in docs/interop/vhost-user.rst:
If ``VHOST_USER_F_PROTOCOL_FEATURES`` has not been negotiated, the ring starts directly in the enabled state.
If ``VHOST_USER_F_PROTOCOL_FEATURES`` has been negotiated, the ring is initialized in a disabled state and is enabled by ``VHOST_USER_SET_VRING_ENABLE`` with parameter 1.
Some vhost-user front-ends already did this by calling vhost_ops.vhost_set_vring_enable() directly:
- backends/cryptodev-vhost.c
- hw/net/virtio-net.c
- hw/virtio/vhost-user-gpio.c
But most didn't do that, so we would leave the vrings disabled and some backends would not work. We observed this issue with the rust version of virtiofsd [1], which uses the event loop [2] provided by the vhost-user-backend crate where requests are not processed if vring is not enabled.
Let's fix this issue by enabling the vrings in vhost_dev_start() for vhost-user front-ends that don't already do this directly. Same thing also in vhost_dev_stop() where we disable vrings.
[1] https://gitlab.com/virtio-fs/virtiofsd
[2] https://github.com/rust-vmm/vhost/blob/240fc2966/crates/vhost-user-backend/src/event_loop.rs#L217
Message-Id: <[email protected]>
Message-Id: <[email protected]>
--- include/hw/virtio/vhost.h | 6 +++-- backends/cryptodev-vhost.c | 4 ++-- backends/vhost-user.c | 4 ++-- hw/block/vhost-user-blk.c | 4 ++-- hw/net/vhost_net.c | 8 +++---- hw/scsi/vhost-scsi-common.c | 4 ++-- hw/virtio/vhost-user-fs.c | 4 ++-- hw/virtio/vhost-user-gpio.c | 4 ++-- hw/virtio/vhost-user-i2c.c | 4 ++-- hw/virtio/vhost-user-rng.c | 4 ++-- hw/virtio/vhost-vsock-common.c | 4 ++-- hw/virtio/vhost.c | 44 ++++++++++++++++++++++++++++++---- hw/virtio/trace-events | 4 ++-- 13 files changed, 67 insertions(+), 31 deletions(-)
include/hw/virtio/vhost.h +4 -2
@@ -184,24 +184,26 @@ static inline bool vhost_dev_is_started(struct vhost_dev *hdev)* vhost_dev_start() - start the vhost device * @hdev: common vhost_dev structure * @vdev: the VirtIODevice structure +* @vrings: true to have vrings enabled in this call * * Starts the vhost device. From this point VirtIO feature negotiation * can start and the device can start processing VirtIO transactions. * * Return: 0 on success, < 0 on error. */ -int vhost_dev_start (struct vhost_dev *hdev,VirtIODevice *vdev); +int vhost_dev_start (struct vhost_dev *hdev,VirtIODevice *vdev,bool vrings);/** * vhost_dev_stop() - stop the vhost device * @hdev: common vhost_dev structure * @vdev: the VirtIODevice structure +* @vrings: true to have vrings disabled in this call * * Stop the vhost device. After the device is stopped the notifiers * can be disabled (@vhost_dev_disable_notifiers) and the device can * be torn down (@vhost_dev_cleanup). */ -void vhost_dev_stop (struct vhost_dev *hdev,VirtIODevice *vdev); +void vhost_dev_stop (struct vhost_dev *hdev,VirtIODevice *vdev,bool vrings);/** * DOC: vhost device configuration handling
backends/cryptodev-vhost.c +2 -2
@@ -94,7 +94,7 @@ cryptodev_vhost_start_one(CryptoDevBackendVhost *crypto, goto fail_notifiers; } - r =vhost_dev_start (&crypto->dev, dev); + r =vhost_dev_start (&crypto->dev, dev, false);if (r <0 ) { goto fail_start; }
@@ -111,7 +111,7 @@ static voidcryptodev_vhost_stop_one (CryptoDevBackendVhost *crypto, VirtIODevice *dev) { -vhost_dev_stop (&crypto->dev, dev); +vhost_dev_stop (&crypto->dev, dev, false);vhost_dev_disable_notifiers (&crypto->dev, dev); }
backends/vhost-user.c +2 -2
@@ -85,7 +85,7 @@ vhost_user_backend_start(VhostUserBackend *b) } b->dev.acked_features = b->vdev->guest_features; - ret =vhost_dev_start (&b->dev, b->vdev); + ret =vhost_dev_start (&b->dev, b->vdev, true);if (ret <0 ) {error_report ("Error start vhost dev" ); goto err_guest_notifiers;
@@ -120,7 +120,7 @@ vhost_user_backend_stop(VhostUserBackend *b)return ; } -vhost_dev_stop (&b->dev, b->vdev); +vhost_dev_stop (&b->dev, b->vdev, true);if (k->set_guest_notifiers) { ret = k->set_guest_notifiers(qbus->parent,
hw/block/vhost-user-blk.c +2 -2
@@ -178,7 +178,7 @@ static int vhost_user_blk_start(VirtIODevice *vdev, Error **errp) } s->dev.vq_index_end = s->dev.nvqs; - ret =vhost_dev_start (&s->dev, vdev); + ret =vhost_dev_start (&s->dev, vdev, true);if (ret <0 ) {error_setg_errno (errp, -ret,"Error starting vhost" ); goto err_guest_notifiers;
@@ -213,7 +213,7 @@ static void vhost_user_blk_stop(VirtIODevice *vdev)return ; } -vhost_dev_stop (&s->dev, vdev); +vhost_dev_stop (&s->dev, vdev, true); ret = k->set_guest_notifiers (qbus->parent, s->dev.nvqs, false);if (ret <0 ) {
hw/net/vhost_net.c +4 -4
@@ -259,7 +259,7 @@ static int vhost_net_start_one(struct vhost_net *net, goto fail_notifiers; } - r =vhost_dev_start (&net->dev, dev); + r =vhost_dev_start (&net->dev, dev, false);if (r <0 ) { goto fail_start; }
@@ -308,7 +308,7 @@ fail:if (net->nc->info->poll) { net->nc->info->poll (net->nc, true); } -vhost_dev_stop (&net->dev, dev); +vhost_dev_stop (&net->dev, dev, false); fail_start:vhost_dev_disable_notifiers (&net->dev, dev); fail_notifiers:
@@ -329,7 +329,7 @@ static void vhost_net_stop_one(struct vhost_net *net,if (net->nc->info->poll) { net->nc->info->poll (net->nc, true); } -vhost_dev_stop (&net->dev, dev); +vhost_dev_stop (&net->dev, dev, false);if (net->nc->info->stop) { net->nc->info->stop (net->nc); }
@@ -606,7 +606,7 @@ err_start:assert (r >=0 ); } -vhost_dev_stop (&net->dev, vdev); +vhost_dev_stop (&net->dev, vdev, false);return r; }
hw/scsi/vhost-scsi-common.c +2 -2
@@ -68,7 +68,7 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc) goto err_guest_notifiers; } - ret =vhost_dev_start (&vsc->dev, vdev); + ret =vhost_dev_start (&vsc->dev, vdev, true);if (ret <0 ) {error_report ("Error start vhost dev" ); goto err_guest_notifiers;
@@ -101,7 +101,7 @@ void vhost_scsi_common_stop(VHostSCSICommon *vsc)VirtioBusClass *k =VIRTIO_BUS_GET_CLASS (qbus);int ret =0 ; -vhost_dev_stop (&vsc->dev, vdev); +vhost_dev_stop (&vsc->dev, vdev, true);if (k->set_guest_notifiers) { ret = k->set_guest_notifiers (qbus->parent, vsc->dev.nvqs, false);
hw/virtio/vhost-user-fs.c +2 -2
@@ -76,7 +76,7 @@ static void vuf_start(VirtIODevice *vdev) } fs->vhost_dev.acked_features = vdev->guest_features; - ret =vhost_dev_start (&fs->vhost_dev, vdev); + ret =vhost_dev_start (&fs->vhost_dev, vdev, true);if (ret <0 ) {error_report ("Error starting vhost: %d" , -ret); goto err_guest_notifiers;
@@ -110,7 +110,7 @@ static void vuf_stop(VirtIODevice *vdev)return ; } -vhost_dev_stop (&fs->vhost_dev, vdev); +vhost_dev_stop (&fs->vhost_dev, vdev, true); ret = k->set_guest_notifiers (qbus->parent, fs->vhost_dev.nvqs, false);if (ret <0 ) {
hw/virtio/vhost-user-gpio.c +2 -2
@@ -81,7 +81,7 @@ static int vu_gpio_start(VirtIODevice *vdev)*/ vhost_ack_features (&gpio->vhost_dev, feature_bits, vdev->guest_features); - ret =vhost_dev_start (&gpio->vhost_dev, vdev); + ret =vhost_dev_start (&gpio->vhost_dev, vdev, false);if (ret <0 ) {error_report ("Error starting vhost-user-gpio: %d" , ret); goto err_guest_notifiers;
@@ -139,7 +139,7 @@ static void vu_gpio_stop(VirtIODevice *vdev)return ; } -vhost_dev_stop (vhost_dev, vdev); +vhost_dev_stop (vhost_dev, vdev, false); ret = k->set_guest_notifiers (qbus->parent, vhost_dev->nvqs, false);if (ret <0 ) {
hw/virtio/vhost-user-i2c.c +2 -2
@@ -46,7 +46,7 @@ static void vu_i2c_start(VirtIODevice *vdev) i2c->vhost_dev.acked_features = vdev->guest_features; - ret =vhost_dev_start (&i2c->vhost_dev, vdev); + ret =vhost_dev_start (&i2c->vhost_dev, vdev, true);if (ret <0 ) {error_report ("Error starting vhost-user-i2c: %d" , -ret); goto err_guest_notifiers;
@@ -80,7 +80,7 @@ static void vu_i2c_stop(VirtIODevice *vdev)return ; } -vhost_dev_stop (&i2c->vhost_dev, vdev); +vhost_dev_stop (&i2c->vhost_dev, vdev, true); ret = k->set_guest_notifiers (qbus->parent, i2c->vhost_dev.nvqs, false);if (ret <0 ) {
hw/virtio/vhost-user-rng.c +2 -2
@@ -47,7 +47,7 @@ static void vu_rng_start(VirtIODevice *vdev) } rng->vhost_dev.acked_features = vdev->guest_features; - ret =vhost_dev_start (&rng->vhost_dev, vdev); + ret =vhost_dev_start (&rng->vhost_dev, vdev, true);if (ret <0 ) {error_report ("Error starting vhost-user-rng: %d" , -ret); goto err_guest_notifiers;
@@ -81,7 +81,7 @@ static void vu_rng_stop(VirtIODevice *vdev)return ; } -vhost_dev_stop (&rng->vhost_dev, vdev); +vhost_dev_stop (&rng->vhost_dev, vdev, true); ret = k->set_guest_notifiers (qbus->parent, rng->vhost_dev.nvqs, false);if (ret <0 ) {
hw/virtio/vhost-vsock-common.c +2 -2
@@ -70,7 +70,7 @@ int vhost_vsock_common_start(VirtIODevice *vdev) } vvc->vhost_dev.acked_features = vdev->guest_features; - ret =vhost_dev_start (&vvc->vhost_dev, vdev); + ret =vhost_dev_start (&vvc->vhost_dev, vdev, true);if (ret <0 ) {error_report ("Error starting vhost: %d" , -ret); goto err_guest_notifiers;
@@ -105,7 +105,7 @@ void vhost_vsock_common_stop(VirtIODevice *vdev)return ; } -vhost_dev_stop (&vvc->vhost_dev, vdev); +vhost_dev_stop (&vvc->vhost_dev, vdev, true); ret = k->set_guest_notifiers (qbus->parent, vvc->vhost_dev.nvqs, false);if (ret <0 ) {
hw/virtio/vhost.c +39 -5
88 lines not on this page · raw message
hw/virtio/trace-events +2 -2
@@ -9,8 +9,8 @@ vhost_section(const char *name) "%s" vhost_reject_section(const char *name, int d) "%s:%d" vhost_iotlb_miss(void *dev, int step) "%p step %d" vhost_dev_cleanup(void *dev) "%p" -vhost_dev_start(void *dev, const char *name) "%p:%s" -vhost_dev_stop(void *dev, const char *name) "%p:%s" +vhost_dev_start(void *dev, const char *name, bool vrings) "%p:%s vrings:%d" +vhost_dev_stop(void *dev, const char *name, bool vrings) "%p:%s vrings:%d" # vhost-user.c
Signature · 1 line
2.38.1
PATCH v2 14/51 hw/virtio: add started_vu status field to vhost-user-gpio
In reply to Juan QuintelaFrom: Alex Bennée <[email protected]>
As per the fix to vhost-user-blk in f5b22d06fb (vhost: recheck dev state in the vhost_migration_log routine) we really should track the connection and starting separately.
Message-Id: <[email protected]>
--- include/hw/virtio/vhost-user-gpio.h | 10 ++++++++++ hw/virtio/vhost-user-gpio.c | 11 ++++------- 2 files changed, 14 insertions(+), 7 deletions(-)
include/hw/virtio/vhost-user-gpio.h +10 -0
@@ -28,7 +28,17 @@ struct VHostUserGPIO {VhostUserState vhost_user;VirtQueue *command_vq;VirtQueue *interrupt_vq; +/** +* There are at least two steps of initialization of the +* vhost-user device. The first is a "connect" step and +* second is a "start" step. Make a separation between +* those initialization phases by using two fields. +* +* @connected: see vu_gpio_connect()/vu_gpio_disconnect() +* @started_vu: see vu_gpio_start()/vu_gpio_stop() +*/ bool connected; +bool started_vu;/*< public >*/ };
hw/virtio/vhost-user-gpio.c +4 -7
@@ -86,6 +86,7 @@ static int vu_gpio_start(VirtIODevice *vdev)error_report ("Error starting vhost-user-gpio: %d" , ret); goto err_guest_notifiers; } + gpio->started_vu = true;/* * guest_notifier_mask/pending not used yet, so just unmask
@@ -126,16 +127,12 @@ static void vu_gpio_stop(VirtIODevice *vdev)struct vhost_dev *vhost_dev = &gpio->vhost_dev;int ret; -if (!k->set_guest_notifiers) { +if (!gpio->started_vu) {return ; } + gpio->started_vu = false; -/* -* We can call vu_gpio_stop multiple times, for example from -* vm_state_notify and the final object finalisation. Check we -* aren't already stopped before doing so. -*/ -if (!vhost_dev_is_started (vhost_dev)) { +if (!k->set_guest_notifiers) {return ; }
Signature · 1 line
2.38.1
PATCH v2 15/51 hw/virtio: generalise CHR_EVENT_CLOSED handling
In reply to Juan QuintelaFrom: Alex Bennée <[email protected]>
..and use for both virtio-user-blk and virtio-user-gpio. This avoids the circular close by deferring shutdown due to disconnection until a later point. virtio-user-blk already had this mechanism in place so generalise it as a vhost-user helper function and use for both blk and gpio devices.
While we are at it we also fix up vhost-user-gpio to re-establish the event handler after close down so we can reconnect later.
Message-Id: <[email protected]>
--- include/hw/virtio/vhost-user.h | 18 +++++++++ hw/block/vhost-user-blk.c | 41 +++----------------- hw/virtio/vhost-user-gpio.c | 11 +++++- hw/virtio/vhost-user.c | 71 ++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 37 deletions(-)
include/hw/virtio/vhost-user.h +18 -0
@@ -68,4 +68,22 @@ bool vhost_user_init(VhostUserState *user, CharBackend *chr, Error **errp);*/ void vhost_user_cleanup (VhostUserState *user); +/** +* vhost_user_async_close() - cleanup vhost-user post connection drop +* @d: DeviceState for the associated device (passed to callback) +* @chardev: the CharBackend associated with the connection +* @vhost: the common vhost device +* @cb: the user callback function to complete the clean-up +* +* This function is used to handle the shutdown of a vhost-user +* connection to a backend. We handle this centrally to make sure we +* do all the steps and handle potential races due to VM shutdowns. +* Once the connection is disabled we call a backhalf to ensure +*/ +typedef void (*vu_async_close_fn )(DeviceState *cb); + +void vhost_user_async_close (DeviceState *d, +CharBackend *chardev,struct vhost_dev *vhost, +vu_async_close_fn cb); +#endif
hw/block/vhost-user-blk.c +5 -36
55 lines not on this page · raw message
hw/virtio/vhost-user-gpio.c +10 -1
@@ -233,6 +233,8 @@ static int vu_gpio_connect(DeviceState *dev, Error **errp)return 0 ; } +static void vu_gpio_event (void *opaque,QEMUChrEvent event); +static void vu_gpio_disconnect (DeviceState *dev) {VirtIODevice *vdev =VIRTIO_DEVICE (dev);
@@ -245,6 +247,11 @@ static void vu_gpio_disconnect(DeviceState *dev)vu_gpio_stop (vdev);vhost_dev_cleanup (&gpio->vhost_dev); + +/* Re-instate the event handler for new connections */ +qemu_chr_fe_set_handlers (&gpio->chardev, +NULL ,NULL , vu_gpio_event, +NULL , dev,NULL , true); }static void vu_gpio_event (void *opaque,QEMUChrEvent event)
@@ -262,7 +269,9 @@ static void vu_gpio_event(void *opaque, QEMUChrEvent event) }break ;case CHR_EVENT_CLOSED : -vu_gpio_disconnect (dev); +/* defer close until later to avoid circular close */ +vhost_user_async_close (dev, &gpio->chardev, &gpio->vhost_dev, + vu_gpio_disconnect);break ;case CHR_EVENT_BREAK :case CHR_EVENT_MUX_IN :
hw/virtio/vhost-user.c +71 -0
83 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH v2 16/51 include/hw: VM state takes precedence in virtio_device_should_start
In reply to Juan QuintelaFrom: Alex Bennée <[email protected]>
The VM status should always preempt the device status for these checks. This ensures the device is in the correct state when we suspend the VM prior to migrations. This restores the checks to the order they where in before the refactoring moved things around.
While we are at it lets improve our documentation of the various fields involved and document the two functions.
Message-Id: <[email protected]>
--- include/hw/virtio/virtio.h | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
include/hw/virtio/virtio.h +18 -5
@@ -116,6 +116,13 @@ struct VirtIODevicebool broken;/* device in invalid state, needs reset */ bool use_disabled_flag;/* allow use of 'disable' flag when needed */ bool disabled;/* device in temporarily disabled state */ +/** +* @use_started: true if the @started flag should be used to check the +* current state of the VirtIO device. Otherwise status bits +* should be checked for a current status of the device. +* @use_started is only set via QMP and defaults to true for all +* modern machines (since 4.1). +*/ bool use_started;bool started;bool start_on_kick;/* when virtio 1.0 feature has not been negotiated */
@@ -391,6 +398,16 @@ static inline bool virtio_is_big_endian(VirtIODevice *vdev)return false; } +/** +* virtio_device_started() - check if device started +* @vdev - the VirtIO device +* @status - the devices status bits +* +* Check if the device is started. For most modern machines this is +* tracked via the @vdev->started field (to support migration), +* otherwise we check for the final negotiated status bit that +* indicates everything is ready. +*/ static inline bool virtio_device_started (VirtIODevice *vdev,uint8_t status) {if (vdev->use_started) {
@@ -411,15 +428,11 @@ static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status)*/ static inline bool virtio_device_should_start (VirtIODevice *vdev,uint8_t status) { -if (vdev->use_started) { -return vdev->started; - } -if (!vdev->vm_running) {return false; } -return status &VIRTIO_CONFIG_S_DRIVER_OK ; +return virtio_device_started (vdev, status); }static inline void virtio_set_started (VirtIODevice *vdev,bool started)
Signature · 1 line
2.38.1
PATCH v2 17/51 hw/nvme: fix aio cancel in format
In reply to Juan QuintelaFrom: Klaus Jensen <[email protected]>
There are several bugs in the async cancel code for the Format command.
Firstly, cancelling a format operation neglects to set iocb->ret as well as clearing the iocb->aiocb after cancelling the underlying aiocb which causes the aio callback to ignore the cancellation. Trivial fix.
Secondly, and worse, because the request is queued up for posting to the CQ in a bottom half, if the cancellation is due to the submission queue being deleted (which calls blk_aio_cancel), the req structure is deallocated in nvme_del_sq prior to the bottom half being schedulued.
Fix this by simply removing the bottom half, there is no reason to defer it anyway.
--- hw/nvme/ctrl.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
hw/nvme/ctrl.c +12 -16
@@ -5741,7 +5741,6 @@ static uint16_t nvme_ns_attachment(NvmeCtrl *n, NvmeRequest *req) typedef struct NvmeFormatAIOCB { BlockAIOCB common; BlockAIOCB *aiocb; - QEMUBH *bh; NvmeRequest *req; int ret;
@@ -5756,14 +5755,15 @@ typedef struct NvmeFormatAIOCB {uint8_t pil; } NvmeFormatAIOCB; -static void nvme_format_bh (void *opaque); -static void nvme_format_cancel (BlockAIOCB *aiocb) {NvmeFormatAIOCB *iocb =container_of (aiocb, NvmeFormatAIOCB, common); + iocb->ret = -ECANCELED ; +if (iocb->aiocb) {blk_aio_cancel_async (iocb->aiocb); + iocb->aiocb =NULL ; } }
@@ -5787,13 +5787,17 @@ static void nvme_format_set(NvmeNamespace *ns, uint8_t lbaf, uint8_t mset,nvme_ns_init_format (ns); } +static void nvme_do_format (NvmeFormatAIOCB *iocb); +static void nvme_format_ns_cb (void *opaque,int ret) {NvmeFormatAIOCB *iocb = opaque;NvmeNamespace *ns = iocb->ns;int bytes; -if (ret <0 ) { +if (iocb->ret <0 ) { + goto done; + }else if (ret <0 ) { iocb->ret = ret; goto done; }
@@ -5817,8 +5821,7 @@ static void nvme_format_ns_cb(void *opaque, int ret) iocb->offset =0 ; done: - iocb->aiocb =NULL ; -qemu_bh_schedule (iocb->bh); +nvme_do_format (iocb); }static uint16_t nvme_format_check (NvmeNamespace *ns,uint8_t lbaf,uint8_t pi)
@@ -5842,9 +5845,8 @@ static uint16_t nvme_format_check(NvmeNamespace *ns, uint8_t lbaf, uint8_t pi)return NVME_SUCCESS ; } -static void nvme_format_bh (void *opaque) +static void nvme_do_format (NvmeFormatAIOCB *iocb) { -NvmeFormatAIOCB *iocb = opaque;NvmeRequest *req = iocb->req;NvmeCtrl *n =nvme_ctrl (req);uint32_t dw10 =le32_to_cpu (req->cmd.cdw10);
@@ -5882,11 +5884,7 @@ static void nvme_format_bh(void *opaque)return ; done: -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ; - iocb->common.cb (iocb->common.opaque, iocb->ret); -qemu_aio_unref (iocb); }
@@ -5905,7 +5903,6 @@ static uint16_t nvme_format(NvmeCtrl *n, NvmeRequest *req) iocb =qemu_aio_get (&nvme_format_aiocb_info,NULL , nvme_misc_cb, req); iocb->req = req; - iocb->bh =qemu_bh_new (nvme_format_bh, iocb); iocb->ret =0 ; iocb->ns =NULL ; iocb->nsid =0 ;
@@ -5934,14 +5931,13 @@ static uint16_t nvme_format(NvmeCtrl *n, NvmeRequest *req) } req->aiocb = &iocb->common; -qemu_bh_schedule (iocb->bh); +nvme_do_format (iocb);return NVME_NO_COMPLETE ; out: -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ;qemu_aio_unref (iocb); +return status; }
Signature · 1 line
2.38.1
PATCH v2 18/51 hw/nvme: fix aio cancel in flush
In reply to Juan QuintelaFrom: Klaus Jensen <[email protected]>
Make sure that iocb->aiocb is NULL'ed when cancelling.
Fix a potential use-after-free by removing the bottom half and enqueuing the completion directly.
--- hw/nvme/ctrl.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
hw/nvme/ctrl.c +6 -15
@@ -3160,7 +3160,6 @@ typedef struct NvmeFlushAIOCB {BlockAIOCB common;BlockAIOCB *aiocb;NvmeRequest *req; -QEMUBH *bh;int ret;NvmeNamespace *ns;
@@ -3176,6 +3175,7 @@ static void nvme_flush_cancel(BlockAIOCB *acb)if (iocb->aiocb) {blk_aio_cancel_async (iocb->aiocb); + iocb->aiocb =NULL ; } }
@@ -3185,6 +3185,8 @@ static const AIOCBInfo nvme_flush_aiocb_info = { .get_aio_context = nvme_get_aio_context, }; +static void nvme_do_flush (NvmeFlushAIOCB *iocb); +static void nvme_flush_ns_cb (void *opaque,int ret) {NvmeFlushAIOCB *iocb = opaque;
@@ -3206,13 +3208,11 @@ static void nvme_flush_ns_cb(void *opaque, int ret) } out: - iocb->aiocb =NULL ; -qemu_bh_schedule (iocb->bh); +nvme_do_flush (iocb); } -static void nvme_flush_bh (void *opaque) +static void nvme_do_flush (NvmeFlushAIOCB *iocb) { -NvmeFlushAIOCB *iocb = opaque;NvmeRequest *req = iocb->req;NvmeCtrl *n =nvme_ctrl (req);int i;
@@ -3239,14 +3239,8 @@ static void nvme_flush_bh(void *opaque)return ; done: -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ; - iocb->common.cb (iocb->common.opaque, iocb->ret); -qemu_aio_unref (iocb); - -return ; }static uint16_t nvme_flush (NvmeCtrl *n,NvmeRequest *req)
@@ -3258,7 +3252,6 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req) iocb =qemu_aio_get (&nvme_flush_aiocb_info,NULL , nvme_misc_cb, req); iocb->req = req; - iocb->bh =qemu_bh_new (nvme_flush_bh, iocb); iocb->ret =0 ; iocb->ns =NULL ; iocb->nsid =0 ;
@@ -3280,13 +3273,11 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req) } req->aiocb = &iocb->common; -qemu_bh_schedule (iocb->bh); +nvme_do_flush (iocb);return NVME_NO_COMPLETE ; out: -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ;qemu_aio_unref (iocb);return status;
Signature · 1 line
2.38.1
PATCH v2 19/51 hw/nvme: fix aio cancel in zone reset
In reply to Juan QuintelaFrom: Klaus Jensen <[email protected]>
If the zone reset operation is cancelled but the block unmap operation completes normally, the callback will continue resetting the next zone since it neglects to check iocb->ret which will have been set to -ECANCELED. Make sure that this is checked and bail out if an error is present.
Secondly, fix a potential use-after-free by removing the bottom half and enqueuing the completion directly.
--- hw/nvme/ctrl.c | 36 +++++++++++------------------------- 1 file changed, 11 insertions(+), 25 deletions(-)
hw/nvme/ctrl.c +11 -25
@@ -3712,7 +3712,6 @@ typedef struct NvmeZoneResetAIOCB {BlockAIOCB common;BlockAIOCB *aiocb;NvmeRequest *req; -QEMUBH *bh;int ret;bool all;
@@ -3741,17 +3740,6 @@ static const AIOCBInfo nvme_zone_reset_aiocb_info = { .cancel_async = nvme_zone_reset_cancel, }; -static void nvme_zone_reset_bh (void *opaque) -{ -NvmeZoneResetAIOCB *iocb = opaque; - - iocb->common.cb (iocb->common.opaque, iocb->ret); - -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ; -qemu_aio_unref (iocb); -} -static void nvme_zone_reset_cb (void *opaque,int ret);static void nvme_zone_reset_epilogue_cb (void *opaque,int ret)
@@ -3762,14 +3750,8 @@ static void nvme_zone_reset_epilogue_cb(void *opaque, int ret)int64_t moff;int count; -if (ret <0 ) { -nvme_zone_reset_cb (iocb, ret); -return ; - } - -if (!ns->lbaf.ms) { -nvme_zone_reset_cb (iocb,0 ); -return ; +if (ret <0 || iocb->ret <0 || !ns->lbaf.ms) { + goto out; } moff =nvme_moff (ns, iocb->zone->d.zslba);
@@ -3779,6 +3761,9 @@ static void nvme_zone_reset_epilogue_cb(void *opaque, int ret)BDRV_REQ_MAY_UNMAP , nvme_zone_reset_cb, iocb);return ; + +out: +nvme_zone_reset_cb (iocb, ret); }static void nvme_zone_reset_cb (void *opaque,int ret)
@@ -3787,7 +3772,9 @@ static void nvme_zone_reset_cb(void *opaque, int ret)NvmeRequest *req = iocb->req;NvmeNamespace *ns = req->ns; -if (ret <0 ) { +if (iocb->ret <0 ) { + goto done; + }else if (ret <0 ) { iocb->ret = ret; goto done; }
@@ -3835,9 +3822,9 @@ static void nvme_zone_reset_cb(void *opaque, int ret) done: iocb->aiocb =NULL ; -if (iocb->bh) { -qemu_bh_schedule (iocb->bh); - } + + iocb->common.cb (iocb->common.opaque, iocb->ret); +qemu_aio_unref (iocb); } static uint16_t nvme_zone_mgmt_send_zrwa_flush(NvmeCtrl *n, NvmeZone *zone,
@@ -3942,7 +3929,6 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, NvmeRequest *req) nvme_misc_cb, req); iocb->req = req; - iocb->bh =qemu_bh_new (nvme_zone_reset_bh, iocb); iocb->ret =0 ; iocb->all = all; iocb->idx = zone_idx;
Signature · 1 line
2.38.1
PATCH v2 20/51 hw/nvme: fix aio cancel in dsm
In reply to Juan QuintelaFrom: Klaus Jensen <[email protected]>
When the DSM operation is cancelled asynchronously, we set iocb->ret to -ECANCELED. However, the callback function only checks the return value of the completed aio, which may have completed succesfully prior to the cancellation and thus the callback ends up continuing the dsm operation instead of bailing out. Fix this.
Secondly, fix a potential use-after-free by removing the bottom half and enqueuing the completion directly.
--- hw/nvme/ctrl.c | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-)
hw/nvme/ctrl.c +8 -26
@@ -2329,7 +2329,6 @@ typedef struct NvmeDSMAIOCB {BlockAIOCB common;BlockAIOCB *aiocb;NvmeRequest *req; -QEMUBH *bh;int ret;NvmeDsmRange *range;
@@ -2351,7 +2350,7 @@ static void nvme_dsm_cancel(BlockAIOCB *aiocb) }else {/* * We only reach this if nvme_dsm_cancel() has already been called or -* the command ran to completion and nvme_dsm_bh is scheduled to run. +* the command ran to completion. */ assert (iocb->idx == iocb->nr); }
@@ -2362,17 +2361,6 @@ static const AIOCBInfo nvme_dsm_aiocb_info = { .cancel_async = nvme_dsm_cancel, }; -static void nvme_dsm_bh (void *opaque) -{ -NvmeDSMAIOCB *iocb = opaque; - - iocb->common.cb (iocb->common.opaque, iocb->ret); - -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ; -qemu_aio_unref (iocb); -} -static void nvme_dsm_cb (void *opaque,int ret);static void nvme_dsm_md_cb (void *opaque,int ret)
@@ -2384,16 +2372,10 @@ static void nvme_dsm_md_cb(void *opaque, int ret)uint64_t slba;uint32_t nlb; -if (ret <0 ) { - iocb->ret = ret; +if (ret <0 || iocb->ret <0 || !ns->lbaf.ms) { goto done; } -if (!ns->lbaf.ms) { -nvme_dsm_cb (iocb,0 ); -return ; - } - range = &iocb->range[iocb->idx -1 ]; slba =le64_to_cpu (range->slba); nlb =le32_to_cpu (range->nlb);
@@ -2406,7 +2388,6 @@ static void nvme_dsm_md_cb(void *opaque, int ret) ret =nvme_block_status_all (ns, slba, nlb,BDRV_BLOCK_ZERO );if (ret) {if (ret <0 ) { - iocb->ret = ret; goto done; }
@@ -2420,8 +2401,7 @@ static void nvme_dsm_md_cb(void *opaque, int ret)return ; done: - iocb->aiocb =NULL ; -qemu_bh_schedule (iocb->bh); +nvme_dsm_cb (iocb, ret); }static void nvme_dsm_cb (void *opaque,int ret)
@@ -2434,7 +2414,9 @@ static void nvme_dsm_cb(void *opaque, int ret)uint64_t slba;uint32_t nlb; -if (ret <0 ) { +if (iocb->ret <0 ) { + goto done; + }else if (ret <0 ) { iocb->ret = ret; goto done; }
@@ -2468,7 +2450,8 @@ next: done: iocb->aiocb =NULL ; -qemu_bh_schedule (iocb->bh); + iocb->common.cb (iocb->common.opaque, iocb->ret); +qemu_aio_unref (iocb); }static uint16_t nvme_dsm (NvmeCtrl *n,NvmeRequest *req)
@@ -2486,7 +2469,6 @@ static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req) nvme_misc_cb, req); iocb->req = req; - iocb->bh =qemu_bh_new (nvme_dsm_bh, iocb); iocb->ret =0 ; iocb->range =g_new (NvmeDsmRange, nr); iocb->nr = nr;
Signature · 1 line
2.38.1
PATCH v2 21/51 hw/nvme: remove copy bh scheduling
In reply to Juan QuintelaFrom: Klaus Jensen <[email protected]>
Fix a potential use-after-free by removing the bottom half and enqueuing the completion directly.
--- hw/nvme/ctrl.c | 63 +++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 49 deletions(-)
hw/nvme/ctrl.c +14 -49
@@ -2552,7 +2552,6 @@ typedef struct NvmeCopyAIOCB {BlockAIOCB common;BlockAIOCB *aiocb;NvmeRequest *req; -QEMUBH *bh;int ret;void *ranges;
@@ -2590,9 +2589,8 @@ static const AIOCBInfo nvme_copy_aiocb_info = { .cancel_async = nvme_copy_cancel, }; -static void nvme_copy_bh (void *opaque) +static void nvme_copy_done (NvmeCopyAIOCB *iocb) { -NvmeCopyAIOCB *iocb = opaque;NvmeRequest *req = iocb->req;NvmeNamespace *ns = req->ns;BlockAcctStats *stats =blk_get_stats (ns->blkconf.blk);
@@ -2604,9 +2602,6 @@ static void nvme_copy_bh(void *opaque)qemu_iovec_destroy (&iocb->iov);g_free (iocb->bounce); -qemu_bh_delete (iocb->bh); - iocb->bh =NULL ; -if (iocb->ret <0 ) {block_acct_failed (stats, &iocb->acct.read);block_acct_failed (stats, &iocb->acct.write);
@@ -2619,7 +2614,7 @@ static void nvme_copy_bh(void *opaque)qemu_aio_unref (iocb); } -static void nvme_copy_cb (void *opaque,int ret); +static void nvme_do_copy (NvmeCopyAIOCB *iocb); static void nvme_copy_source_range_parse_format0(void *ranges, int idx, uint64_t *slba, uint32_t *nlb,
@@ -2731,7 +2726,7 @@ static void nvme_copy_out_completed_cb(void *opaque, int ret) iocb->idx++; iocb->slba += nlb; out: -nvme_copy_cb (iocb, iocb->ret); +nvme_do_copy (iocb); }static void nvme_copy_out_cb (void *opaque,int ret)
@@ -2743,16 +2738,8 @@ static void nvme_copy_out_cb(void *opaque, int ret)size_t mlen;uint8_t *mbounce; -if (ret <0 ) { - iocb->ret = ret; +if (ret <0 || iocb->ret <0 || !ns->lbaf.ms) { goto out; - }else if (iocb->ret <0 ) { - goto out; - } - -if (!ns->lbaf.ms) { -nvme_copy_out_completed_cb (iocb,0 ); -return ; } nvme_copy_source_range_parse(iocb->ranges, iocb->idx, iocb->format, NULL,
@@ -2771,7 +2758,7 @@ static void nvme_copy_out_cb(void *opaque, int ret)return ; out: -nvme_copy_cb (iocb, ret); +nvme_copy_out_completed_cb (iocb, ret); }static void nvme_copy_in_completed_cb (void *opaque,int ret)
@@ -2865,15 +2852,9 @@ static void nvme_copy_in_completed_cb(void *opaque, int ret) invalid: req->status = status; - iocb->aiocb =NULL ; -if (iocb->bh) { -qemu_bh_schedule (iocb->bh); - } - -return ; - + iocb->ret =-1 ; out: -nvme_copy_cb (iocb, ret); +nvme_do_copy (iocb); }static void nvme_copy_in_cb (void *opaque,int ret)
@@ -2884,16 +2865,8 @@ static void nvme_copy_in_cb(void *opaque, int ret)uint64_t slba;uint32_t nlb; -if (ret <0 ) { - iocb->ret = ret; +if (ret <0 || iocb->ret <0 || !ns->lbaf.ms) { goto out; - }else if (iocb->ret <0 ) { - goto out; - } - -if (!ns->lbaf.ms) { -nvme_copy_in_completed_cb (iocb,0 ); -return ; } nvme_copy_source_range_parse(iocb->ranges, iocb->idx, iocb->format, &slba,
@@ -2909,12 +2882,11 @@ static void nvme_copy_in_cb(void *opaque, int ret)return ; out: -nvme_copy_cb (iocb, iocb->ret); +nvme_copy_in_completed_cb (iocb, ret); } -static void nvme_copy_cb (void *opaque,int ret) +static void nvme_do_copy (NvmeCopyAIOCB *iocb) { -NvmeCopyAIOCB *iocb = opaque;NvmeRequest *req = iocb->req;NvmeNamespace *ns = req->ns;uint64_t slba;
@@ -2922,10 +2894,7 @@ static void nvme_copy_cb(void *opaque, int ret)size_t len;uint16_t status; -if (ret <0 ) { - iocb->ret = ret; - goto done; - }else if (iocb->ret <0 ) { +if (iocb->ret <0 ) { goto done; }
@@ -2972,14 +2941,11 @@ static void nvme_copy_cb(void *opaque, int ret) invalid: req->status = status; + iocb->ret =-1 ; done: - iocb->aiocb =NULL ; -if (iocb->bh) { -qemu_bh_schedule (iocb->bh); - } +nvme_copy_done (iocb); } -static uint16_t nvme_copy (NvmeCtrl *n,NvmeRequest *req) {NvmeNamespace *ns = req->ns;
@@ -3049,7 +3015,6 @@ static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest *req) } iocb->req = req; - iocb->bh =qemu_bh_new (nvme_copy_bh, iocb); iocb->ret =0 ; iocb->nr = nr; iocb->idx =0 ;
@@ -3066,7 +3031,7 @@ static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest *req) BLOCK_ACCT_WRITE); req->aiocb = &iocb->common; -nvme_copy_cb (iocb,0 ); +nvme_do_copy (iocb);return NVME_NO_COMPLETE ;
Signature · 1 line
2.38.1
PATCH v2 22/51 target/i386: allow MMX instructions with CR4.OSFXSR=0
In reply to Juan QuintelaFrom: Paolo Bonzini <[email protected]>
MMX state is saved/restored by FSAVE/FRSTOR so the instructions are not illegal opcodes even if CR4.OSFXSR=0. Make sure that validate_vex takes into account the prefix and only checks HF_OSFXSR_MASK in the presence of an SSE instruction.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1350
--- target/i386/tcg/decode-new.c.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
target/i386/tcg/decode-new.c.inc +2 -1
@@ -1488,7 +1488,8 @@ static bool validate_vex(DisasContext *s, X86DecodedInsn *decode) if (!(s->flags & HF_AVX_EN_MASK)) { goto illegal; } - } else { + } else if (e->special != X86_SPECIAL_MMX || + (s->prefix & (PREFIX_REPZ | PREFIX_REPNZ | PREFIX_DATA))) { if (!(s->flags & HF_OSFXSR_MASK)) { goto illegal; }
Signature · 1 line
2.38.1
PATCH v2 23/51 target/i386: Always completely initialize TranslateFault
In reply to Juan QuintelaFrom: Richard Henderson <[email protected]>
In get_physical_address, the canonical address check failed to set TranslateFault.stage2, which resulted in an uninitialized read from the struct when reporting the fault in x86_cpu_tlb_fill.
Adjust all error paths to use structure assignment so that the entire struct is always initialized.
Message-Id: <[email protected]>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1324
--- target/i386/tcg/sysemu/excp_helper.c | 34 ++++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-)
target/i386/tcg/sysemu/excp_helper.c +19 -15
@@ -71,10 +71,11 @@ static bool ptw_translate(PTETranslate *inout, hwaddr addr)TranslateFault *err = inout->err;assert (inout->ptw_idx ==MMU_NESTED_IDX ); - err->exception_index =0 ;/* unused */ - err->error_code = inout->env->error_code; - err->cr2 = addr; - err->stage2 =S2_GPT ; + *err = (TranslateFault ){ + .error_code = inout->env->error_code, + .cr2 = addr, + .stage2 =S2_GPT , + };return false; }return true;
@@ -431,10 +432,11 @@ do_check_protect_pse36:MMU_NESTED_IDX , true, &pte_trans.haddr, &full, 0);if (unlikely (flags &TLB_INVALID_MASK )) { - err->exception_index =0 ;/* unused */ - err->error_code = env->error_code; - err->cr2 = paddr; - err->stage2 =S2_GPA ; + *err = (TranslateFault ){ + .error_code = env->error_code, + .cr2 = paddr, + .stage2 =S2_GPA , + };return false; }
@@ -494,10 +496,11 @@ do_check_protect_pse36: }break ; } - err->exception_index =EXCP0E_PAGE ; - err->error_code = error_code; - err->cr2 = addr; - err->stage2 =S2_NONE ; + *err = (TranslateFault ){ + .exception_index =EXCP0E_PAGE , + .error_code = error_code, + .cr2 = addr, + };return false; }
@@ -564,9 +567,10 @@ static bool get_physical_address(CPUX86State *env, vaddr addr,int shift = in.pg_mode &PG_MODE_LA57 ?56 :47 ;int64_t sext = (int64_t )addr >> shift;if (sext !=0 && sext !=-1 ) { - err->exception_index =EXCP0D_GPF ; - err->error_code =0 ; - err->cr2 = addr; + *err = (TranslateFault ){ + .exception_index =EXCP0D_GPF , + .cr2 = addr, + };return false; } }
Signature · 1 line
2.38.1
PATCH v2 24/51 hw/loongarch/virt: Add cfi01 pflash device
In reply to Juan QuintelaFrom: Xiaojuan Yang <[email protected]>
Add cfi01 pflash device for LoongArch virt machine
Message-Id: <[email protected]>
--- include/hw/loongarch/virt.h | 5 +++ hw/loongarch/acpi-build.c | 18 +++++++++++ hw/loongarch/virt.c | 62 +++++++++++++++++++++++++++++++++++++ hw/loongarch/Kconfig | 1 + 4 files changed, 86 insertions(+)
include/hw/loongarch/virt.h +5 -0
@@ -12,6 +12,7 @@#include "hw/boards.h" #include "qemu/queue.h" #include "hw/intc/loongarch_ipi.h" +#include "hw/block/flash.h" #define LOONGARCH_MAX_VCPUS 4
@@ -20,6 +21,9 @@#define VIRT_FWCFG_BASE 0x1e020000UL#define VIRT_BIOS_BASE 0x1c000000UL#define VIRT_BIOS_SIZE (4 * MiB) +#define VIRT_FLASH_SECTOR_SIZE (128 * KiB) +#define VIRT_FLASH_BASE 0x1d000000UL +#define VIRT_FLASH_SIZE (16 * MiB)#define VIRT_LOWMEM_BASE 0#define VIRT_LOWMEM_SIZE 0x10000000
@@ -48,6 +52,7 @@ struct LoongArchMachineState {int fdt_size;DeviceState *platform_bus_dev;PCIBus *pci_bus; +PFlashCFI01 *flash; };#define TYPE_LOONGARCH_MACHINE MACHINE_TYPE_NAME("virt")
hw/loongarch/acpi-build.c +18 -0
@@ -279,6 +279,23 @@ static void build_pci_device_aml(Aml *scope, LoongArchMachineState *lams)acpi_dsdt_add_gpex (scope, &cfg); } +static void build_flash_aml (Aml *scope,LoongArchMachineState *lams) +{ +Aml *dev, *crs; + +hwaddr flash_base =VIRT_FLASH_BASE ; +hwaddr flash_size =VIRT_FLASH_SIZE ; + + dev =aml_device ("FLS0" ); +aml_append (dev,aml_name_decl ("_HID" ,aml_string ("LNRO0015" ))); +aml_append (dev,aml_name_decl ("_UID" ,aml_int (0 ))); + + crs =aml_resource_template (); +aml_append (crs,aml_memory32_fixed (flash_base, flash_size,AML_READ_WRITE )); +aml_append (dev,aml_name_decl ("_CRS" , crs)); +aml_append (scope, dev); +} +#ifdef CONFIG_TPM static void acpi_dsdt_add_tpm (Aml *scope,LoongArchMachineState *vms) {
@@ -328,6 +345,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, MachineState *machine)build_uart_device_aml (dsdt);build_pci_device_aml (dsdt, lams);build_la_ged_aml (dsdt, machine); +build_flash_aml (dsdt, lams);#ifdef CONFIG_TPM acpi_dsdt_add_tpm (dsdt, lams);#endif
hw/loongarch/virt.c +62 -0
86 lines not on this page · raw message
hw/loongarch/Kconfig +1 -0
@@ -20,3 +20,4 @@ config LOONGARCH_VIRT select ACPI_HW_REDUCED select FW_CFG_DMA select DIMM + select PFLASH_CFI01
Signature · 1 line
2.38.1
PATCH v2 25/51 tests/qtest/migration-test: Fix unlink error and memory leaks
In reply to Juan QuintelaFrom: Thomas Huth <[email protected]>
When running the migration test compiled with Clang from Fedora 37 and sanitizers enabled, there is an error complaining about unlink():
../tests/qtest/migration-test.c:1072:12: runtime error: null pointer
passed as argument 1, which is declared to never be null
/usr/include/unistd.h:858:48: note: nonnull attribute specified here
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior
../tests/qtest/migration-test.c:1072:12 in
(test program exited with status code 1)
TAP parsing error: Too few tests run (expected 33, got 20)
The data->clientcert and data->clientkey pointers can indeed be unset in some tests, so we have to check them before calling unlink() with those.
While we're at it, I also noticed that the code is only freeing some but not all of the allocated strings in this function, and indeed, valgrind is also complaining about memory leaks here. So let's call g_free() on all allocated strings to avoid leaking memory here.
Message-Id: <[email protected]>
--- tests/qtest/migration-test.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
tests/qtest/migration-test.c +16 -4
@@ -1066,15 +1066,27 @@ test_migrate_tls_x509_finish(QTestState *from,TestMigrateTLSX509Data *data = opaque;test_tls_cleanup (data->keyfile); +g_free (data->keyfile); +unlink (data->cacert); +g_free (data->cacert);unlink (data->servercert); +g_free (data->servercert);unlink (data->serverkey); -unlink (data->clientcert); -unlink (data->clientkey); +g_free (data->serverkey); + +if (data->clientcert) { +unlink (data->clientcert); +g_free (data->clientcert); + } +if (data->clientkey) { +unlink (data->clientkey); +g_free (data->clientkey); + } +rmdir (data->workdir); -g_free (data->workdir); -g_free (data->keyfile); + g_free(data); }#endif /* CONFIG_TASN1 */
Signature · 1 line
2.38.1
PATCH v2 26/51 target/s390x/tcg: Fix and improve the SACF instruction
In reply to Juan QuintelaFrom: Thomas Huth <[email protected]>
The SET ADDRESS SPACE CONTROL FAST instruction is not privileged, it can be used from problem space, too. Just the switching to the home address space is privileged and should still generate a privilege exception. This bug is e.g. causing programs like Java that use the "getcpu" vdso kernel function to crash (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990417#26 ).
While we're at it, also check if DAT is not enabled. In that case the instruction is supposed to generate a special operation exception.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/655
Message-Id: <[email protected]>
--- target/s390x/tcg/insn-data.h.inc | 2 +- target/s390x/tcg/cc_helper.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
target/s390x/tcg/insn-data.h.inc +1 -1
@@ -1365,7 +1365,7 @@ /* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */ F(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0, IF_PRIV | IF_IO) /* SET ADDRESS SPACE CONTROL FAST */ - F(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0, IF_PRIV) + C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0) /* SET CLOCK */ F(0xb204, SCK, S, Z, 0, m2_64a, 0, 0, sck, 0, IF_PRIV | IF_IO) /* SET CLOCK COMPARATOR */
target/s390x/tcg/cc_helper.c +7 -0
@@ -487,6 +487,10 @@ void HELPER(sacf)(CPUS390XState *env, uint64_t a1) {HELPER_LOG ("%s: %16" PRIx64"\n" , __func__, a1); +if (!(env->psw.mask &PSW_MASK_DAT )) { +tcg_s390_program_interrupt (env,PGM_SPECIAL_OP ,GETPC ()); + } +switch (a1 &0xf00 ) {case 0x000 : env->psw.mask &= ~PSW_MASK_ASC ;
@@ -497,6 +501,9 @@ void HELPER(sacf)(CPUS390XState *env, uint64_t a1) env->psw.mask |=PSW_ASC_SECONDARY ;break ;case 0x300 : +if ((env->psw.mask &PSW_MASK_PSTATE ) !=0 ) { +tcg_s390_program_interrupt (env,PGM_PRIVILEGED ,GETPC ()); + } env->psw.mask &= ~PSW_MASK_ASC ; env->psw.mask |=PSW_ASC_HOME ;break ;
Signature · 1 line
2.38.1
PATCH v2 27/51 hw/display/next-fb: Fix comment typo
In reply to Juan QuintelaFrom: Evgeny Ermakov <[email protected]>
Message-Id: <[email protected]>
--- hw/display/next-fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
hw/display/next-fb.c +1 -1
@@ -126,7 +126,7 @@ static void nextfb_class_init(ObjectClass *oc, void *data)set_bit (DEVICE_CATEGORY_DISPLAY , dc->categories); dc->realize = nextfb_realize; -/* Note: This device does not any state that we have to reset or migrate */ +/* Note: This device does not have any state that we have to reset or migrate */ }static const TypeInfo nextfb_info = {
Signature · 1 line
2.38.1
PATCH v2 28/51 multifd: Create page_size fields into both MultiFD{Recv,Send}Params
In reply to Juan QuintelaWe were calling qemu_target_page_size() left and right.
--- migration/multifd.h | 4 ++++ migration/multifd-zlib.c | 14 ++++++-------- migration/multifd-zstd.c | 12 +++++------- migration/multifd.c | 18 ++++++++---------- 4 files changed, 23 insertions(+), 25 deletions(-)
migration/multifd.h +4 -0
@@ -80,6 +80,8 @@ typedef struct {bool registered_yank;/* packet allocated len */ uint32_t packet_len; +/* guest page size */ +uint32_t page_size;/* multifd flags for sending ram */ int write_flags;
@@ -143,6 +145,8 @@ typedef struct {QIOChannel *c;/* packet allocated len */ uint32_t packet_len; +/* guest page size */ +uint32_t page_size;/* syncs main thread and channels */ QemuSemaphore sem_sync;
migration/multifd-zlib.c +6 -8
@@ -116,7 +116,6 @@ static void zlib_send_cleanup(MultiFDSendParams *p, Error **errp)static int zlib_send_prepare (MultiFDSendParams *p,Error **errp) {struct zlib_data *z = p->data; -size_t page_size =qemu_target_page_size ();z_stream *zs = &z->zs;uint32_t out_size =0 ;int ret;
@@ -135,8 +134,8 @@ static int zlib_send_prepare(MultiFDSendParams *p, Error **errp)* with compression. zlib does not guarantee that this is safe, * therefore copy the page before calling deflate(). */ -memcpy (z->buf, p->pages->block->host + p->normal[i], page_size); - zs->avail_in = page_size; +memcpy (z->buf, p->pages->block->host + p->normal[i], p->page_size); + zs->avail_in = p->page_size; zs->next_in = z->buf; zs->avail_out = available;
@@ -242,12 +241,11 @@ static void zlib_recv_cleanup(MultiFDRecvParams *p)static int zlib_recv_pages (MultiFDRecvParams *p,Error **errp) {struct zlib_data *z = p->data; -size_t page_size =qemu_target_page_size ();z_stream *zs = &z->zs;uint32_t in_size = p->next_packet_size;/* we measure the change of total_out */ uint32_t out_size = zs->total_out; -uint32_t expected_size = p->normal_num * page_size; +uint32_t expected_size = p->normal_num * p->page_size;uint32_t flags = p->flags &MULTIFD_FLAG_COMPRESSION_MASK ;int ret;int i;
@@ -274,7 +272,7 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp) flush =Z_SYNC_FLUSH ; } - zs->avail_out = page_size; + zs->avail_out = p->page_size; zs->next_out = p->host + p->normal[i];/*
@@ -288,8 +286,8 @@ static int zlib_recv_pages(MultiFDRecvParams *p, Error **errp)do { ret =inflate (zs, flush); }while (ret ==Z_OK && zs->avail_in - && (zs->total_out - start) < page_size); -if (ret ==Z_OK && (zs->total_out - start) < page_size) { + && (zs->total_out - start) < p->page_size); +if (ret ==Z_OK && (zs->total_out - start) < p->page_size) {error_setg (errp,"multifd %u: inflate generated too few output" , p->id);return -1 ;
migration/multifd-zstd.c +5 -7
@@ -113,7 +113,6 @@ static void zstd_send_cleanup(MultiFDSendParams *p, Error **errp)static int zstd_send_prepare (MultiFDSendParams *p,Error **errp) {struct zstd_data *z = p->data; -size_t page_size =qemu_target_page_size ();int ret;uint32_t i;
@@ -128,7 +127,7 @@ static int zstd_send_prepare(MultiFDSendParams *p, Error **errp) flush = ZSTD_e_flush; } z->in.src = p->pages->block->host + p->normal[i]; - z->in.size = page_size; + z->in.size = p->page_size; z->in.pos =0 ;/*
@@ -241,8 +240,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error **errp) {uint32_t in_size = p->next_packet_size;uint32_t out_size =0 ; -size_t page_size =qemu_target_page_size (); -uint32_t expected_size = p->normal_num * page_size; +uint32_t expected_size = p->normal_num * p->page_size;uint32_t flags = p->flags &MULTIFD_FLAG_COMPRESSION_MASK ;struct zstd_data *z = p->data;int ret;
@@ -265,7 +263,7 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error **errp)for (i =0 ; i < p->normal_num; i++) { z->out.dst = p->host + p->normal[i]; - z->out.size = page_size; + z->out.size = p->page_size; z->out.pos =0 ;/*
@@ -279,8 +277,8 @@ static int zstd_recv_pages(MultiFDRecvParams *p, Error **errp)do { ret =ZSTD_decompressStream (z->zds, &z->out, &z->in); }while (ret >0 && (z->in.size - z->in.pos >0 ) - && (z->out.pos < page_size)); -if (ret >0 && (z->out.pos < page_size)) { + && (z->out.pos < p->page_size)); +if (ret >0 && (z->out.pos < p->page_size)) {error_setg (errp,"multifd %u: decompressStream buffer too small" , p->id);return -1 ;
migration/multifd.c +8 -10
@@ -87,15 +87,14 @@ static void nocomp_send_cleanup(MultiFDSendParams *p, Error **errp)static int nocomp_send_prepare (MultiFDSendParams *p,Error **errp) {MultiFDPages_t *pages = p->pages; -size_t page_size =qemu_target_page_size ();for (int i =0 ; i < p->normal_num; i++) { p->iov[p->iovs_num].iov_base = pages->block->host + p->normal[i]; - p->iov[p->iovs_num].iov_len = page_size; + p->iov[p->iovs_num].iov_len = p->page_size; p->iovs_num++; } - p->next_packet_size = p->normal_num * page_size; + p->next_packet_size = p->normal_num * p->page_size; p->flags |=MULTIFD_FLAG_NOCOMP ;return 0 ; }
@@ -139,7 +138,6 @@ static void nocomp_recv_cleanup(MultiFDRecvParams *p)static int nocomp_recv_pages (MultiFDRecvParams *p,Error **errp) {uint32_t flags = p->flags &MULTIFD_FLAG_COMPRESSION_MASK ; -size_t page_size =qemu_target_page_size ();if (flags !=MULTIFD_FLAG_NOCOMP ) { error_setg(errp, "multifd %u: flags received %x flags expected %x",
@@ -148,7 +146,7 @@ static int nocomp_recv_pages(MultiFDRecvParams *p, Error **errp) }for (int i =0 ; i < p->normal_num; i++) { p->iov[i].iov_base = p->host + p->normal[i]; - p->iov[i].iov_len = page_size; + p->iov[i].iov_len = p->page_size; }return qio_channel_readv_all (p->c, p->iov, p->normal_num, errp); }
@@ -281,8 +279,7 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)static int multifd_recv_unfill_packet (MultiFDRecvParams *p,Error **errp) {MultiFDPacket_t *packet = p->packet; -size_t page_size =qemu_target_page_size (); -uint32_t page_count =MULTIFD_PACKET_SIZE / page_size; +uint32_t page_count =MULTIFD_PACKET_SIZE / p->page_size;RAMBlock *block;int i;
@@ -344,7 +341,7 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)for (i =0 ; i < p->normal_num; i++) {uint64_t offset =be64_to_cpu (packet->offset[i]); -if (offset > (block->used_length - page_size)) { +if (offset > (block->used_length - p->page_size)) {error_setg (errp,"multifd: offset too long %" PRIu64" (max " RAM_ADDR_FMT ")" , offset, block->used_length);
@@ -433,8 +430,7 @@ static int multifd_send_pages(QEMUFile *f) p->packet_num = multifd_send_state->packet_num++; multifd_send_state->pages = p->pages; p->pages = pages; - transferred = ((uint64_t ) pages->num) *qemu_target_page_size () - + p->packet_len; + transferred = ((uint64_t ) pages->num) * p->page_size + p->packet_len;qemu_file_acct_rate_limit (f, transferred); ram_counters.multifd_bytes += transferred; ram_counters.transferred += transferred;
@@ -947,6 +943,7 @@ int multifd_save_setup(Error **errp)/* We need one extra place for the packet header */ p->iov = g_new0(struct iovec, page_count + 1); p->normal =g_new0 (ram_addr_t, page_count); + p->page_size =qemu_target_page_size ();if (migrate_use_zero_copy_send ()) { p->write_flags =QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ;
@@ -1194,6 +1191,7 @@ int multifd_load_setup(Error **errp) p->name =g_strdup_printf ("multifdrecv_%d" , i); p->iov = g_new0(struct iovec, page_count); p->normal =g_new0 (ram_addr_t, page_count); + p->page_size =qemu_target_page_size (); }for (i =0 ; i < thread_count; i++) {
Signature · 1 line
2.38.1
PATCH v2 29/51 multifd: Create page_count fields into both MultiFD{Recv,Send}Params
In reply to Juan QuintelaWe were recalculating it left and right. We plan to change that values on next patches.
--- migration/multifd.h | 4 ++++ migration/multifd.c | 7 ++++--- 2 files changed, 8 insertions(+), 3 deletions(-)
migration/multifd.h +4 -0
@@ -82,6 +82,8 @@ typedef struct {uint32_t packet_len;/* guest page size */ uint32_t page_size; +/* number of pages in a full packet */ +uint32_t page_count;/* multifd flags for sending ram */ int write_flags;
@@ -147,6 +149,8 @@ typedef struct {uint32_t packet_len;/* guest page size */ uint32_t page_size; +/* number of pages in a full packet */ +uint32_t page_count;/* syncs main thread and channels */ QemuSemaphore sem_sync;
migration/multifd.c +4 -3
@@ -279,7 +279,6 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)static int multifd_recv_unfill_packet (MultiFDRecvParams *p,Error **errp) {MultiFDPacket_t *packet = p->packet; -uint32_t page_count =MULTIFD_PACKET_SIZE / p->page_size;RAMBlock *block;int i;
@@ -306,10 +305,10 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)* If we received a packet that is 100 times bigger than expected * just stop migration. It is a magic number. */ -if (packet->pages_alloc > page_count) { +if (packet->pages_alloc > p->page_count) {error_setg (errp,"multifd: received packet " "with size %u and expected a size of %u" , - packet->pages_alloc, page_count) ; + packet->pages_alloc, p->page_count) ;return -1 ; }
@@ -944,6 +943,7 @@ int multifd_save_setup(Error **errp) p->iov = g_new0(struct iovec, page_count + 1); p->normal =g_new0 (ram_addr_t, page_count); p->page_size =qemu_target_page_size (); + p->page_count = page_count;if (migrate_use_zero_copy_send ()) { p->write_flags =QIO_CHANNEL_WRITE_FLAG_ZERO_COPY ;
@@ -1191,6 +1191,7 @@ int multifd_load_setup(Error **errp) p->name =g_strdup_printf ("multifdrecv_%d" , i); p->iov = g_new0(struct iovec, page_count); p->normal =g_new0 (ram_addr_t, page_count); + p->page_count = page_count; p->page_size =qemu_target_page_size (); }
Signature · 1 line
2.38.1
PATCH v2 30/51 migration: Export ram_transferred_ram()
In reply to Juan Quintela--- migration/ram.h | 2 ++ migration/ram.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
migration/ram.h +2 -0
@@ -65,6 +65,8 @@ int ram_load_postcopy(QEMUFile *f, int channel);void ram_handle_compressed (void *host,uint8_t ch,uint64_t size); +void ram_transferred_add (uint64_t bytes); +int ramblock_recv_bitmap_test (RAMBlock *rb,void *host_addr);bool ramblock_recv_bitmap_test_byte_offset (RAMBlock *rb,uint64_t byte_offset);void ramblock_recv_bitmap_set (RAMBlock *rb,void *host_addr);
migration/ram.c +1 -1
@@ -422,7 +422,7 @@ uint64_t ram_bytes_remaining(void)MigrationStats ram_counters; -static void ram_transferred_add (uint64_t bytes) +void ram_transferred_add (uint64_t bytes) {if (runstate_is_running ()) { ram_counters.precopy_bytes += bytes;
Signature · 1 line
2.38.1
PATCH v2 31/51 migration: Export ram_release_page()
In reply to Juan Quintela--- migration/ram.h | 1 + migration/ram.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
migration/ram.h +1 -0
@@ -66,6 +66,7 @@ int ram_load_postcopy(QEMUFile *f, int channel);void ram_handle_compressed (void *host,uint8_t ch,uint64_t size);void ram_transferred_add (uint64_t bytes); +void ram_release_page (const char *rbname,uint64_t offset);int ramblock_recv_bitmap_test (RAMBlock *rb,void *host_addr);bool ramblock_recv_bitmap_test_byte_offset (RAMBlock *rb,uint64_t byte_offset);
migration/ram.c +1 -1
@@ -1234,7 +1234,7 @@ static void migration_bitmap_sync_precopy(RAMState *rs) } } -static void ram_release_page (const char *rbname,uint64_t offset) +void ram_release_page (const char *rbname,uint64_t offset) {if (!migrate_release_ram () || !migration_in_postcopy ()) {return ;
Signature · 1 line
2.38.1
PATCH v2 32/51 migration: Take bitmap mutex when completing ram migration
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Any call to ram_find_and_save_block() needs to take the bitmap mutex. We used to not take it for most of ram_save_complete() because we thought we're the only one left using the bitmap, but it's not true after the preempt full patchset applied, since the return path can be taking it too.
--- migration/ram.c | 2 ++ 1 file changed, 2 insertions(+)
migration/ram.c +2 -0
@@ -3406,6 +3406,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)/* try transferring iterative blocks of memory */ /* flush all remaining blocks regardless of rate limiting */ +qemu_mutex_lock (&rs->bitmap_mutex);while (true) {int pages;
@@ -3419,6 +3420,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)break ; } } +qemu_mutex_unlock (&rs->bitmap_mutex);flush_compressed_data (rs);ram_control_after_iterate (f,RAM_CONTROL_FINISH );
Signature · 1 line
2.38.1
PATCH v2 33/51 migration: Add postcopy_preempt_active()
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Add the helper to show that postcopy preempt enabled, meanwhile active.
--- migration/ram.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
migration/ram.c +7 -2
@@ -162,6 +162,11 @@ out:return ret; } +static bool postcopy_preempt_active (void ) +{ +return migrate_postcopy_preempt () &&migration_in_postcopy (); +} +bool ramblock_is_ignored (RAMBlock *block) { return !qemu_ram_is_migratable(block) ||
@@ -2433,7 +2438,7 @@ static void postcopy_preempt_choose_channel(RAMState *rs, PageSearchStatus *pss)/* We need to make sure rs->f always points to the default channel elsewhere */ static void postcopy_preempt_reset_channel (RAMState *rs) { -if (migrate_postcopy_preempt () &&migration_in_postcopy ()) { +if (postcopy_preempt_active ()) { rs->postcopy_channel =RAM_CHANNEL_PRECOPY ; rs->f =migrate_get_current ()->to_dst_file;trace_postcopy_preempt_reset_channel ();
@@ -2471,7 +2476,7 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)return 0 ; } -if (migrate_postcopy_preempt () &&migration_in_postcopy ()) { +if (postcopy_preempt_active ()) {postcopy_preempt_choose_channel (rs, pss); }
Signature · 1 line
2.38.1
PATCH v2 34/51 migration: Cleanup xbzrle zero page cache update logic
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
The major change is to replace "!save_page_use_compression()" with "xbzrle_enabled" to make it clear.
Reasonings:
(1) When compression enabled, "!save_page_use_compression()" is exactly the same as checking "xbzrle_enabled".
(2) When compression disabled, "!save_page_use_compression()" always return true. We used to try calling the xbzrle code, but after this change we won't, and we shouldn't need to.
Since at it, drop the xbzrle_enabled check in xbzrle_cache_zero_page() because with this change it's not needed anymore.
--- migration/ram.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
migration/ram.c +1 -5
@@ -741,10 +741,6 @@ void mig_throttle_counter_reset(void)*/ static void xbzrle_cache_zero_page (RAMState *rs,ram_addr_t current_addr) { -if (!rs->xbzrle_enabled) { -return ; - } -/* We don't care if this fails to allocate a new cache page * as long as it updated an old one */ cache_insert(XBZRLE.cache, current_addr, XBZRLE.zero_target_page,
@@ -2301,7 +2297,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)/* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale */ -if (!save_page_use_compression (rs)) { +if (rs->xbzrle_enabled) {XBZRLE_cache_lock ();xbzrle_cache_zero_page (rs, block->offset + offset);XBZRLE_cache_unlock ();
Signature · 1 line
2.38.1
PATCH v2 35/51 migration: Trivial cleanup save_page_header() on same block check
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
The 2nd check on RAM_SAVE_FLAG_CONTINUE is a bit redundant. Use a boolean to be clearer.
--- migration/ram.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
migration/ram.c +3 -2
@@ -661,14 +661,15 @@ static size_t save_page_header(RAMState *rs, QEMUFile *f, RAMBlock *block, ram_addr_t offset) {size_t size, len; +bool same_block = (block == rs->last_sent_block); -if (block == rs->last_sent_block) { +if (same_block) { offset |=RAM_SAVE_FLAG_CONTINUE ; }qemu_put_be64 (f, offset); size =8 ; -if (!(offset &RAM_SAVE_FLAG_CONTINUE )) { +if (!same_block) { len =strlen (block->idstr);qemu_put_byte (f, len);qemu_put_buffer (f, (uint8_t *)block->idstr, len);
Signature · 1 line
2.38.1
PATCH v2 36/51 migration: Remove RAMState.f references in compression code
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Removing referencing to RAMState.f in compress_page_with_multi_thread() and flush_compressed_data().
Compression code by default isn't compatible with having >1 channels (or it won't currently know which channel to flush the compressed data), so to make it simple we always flush on the default to_dst_file port until someone wants to add >1 ports support, as rs->f right now can really change (after postcopy preempt is introduced).
There should be no functional change at all after patch applied, since as long as rs->f referenced in compression code, it must be to_dst_file.
--- migration/ram.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
migration/ram.c +7 -5
@@ -1461,6 +1461,7 @@ static bool save_page_use_compression(RAMState *rs);static void flush_compressed_data (RAMState *rs) { +MigrationState *ms =migrate_get_current ();int idx, len, thread_count;if (!save_page_use_compression (rs)) {
@@ -1479,7 +1480,7 @@ static void flush_compressed_data(RAMState *rs)for (idx =0 ; idx < thread_count; idx++) {qemu_mutex_lock (&comp_param[idx].mutex);if (!comp_param[idx].quit) { - len =qemu_put_qemu_file (rs->f, comp_param[idx].file); + len =qemu_put_qemu_file (ms->to_dst_file, comp_param[idx].file);/* * it's safe to fetch zero_page without holding comp_done_lock * as there is no further request submitted to the thread,
@@ -1498,11 +1499,11 @@ static inline void set_compress_params(CompressParam *param, RAMBlock *block, param->offset = offset; } -static int compress_page_with_multi_thread (RAMState *rs,RAMBlock *block, -ram_addr_t offset) +static int compress_page_with_multi_thread (RAMBlock *block,ram_addr_t offset) {int idx, thread_count, bytes_xmit =-1 , pages =-1 ;bool wait =migrate_compress_wait_thread (); +MigrationState *ms =migrate_get_current (); thread_count =migrate_compress_threads ();qemu_mutex_lock (&comp_done_lock);
@@ -1510,7 +1511,8 @@ retry:for (idx =0 ; idx < thread_count; idx++) {if (comp_param[idx].done) { comp_param[idx].done = false; - bytes_xmit =qemu_put_qemu_file (rs->f, comp_param[idx].file); + bytes_xmit =qemu_put_qemu_file (ms->to_dst_file, + comp_param[idx].file);qemu_mutex_lock (&comp_param[idx].mutex);set_compress_params (&comp_param[idx], block, offset);qemu_cond_signal (&comp_param[idx].cond);
@@ -2263,7 +2265,7 @@ static bool save_compress_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)return false; } -if (compress_page_with_multi_thread (rs, block, offset) >0 ) { +if (compress_page_with_multi_thread (block, offset) >0 ) {return true; }
Signature · 1 line
2.38.1
PATCH v2 37/51 migration: Yield bitmap_mutex properly when sending/sleeping
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Don't take the bitmap mutex when sending pages, or when being throttled by migration_rate_limit() (which is a bit tricky to call it here in ram code, but seems still helpful).
It prepares for the possibility of concurrently sending pages in >1 threads using the function ram_save_host_page() because all threads may need the bitmap_mutex to operate on bitmaps, so that either sendmsg() or any kind of qemu_sem_wait() blocking for one thread will not block the other from progressing.
--- migration/ram.c | 46 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 11 deletions(-)
migration/ram.c +35 -11
@@ -2452,9 +2452,14 @@ static void postcopy_preempt_reset_channel(RAMState *rs)* a host page in which case the remainder of the hostpage is sent. * Only dirty target pages are sent. Note that the host page size may * be a huge page for this block. +* * The saving stops at the boundary of the used_length of the block * if the RAMBlock isn't a multiple of the host page size. * +* The caller must be with ram_state.bitmap_mutex held to call this +* function. Note that this function can temporarily release the lock, but +* when the function is returned it'll make sure the lock is still held. +* * Returns the number of pages written or negative on error * * @rs: current RAM state
@@ -2462,6 +2467,7 @@ static void postcopy_preempt_reset_channel(RAMState *rs)*/ static int ram_save_host_page (RAMState *rs,PageSearchStatus *pss) { +bool page_dirty, preempt_active =postcopy_preempt_active ();int tmppages, pages =0 ;size_t pagesize_bits =qemu_ram_pagesize (pss->block) >>TARGET_PAGE_BITS ;
@@ -2485,22 +2491,40 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)break ; } + page_dirty =migration_bitmap_clear_dirty (rs, pss->block, pss->page); +/* Check the pages is dirty and if it is send it */ -if (migration_bitmap_clear_dirty (rs, pss->block, pss->page)) { +if (page_dirty) { +/* +* Properly yield the lock only in postcopy preempt mode +* because both migration thread and rp-return thread can +* operate on the bitmaps. +*/ +if (preempt_active) { +qemu_mutex_unlock (&rs->bitmap_mutex); + } tmppages =ram_save_target_page (rs, pss); -if (tmppages <0 ) { -return tmppages; +if (tmppages >=0 ) { + pages += tmppages; +/* +* Allow rate limiting to happen in the middle of huge pages if +* something is sent in the current iteration. +*/ +if (pagesize_bits >1 && tmppages >0 ) { +migration_rate_limit (); + } } - - pages += tmppages; -/* -* Allow rate limiting to happen in the middle of huge pages if -* something is sent in the current iteration. -*/ -if (pagesize_bits >1 && tmppages >0 ) { -migration_rate_limit (); +if (preempt_active) { +qemu_mutex_lock (&rs->bitmap_mutex); } + }else { + tmppages =0 ; + } + +if (tmppages <0 ) { +return tmppages; } + pss->page =migration_bitmap_find_dirty (rs, pss->block, pss->page); }while ((pss->page < hostpage_boundary) && offset_in_ramblock(pss->block,
Signature · 1 line
2.38.1
PATCH v2 38/51 migration: Use atomic ops properly for page accountings
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
To prepare for thread-safety on page accountings, at least below counters need to be accessed only atomically, they are:
ram_counters.transferred
ram_counters.duplicate
ram_counters.normal
ram_counters.postcopy_bytes
There are a lot of other counters but they won't be accessed outside migration thread, then they're still safe to be accessed without atomic ops.
--- migration/ram.h | 20 ++++++++++++++++++++ migration/migration.c | 10 +++++----- migration/multifd.c | 4 ++-- migration/ram.c | 40 ++++++++++++++++++++++++---------------- 4 files changed, 51 insertions(+), 23 deletions(-)
migration/ram.h +20 -0
@@ -32,7 +32,27 @@#include "qapi/qapi-types-migration.h" #include "exec/cpu-common.h" #include "io/channel.h" +#include "qemu/stats64.h" +/* +* These are the migration statistic counters that need to be updated using +* atomic ops (can be accessed by more than one thread). Here since we +* cannot modify MigrationStats directly to use Stat64 as it was defined in +* the QAPI scheme, we define an internal structure to hold them, and we +* propagate the real values when QMP queries happen. +* +* IOW, the corresponding fields within ram_counters on these specific +* fields will be always zero and not being used at all; they're just +* placeholders to make it QAPI-compatible. +*/ +typedef struct { +Stat64 transferred; +Stat64 duplicate; +Stat64 normal; +Stat64 postcopy_bytes; +}MigrationAtomicStats ; + +extern MigrationAtomicStats ram_atomic_counters;extern MigrationStats ram_counters;extern XBZRLECacheStats xbzrle_counters;extern CompressionStats compression_counters;
migration/migration.c +5 -5
@@ -1049,13 +1049,13 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->has_ram = true; info->ram =g_malloc0 (sizeof (*info->ram)); - info->ram->transferred = ram_counters.transferred; + info->ram->transferred =stat64_get (&ram_atomic_counters.transferred); info->ram->total =ram_bytes_total (); - info->ram->duplicate = ram_counters.duplicate; + info->ram->duplicate =stat64_get (&ram_atomic_counters.duplicate);/* legacy value. It is not used anymore */ info->ram->skipped =0 ; - info->ram->normal = ram_counters.normal; - info->ram->normal_bytes = ram_counters.normal * page_size; + info->ram->normal =stat64_get (&ram_atomic_counters.normal); + info->ram->normal_bytes = info->ram->normal * page_size; info->ram->mbps = s->mbps; info->ram->dirty_sync_count = ram_counters.dirty_sync_count; info->ram->dirty_sync_missed_zero_copy =
@@ -1066,7 +1066,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s) info->ram->pages_per_second = s->pages_per_second; info->ram->precopy_bytes = ram_counters.precopy_bytes; info->ram->downtime_bytes = ram_counters.downtime_bytes; - info->ram->postcopy_bytes = ram_counters.postcopy_bytes; + info->ram->postcopy_bytes =stat64_get (&ram_atomic_counters.postcopy_bytes);if (migrate_use_xbzrle ()) { info->has_xbzrle_cache = true;
migration/multifd.c +2 -2
@@ -432,7 +432,7 @@ static int multifd_send_pages(QEMUFile *f) transferred = ((uint64_t ) pages->num) * p->page_size + p->packet_len;qemu_file_acct_rate_limit (f, transferred); ram_counters.multifd_bytes += transferred; - ram_counters.transferred += transferred; +stat64_add (&ram_atomic_counters.transferred, transferred);qemu_mutex_unlock (&p->mutex);qemu_sem_post (&p->sem);
@@ -624,7 +624,7 @@ int multifd_send_sync_main(QEMUFile *f) p->pending_job++;qemu_file_acct_rate_limit (f, p->packet_len); ram_counters.multifd_bytes += p->packet_len; - ram_counters.transferred += p->packet_len; +stat64_add (&ram_atomic_counters.transferred, p->packet_len);qemu_mutex_unlock (&p->mutex);qemu_sem_post (&p->sem);
migration/ram.c +24 -16
@@ -425,18 +425,25 @@ uint64_t ram_bytes_remaining(void)0 ; } +/* +* NOTE: not all stats in ram_counters are used in reality. See comments +* for struct MigrationAtomicStats. The ultimate result of ram migration +* counters will be a merged version with both ram_counters and the atomic +* fields in ram_atomic_counters. +*/ MigrationStats ram_counters; +MigrationAtomicStats ram_atomic_counters;void ram_transferred_add (uint64_t bytes) {if (runstate_is_running ()) { ram_counters.precopy_bytes += bytes; }else if (migration_in_postcopy ()) { - ram_counters.postcopy_bytes += bytes; +stat64_add (&ram_atomic_counters.postcopy_bytes, bytes); }else { ram_counters.downtime_bytes += bytes; } - ram_counters.transferred += bytes; +stat64_add (&ram_atomic_counters.transferred, bytes); }void dirty_sync_missed_zero_copy (void )
@@ -725,7 +732,7 @@ void mig_throttle_counter_reset(void) rs->time_last_bitmap_sync =qemu_clock_get_ms (QEMU_CLOCK_REALTIME ); rs->num_dirty_pages_period =0 ; - rs->bytes_xfer_prev = ram_counters.transferred; + rs->bytes_xfer_prev =stat64_get (&ram_atomic_counters.transferred); }/**
@@ -1085,8 +1092,9 @@ uint64_t ram_pagesize_summary(void)uint64_t ram_get_total_transferred_pages (void ) { -return ram_counters.normal + ram_counters.duplicate + - compression_counters.pages + xbzrle_counters.pages; +return stat64_get (&ram_atomic_counters.normal) + +stat64_get (&ram_atomic_counters.duplicate) + + compression_counters.pages + xbzrle_counters.pages; }static void migration_update_rates (RAMState *rs,int64_t end_time)
@@ -1145,8 +1153,8 @@ static void migration_trigger_throttle(RAMState *rs) {MigrationState *s =migrate_get_current ();uint64_t threshold = s->parameters.throttle_trigger_threshold; - -uint64_t bytes_xfer_period = ram_counters.transferred - rs->bytes_xfer_prev; +uint64_t bytes_xfer_period = +stat64_get (&ram_atomic_counters.transferred) - rs->bytes_xfer_prev;uint64_t bytes_dirty_period = rs->num_dirty_pages_period *TARGET_PAGE_SIZE ;uint64_t bytes_dirty_threshold = bytes_xfer_period * threshold /100 ;
@@ -1209,7 +1217,7 @@ static void migration_bitmap_sync(RAMState *rs)/* reset period counters */ rs->time_last_bitmap_sync = end_time; rs->num_dirty_pages_period =0 ; - rs->bytes_xfer_prev = ram_counters.transferred; + rs->bytes_xfer_prev =stat64_get (&ram_atomic_counters.transferred); }if (migrate_use_events ()) {qapi_event_send_migration_pass (ram_counters.dirty_sync_count);
@@ -1285,7 +1293,7 @@ static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)int len =save_zero_page_to_file (rs, rs->f, block, offset);if (len) { - ram_counters.duplicate++; +stat64_add (&ram_atomic_counters.duplicate,1 );ram_transferred_add (len);return 1 ; }
@@ -1322,9 +1330,9 @@ static bool control_save_page(RAMState *rs, RAMBlock *block, ram_addr_t offset, }if (bytes_xmit >0 ) { - ram_counters.normal++; +stat64_add (&ram_atomic_counters.normal,1 ); }else if (bytes_xmit ==0 ) { - ram_counters.duplicate++; +stat64_add (&ram_atomic_counters.duplicate,1 ); }return true;
@@ -1354,7 +1362,7 @@ static int save_normal_page(RAMState *rs, RAMBlock *block, ram_addr_t offset,qemu_put_buffer (rs->f, buf,TARGET_PAGE_SIZE ); }ram_transferred_add (TARGET_PAGE_SIZE ); - ram_counters.normal++; +stat64_add (&ram_atomic_counters.normal,1 );return 1 ; }
@@ -1410,7 +1418,7 @@ static int ram_save_multifd_page(RAMState *rs, RAMBlock *block,if (multifd_queue_page (rs->f, block, offset) <0 ) {return -1 ; } - ram_counters.normal++; +stat64_add (&ram_atomic_counters.normal,1 );return 1 ; }
@@ -1448,7 +1456,7 @@ update_compress_thread_counts(const CompressParam *param, int bytes_xmit)ram_transferred_add (bytes_xmit);if (param->zero_page) { - ram_counters.duplicate++; +stat64_add (&ram_atomic_counters.duplicate,1 );return ; }
@@ -2623,9 +2631,9 @@ void acct_update_position(QEMUFile *f, size_t size, bool zero)uint64_t pages = size /TARGET_PAGE_SIZE ;if (zero) { - ram_counters.duplicate += pages; +stat64_add (&ram_atomic_counters.duplicate, pages); }else { - ram_counters.normal += pages; +stat64_add (&ram_atomic_counters.normal, pages);ram_transferred_add (size);qemu_file_credit_transfer (f, size); }
Signature · 1 line
2.38.1
PATCH v2 39/51 migration: Teach PSS about host page
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Migration code has a lot to do with host pages. Teaching PSS core about the idea of host page helps a lot and makes the code clean. Meanwhile, this prepares for the future changes that can leverage the new PSS helpers that this patch introduces to send host page in another thread.
Three more fields are introduced for this:
(1) host_page_sending: this is set to true when QEMU is sending a host page, false otherwise.
(2) host_page_{start|end}: these point to the start/end of host page
we're sending, and it's only valid when host_page_sending==true.
For example, when we look up the next dirty page on the ramblock, with host_page_sending==true, we'll not try to look for anything beyond the current host page boundary. This can be slightly efficient than current code because currently we'll set pss->page to next dirty bit (which can be over current host page boundary) and reset it to host page boundary if we found it goes beyond that.
With above, we can easily make migration_bitmap_find_dirty() self contained by updating pss->page properly. rs* parameter is removed because it's not even used in old code.
When sending a host page, we should use the pss helpers like this:
- pss_host_page_prepare(pss): called before sending host page
- pss_within_range(pss): whether we're still working on the cur host page?
- pss_host_page_finish(pss): called after sending a host page
Then we can use ram_save_target_page() to save one small page.
Currently ram_save_host_page() is still the only user. If there'll be another function to send host page (e.g. in return path thread) in the future, it should follow the same style.
--- migration/ram.c | 95 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 19 deletions(-)
migration/ram.c +76 -19
@@ -481,6 +481,11 @@ struct PageSearchStatus {* postcopy pages via postcopy preempt channel. */ bool postcopy_target_channel; +/* Whether we're sending a host page */ +bool host_page_sending; +/* The start/end of current host page. Only valid if host_page_sending==true */ +unsigned long host_page_start; +unsigned long host_page_end; };typedef struct PageSearchStatus PageSearchStatus ;
@@ -858,26 +863,38 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **current_data, }/** -* migration_bitmap_find_dirty: find the next dirty page from start +* pss_find_next_dirty: find the next dirty page of current ramblock * -* Returns the page offset within memory region of the start of a dirty page +* This function updates pss->page to point to the next dirty page index +* within the ramblock to migrate, or the end of ramblock when nothing +* found. Note that when pss->host_page_sending==true it means we're +* during sending a host page, so we won't look for dirty page that is +* outside the host page boundary. * -* @rs: current RAM state -* @rb: RAMBlock where to search for dirty pages -* @start: page where we start the search +* @pss: the current page search status */ -static inline -unsigned long migration_bitmap_find_dirty (RAMState *rs,RAMBlock *rb, -unsigned long start) +static void pss_find_next_dirty (PageSearchStatus *pss) { +RAMBlock *rb = pss->block;unsigned long size = rb->used_length >>TARGET_PAGE_BITS ;unsigned long *bitmap = rb->bmap;if (ramblock_is_ignored (rb)) { -return size; +/* Points directly to the end, so we know no dirty page */ + pss->page = size; +return ; } -return find_next_bit (bitmap, size, start); +/* +* If during sending a host page, only look for dirty pages within the +* current host page being send. +*/ +if (pss->host_page_sending) { +assert (pss->host_page_end); + size =MIN (size, pss->host_page_end); + } + + pss->page =find_next_bit (bitmap, size, pss->page); } static void migration_clear_memory_region_dirty_bitmap(RAMBlock *rb,
@@ -1563,7 +1580,9 @@ static bool find_dirty_block(RAMState *rs, PageSearchStatus *pss, bool *again) pss->postcopy_requested = false; pss->postcopy_target_channel =RAM_CHANNEL_PRECOPY ; - pss->page =migration_bitmap_find_dirty (rs, pss->block, pss->page); +/* Update pss->page for the next dirty bit in ramblock */ +pss_find_next_dirty (pss); +if (pss->complete_round && pss->block == rs->last_seen_block && pss->page >= rs->last_page) {/*
@@ -2452,6 +2471,44 @@ static void postcopy_preempt_reset_channel(RAMState *rs) } } +/* Should be called before sending a host page */ +static void pss_host_page_prepare (PageSearchStatus *pss) +{ +/* How many guest pages are there in one host page? */ +size_t guest_pfns =qemu_ram_pagesize (pss->block) >>TARGET_PAGE_BITS ; + + pss->host_page_sending = true; + pss->host_page_start =ROUND_DOWN (pss->page, guest_pfns); + pss->host_page_end =ROUND_UP (pss->page +1 , guest_pfns); +} + +/* +* Whether the page pointed by PSS is within the host page being sent. +* Must be called after a previous pss_host_page_prepare(). +*/ +static bool pss_within_range (PageSearchStatus *pss) +{ +ram_addr_t ram_addr; + +assert (pss->host_page_sending); + +/* Over host-page boundary? */ +if (pss->page >= pss->host_page_end) { +return false; + } + + ram_addr = ((ram_addr_t )pss->page) <<TARGET_PAGE_BITS ; + +return offset_in_ramblock (pss->block, ram_addr); +} + +static void pss_host_page_finish (PageSearchStatus *pss) +{ + pss->host_page_sending = false; +/* This is not needed, but just to reset it */ + pss->host_page_start = pss->host_page_end =0 ; +} +/** * ram_save_host_page: save a whole host page *
@@ -2479,8 +2536,6 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)int tmppages, pages =0 ;size_t pagesize_bits =qemu_ram_pagesize (pss->block) >>TARGET_PAGE_BITS ; -unsigned long hostpage_boundary = -QEMU_ALIGN_UP (pss->page +1 , pagesize_bits);unsigned long start_page = pss->page;int res;
@@ -2493,6 +2548,9 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)postcopy_preempt_choose_channel (rs, pss); } +/* Update host page boundary information */ +pss_host_page_prepare (pss); + do { if (postcopy_needs_preempt(rs, pss)) { postcopy_do_preempt(rs, pss);
@@ -2530,15 +2588,14 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss) }if (tmppages <0 ) { +pss_host_page_finish (pss);return tmppages; } - pss->page =migration_bitmap_find_dirty (rs, pss->block, pss->page); - }while ((pss->page < hostpage_boundary) && -offset_in_ramblock (pss->block, - ((ram_addr_t )pss->page) <<TARGET_PAGE_BITS )); -/* The offset we leave with is the min boundary of host page and block */ - pss->page =MIN (pss->page, hostpage_boundary); +pss_find_next_dirty (pss); + }while (pss_within_range (pss)); + +pss_host_page_finish (pss);/* * When with postcopy preempt mode, flush the data as soon as possible for
Signature · 1 line
2.38.1
PATCH v2 40/51 migration: Introduce pss_channel
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Introduce pss_channel for PageSearchStatus, define it as "the migration channel to be used to transfer this host page".
We used to have rs->f, which is a mirror to MigrationState.to_dst_file.
After postcopy preempt initial version, rs->f can be dynamically changed depending on which channel we want to use.
But that later work still doesn't grant full concurrency of sending pages in e.g. different threads, because rs->f can either be the PRECOPY channel or POSTCOPY channel. This needs to be per-thread too.
PageSearchStatus is actually a good piece of struct which we can leverage if we want to have multiple threads sending pages. Sending a single guest page may not make sense, so we make the granule to be "host page", and in the PSS structure we allow specify a QEMUFile* to migrate a specific host page. Then we open the possibility to specify different channels in different threads with different PSS structures.
The PSS prefix can be slightly misleading here because e.g. for the upcoming usage of postcopy channel/thread it's not "searching" (or, scanning) at all but sending the explicit page that was requested. However since PSS existed for some years keep it as-is until someone complains.
This patch mostly (simply) replace rs->f with pss->pss_channel only. No functional change intended for this patch yet. But it does prepare to finally drop rs->f, and make ram_save_guest_page() thread safe.
--- migration/ram.c | 70 +++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 32 deletions(-)
migration/ram.c +38 -32
@@ -453,6 +453,8 @@ void dirty_sync_missed_zero_copy(void)/* used by the search for pages to send */ struct PageSearchStatus { +/* The migration channel used for a specific host page */ +QEMUFile *pss_channel;/* Current block being searched */ RAMBlock *block;/* Current page to search from */
@@ -775,9 +777,9 @@ static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr)* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_xbzrle_page (RAMState *rs,uint8_t **current_data, -ram_addr_t current_addr,RAMBlock *block, -ram_addr_t offset) +static int save_xbzrle_page (RAMState *rs,QEMUFile *file, +uint8_t **current_data,ram_addr_t current_addr, +RAMBlock *block,ram_addr_t offset) {int encoded_len =0 , bytes_xbzrle;uint8_t *prev_cached_page;
@@ -845,11 +847,11 @@ static int save_xbzrle_page(RAMState *rs, uint8_t **current_data, }/* Send XBZRLE based compressed page */ - bytes_xbzrle =save_page_header (rs, rs->f, block, + bytes_xbzrle =save_page_header (rs, file, block, offset |RAM_SAVE_FLAG_XBZRLE ); -qemu_put_byte (rs->f,ENCODING_FLAG_XBZRLE ); -qemu_put_be16 (rs->f, encoded_len); -qemu_put_buffer (rs->f,XBZRLE .encoded_buf, encoded_len); +qemu_put_byte (file,ENCODING_FLAG_XBZRLE ); +qemu_put_be16 (file, encoded_len); +qemu_put_buffer (file,XBZRLE .encoded_buf, encoded_len); bytes_xbzrle += encoded_len +1 +2 ;/* * Like compressed_size (please see update_compress_thread_counts),
@@ -1305,9 +1307,10 @@ static int save_zero_page_to_file(RAMState *rs, QEMUFile *file,* @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page (RAMState *rs,RAMBlock *block,ram_addr_t offset) +static int save_zero_page (RAMState *rs,QEMUFile *file,RAMBlock *block, +ram_addr_t offset) { -int len =save_zero_page_to_file (rs, rs->f, block, offset); +int len =save_zero_page_to_file (rs, file, block, offset);if (len) {stat64_add (&ram_atomic_counters.duplicate,1 );
@@ -1324,15 +1327,15 @@ static int save_zero_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)* * Return true if the pages has been saved, otherwise false is returned. */ -static bool control_save_page (RAMState *rs,RAMBlock *block,ram_addr_t offset, -int *pages) +static bool control_save_page (PageSearchStatus *pss,RAMBlock *block, +ram_addr_t offset,int *pages) {uint64_t bytes_xmit =0 ;int ret; *pages =-1 ; - ret =ram_control_save_page (rs->f, block->offset, offset,TARGET_PAGE_SIZE , - &bytes_xmit); + ret =ram_control_save_page (pss->pss_channel, block->offset, offset, +TARGET_PAGE_SIZE , &bytes_xmit);if (ret ==RAM_SAVE_CONTROL_NOT_SUPP ) {return false; }
@@ -1366,17 +1369,17 @@ static bool control_save_page(RAMState *rs, RAMBlock *block, ram_addr_t offset,* @buf: the page to be sent * @async: send to page asyncly */ -static int save_normal_page (RAMState *rs,RAMBlock *block,ram_addr_t offset, -uint8_t *buf,bool async) +static int save_normal_page (RAMState *rs,QEMUFile *file,RAMBlock *block, +ram_addr_t offset,uint8_t *buf,bool async) { -ram_transferred_add (save_page_header (rs, rs->f, block, +ram_transferred_add (save_page_header (rs, file, block, offset |RAM_SAVE_FLAG_PAGE ));if (async) { -qemu_put_buffer_async (rs->f, buf,TARGET_PAGE_SIZE , +qemu_put_buffer_async (file, buf,TARGET_PAGE_SIZE ,migrate_release_ram () &&migration_in_postcopy ()); }else { -qemu_put_buffer (rs->f, buf,TARGET_PAGE_SIZE ); +qemu_put_buffer (file, buf,TARGET_PAGE_SIZE ); }ram_transferred_add (TARGET_PAGE_SIZE );stat64_add (&ram_atomic_counters.normal,1 );
@@ -1409,8 +1412,8 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)XBZRLE_cache_lock ();if (rs->xbzrle_enabled && !migration_in_postcopy ()) { - pages =save_xbzrle_page (rs, &p, current_addr, block, - offset); + pages =save_xbzrle_page (rs, pss->pss_channel, &p, current_addr, + block, offset);if (!rs->last_stage) {/* Can't send this cached data async, since the cache page * might get updated before it gets to the wire
@@ -1421,7 +1424,8 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)/* XBZRLE overflow or normal page */ if (pages ==-1 ) { - pages =save_normal_page (rs, block, offset, p, send_async); + pages =save_normal_page (rs, pss->pss_channel, block, offset, + p, send_async); }XBZRLE_cache_unlock ();
@@ -1429,10 +1433,10 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)return pages; } -static int ram_save_multifd_page (RAMState *rs,RAMBlock *block, +static int ram_save_multifd_page (QEMUFile *file,RAMBlock *block,ram_addr_t offset) { -if (multifd_queue_page (rs->f, block, offset) <0 ) { +if (multifd_queue_page (file, block, offset) <0 ) {return -1 ; }stat64_add (&ram_atomic_counters.normal,1 );
@@ -1727,7 +1731,7 @@ static int ram_save_release_protection(RAMState *rs, PageSearchStatus *pss,uint64_t run_length = (pss->page - start_page) <<TARGET_PAGE_BITS ;/* Flush async buffers before un-protect. */ -qemu_fflush (rs->f); +qemu_fflush (pss->pss_channel);/* Un-protect memory range. */ res =uffd_change_protection (rs->uffdio_fd, page_address, run_length, false, false);
@@ -2314,7 +2318,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)ram_addr_t offset = ((ram_addr_t )pss->page) <<TARGET_PAGE_BITS ;int res; -if (control_save_page (rs, block, offset, &res)) { +if (control_save_page (pss, block, offset, &res)) {return res; }
@@ -2322,7 +2326,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)return 1 ; } - res =save_zero_page (rs, block, offset); + res =save_zero_page (rs, pss->pss_channel, block, offset);if (res >0 ) {/* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale
@@ -2342,7 +2346,7 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)* still see partially copied pages which is data corruption. */ if (migrate_use_multifd () && !migration_in_postcopy ()) { -return ram_save_multifd_page (rs, block, offset); +return ram_save_multifd_page (pss->pss_channel, block, offset); }return ram_save_page (rs, pss);
@@ -2544,10 +2548,6 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)return 0 ; } -if (postcopy_preempt_active ()) { -postcopy_preempt_choose_channel (rs, pss); - } -/* Update host page boundary information */ pss_host_page_prepare (pss);
@@ -2607,7 +2607,7 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)* explicit flush or it won't flush until the buffer is full. */ if (migrate_postcopy_preempt () && pss->postcopy_requested) { -qemu_fflush (rs->f); +qemu_fflush (pss->pss_channel); } res =ram_save_release_protection (rs, pss, start_page);
@@ -2673,6 +2673,12 @@ static int ram_find_and_save_block(RAMState *rs) }if (found) { +/* Update rs->f with correct channel */ +if (postcopy_preempt_active ()) { +postcopy_preempt_choose_channel (rs, &pss); + } +/* Cache rs->f in pss_channel (TODO: remove rs->f) */ + pss.pss_channel = rs->f; pages =ram_save_host_page (rs, &pss); } }while (!pages && again);
Signature · 1 line
2.38.1
PATCH v2 41/51 migration: Add pss_init()
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Helper to init PSS structures.
--- migration/ram.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
migration/ram.c +9 -3
@@ -542,6 +542,14 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block,static void postcopy_preempt_restore (RAMState *rs,PageSearchStatus *pss,bool postcopy_requested); +/* NOTE: page is the PFN not real ram_addr_t. */ +static void pss_init (PageSearchStatus *pss,RAMBlock *rb,ram_addr_t page) +{ + pss->block = rb; + pss->page = page; + pss->complete_round = false; +} +static void *do_data_compress (void *opaque) {CompressParam *param = opaque;
@@ -2650,9 +2658,7 @@ static int ram_find_and_save_block(RAMState *rs) rs->last_page =0 ; } - pss.block = rs->last_seen_block; - pss.page = rs->last_page; - pss.complete_round = false; +pss_init (&pss, rs->last_seen_block, rs->last_page); do { again = true;
Signature · 1 line
2.38.1
PATCH v2 42/51 migration: Make PageSearchStatus part of RAMState
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
We used to allocate PSS structure on the stack for precopy when sending pages. Make it static, so as to describe per-channel ram migration status.
Here we declared RAM_CHANNEL_MAX instances, preparing for postcopy to use it, even though this patch has not yet to start using the 2nd instance.
This should not have any functional change per se, but it already starts to export PSS information via the RAMState, so that e.g. one PSS channel can start to reference the other PSS channel.
Always protect PSS access using the same RAMState.bitmap_mutex. We already do so, so no code change needed, just some comment update. Maybe we should consider renaming bitmap_mutex some day as it's going to be a more commonly and big mutex we use for ram states, but just leave it for later.
--- migration/ram.c | 112 ++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 51 deletions(-)
migration/ram.c +61 -51
@@ -85,6 +85,46 @@XBZRLECacheStats xbzrle_counters; +/* used by the search for pages to send */ +struct PageSearchStatus { +/* The migration channel used for a specific host page */ +QEMUFile *pss_channel; +/* Current block being searched */ +RAMBlock *block; +/* Current page to search from */ +unsigned long page; +/* Set once we wrap around */ +bool complete_round; +/* +* [POSTCOPY-ONLY] Whether current page is explicitly requested by +* postcopy. When set, the request is "urgent" because the dest QEMU +* threads are waiting for us. +*/ +bool postcopy_requested; +/* +* [POSTCOPY-ONLY] The target channel to use to send current page. +* +* Note: This may _not_ match with the value in postcopy_requested +* above. Let's imagine the case where the postcopy request is exactly +* the page that we're sending in progress during precopy. In this case +* we'll have postcopy_requested set to true but the target channel +* will be the precopy channel (so that we don't split brain on that +* specific page since the precopy channel already contains partial of +* that page data). +* +* Besides that specific use case, postcopy_target_channel should +* always be equal to postcopy_requested, because by default we send +* postcopy pages via postcopy preempt channel. +*/ +bool postcopy_target_channel; +/* Whether we're sending a host page */ +bool host_page_sending; +/* The start/end of current host page. Invalid if host_page_sending==false */ +unsigned long host_page_start; +unsigned long host_page_end; +}; +typedef struct PageSearchStatus PageSearchStatus ; +/* struct contains XBZRLE cache and a static page used by the compression */ static struct {
@@ -319,6 +359,11 @@ typedef struct {struct RAMState {/* QEMUFile used for this migration */ QEMUFile *f; +/* +* PageSearchStatus structures for the channels when send pages. +* Protected by the bitmap_mutex. +*/ +PageSearchStatus pss[RAM_CHANNEL_MAX ];/* UFFD file descriptor, used in 'write-tracking' migration */ int uffdio_fd;/* Last block that we have visited searching for dirty pages */
@@ -362,7 +407,12 @@ struct RAMState {uint64_t target_page_count;/* number of dirty bits in the bitmap */ uint64_t migration_dirty_pages; -/* Protects modification of the bitmap and migration dirty pages */ +/* +* Protects: +* - dirty/clear bitmap +* - migration_dirty_pages +* - pss structures +*/ QemuMutex bitmap_mutex;/* The RAMBlock used in the last src_page_requests */ RAMBlock *last_req_rb;
@@ -451,46 +501,6 @@ void dirty_sync_missed_zero_copy(void) ram_counters.dirty_sync_missed_zero_copy++; } -/* used by the search for pages to send */ -struct PageSearchStatus { -/* The migration channel used for a specific host page */ -QEMUFile *pss_channel; -/* Current block being searched */ -RAMBlock *block; -/* Current page to search from */ -unsigned long page; -/* Set once we wrap around */ -bool complete_round; -/* -* [POSTCOPY-ONLY] Whether current page is explicitly requested by -* postcopy. When set, the request is "urgent" because the dest QEMU -* threads are waiting for us. -*/ -bool postcopy_requested; -/* -* [POSTCOPY-ONLY] The target channel to use to send current page. -* -* Note: This may _not_ match with the value in postcopy_requested -* above. Let's imagine the case where the postcopy request is exactly -* the page that we're sending in progress during precopy. In this case -* we'll have postcopy_requested set to true but the target channel -* will be the precopy channel (so that we don't split brain on that -* specific page since the precopy channel already contains partial of -* that page data). -* -* Besides that specific use case, postcopy_target_channel should -* always be equal to postcopy_requested, because by default we send -* postcopy pages via postcopy preempt channel. -*/ -bool postcopy_target_channel; -/* Whether we're sending a host page */ -bool host_page_sending; -/* The start/end of current host page. Only valid if host_page_sending==true */ -unsigned long host_page_start; -unsigned long host_page_end; -}; -typedef struct PageSearchStatus PageSearchStatus ; -CompressionStats compression_counters;struct CompressParam {
@@ -2637,7 +2647,7 @@ static int ram_save_host_page(RAMState *rs, PageSearchStatus *pss)*/ static int ram_find_and_save_block (RAMState *rs) { -PageSearchStatus pss; +PageSearchStatus *pss = &rs->pss[RAM_CHANNEL_PRECOPY ];int pages =0 ;bool again, found;
@@ -2658,11 +2668,11 @@ static int ram_find_and_save_block(RAMState *rs) rs->last_page =0 ; } -pss_init (&pss, rs->last_seen_block, rs->last_page); +pss_init (pss, rs->last_seen_block, rs->last_page); do { again = true; - found = get_queued_page(rs, &pss); + found = get_queued_page(rs, pss); if (!found) { /*
@@ -2670,27 +2680,27 @@ static int ram_find_and_save_block(RAMState *rs)* preempted precopy. Otherwise find the next dirty bit. */ if (postcopy_preempt_triggered (rs)) { -postcopy_preempt_restore (rs, &pss, false); +postcopy_preempt_restore (rs, pss, false); found = true; }else {/* priority queue empty, so just search for something dirty */ - found =find_dirty_block (rs, &pss, &again); + found =find_dirty_block (rs, pss, &again); } }if (found) {/* Update rs->f with correct channel */ if (postcopy_preempt_active ()) { -postcopy_preempt_choose_channel (rs, &pss); +postcopy_preempt_choose_channel (rs, pss); }/* Cache rs->f in pss_channel (TODO: remove rs->f) */ - pss.pss_channel = rs->f; - pages =ram_save_host_page (rs, &pss); + pss->pss_channel = rs->f; + pages =ram_save_host_page (rs, pss); } }while (!pages && again); - rs->last_seen_block = pss.block; - rs->last_page = pss.page; + rs->last_seen_block = pss->block; + rs->last_page = pss->page;return pages; }
Signature · 1 line
2.38.1
PATCH v2 43/51 migration: Move last_sent_block into PageSearchStatus
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Since we use PageSearchStatus to represent a channel, it makes perfect sense to keep last_sent_block (aka, leverage RAM_SAVE_FLAG_CONTINUE) to be per-channel rather than global because each channel can be sending different pages on ramblocks.
Hence move it from RAMState into PageSearchStatus.
--- migration/ram.c | 71 ++++++++++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 30 deletions(-)
migration/ram.c +41 -30
@@ -89,6 +89,8 @@ XBZRLECacheStats xbzrle_counters;struct PageSearchStatus {/* The migration channel used for a specific host page */ QEMUFile *pss_channel; +/* Last block from where we have sent data */ +RAMBlock *last_sent_block;/* Current block being searched */ RAMBlock *block;/* Current page to search from */
@@ -368,8 +370,6 @@ struct RAMState {int uffdio_fd;/* Last block that we have visited searching for dirty pages */ RAMBlock *last_seen_block; -/* Last block from where we have sent data */ -RAMBlock *last_sent_block;/* Last dirty target page we have sent */ ram_addr_t last_page;/* last ram version we have seen */
@@ -684,16 +684,17 @@ exit:* * Returns the number of bytes written * -* @f: QEMUFile where to send the data +* @pss: current PSS channel status * @block: block that contains the page we want to send * @offset: offset inside the block for the page * in the lower bits, it contains flags */ -static size_t save_page_header (RAMState *rs,QEMUFile *f,RAMBlock *block, +static size_t save_page_header (PageSearchStatus *pss,RAMBlock *block,ram_addr_t offset) {size_t size, len; -bool same_block = (block == rs->last_sent_block); +bool same_block = (block == pss->last_sent_block); +QEMUFile *f = pss->pss_channel;if (same_block) { offset |=RAM_SAVE_FLAG_CONTINUE ;
@@ -706,7 +707,7 @@ static size_t save_page_header(RAMState *rs, QEMUFile *f, RAMBlock *block,qemu_put_byte (f, len);qemu_put_buffer (f, (uint8_t *)block->idstr, len); size +=1 + len; - rs->last_sent_block = block; + pss->last_sent_block = block; }return size; }
@@ -790,17 +791,19 @@ static void xbzrle_cache_zero_page(RAMState *rs, ram_addr_t current_addr)* -1 means that xbzrle would be longer than normal * * @rs: current RAM state +* @pss: current PSS channel * @current_data: pointer to the address of the page contents * @current_addr: addr of the page * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_xbzrle_page (RAMState *rs,QEMUFile *file, +static int save_xbzrle_page (RAMState *rs,PageSearchStatus *pss,uint8_t **current_data,ram_addr_t current_addr,RAMBlock *block,ram_addr_t offset) {int encoded_len =0 , bytes_xbzrle;uint8_t *prev_cached_page; +QEMUFile *file = pss->pss_channel;if (!cache_is_cached (XBZRLE .cache, current_addr, ram_counters.dirty_sync_count)) {
@@ -865,7 +868,7 @@ static int save_xbzrle_page(RAMState *rs, QEMUFile *file, }/* Send XBZRLE based compressed page */ - bytes_xbzrle =save_page_header (rs, file, block, + bytes_xbzrle =save_page_header (pss, block, offset |RAM_SAVE_FLAG_XBZRLE );qemu_put_byte (file,ENCODING_FLAG_XBZRLE );qemu_put_be16 (file, encoded_len);
@@ -1296,19 +1299,19 @@ void ram_release_page(const char *rbname, uint64_t offset)* Returns the size of data written to the file, 0 means the page is not * a zero page * -* @rs: current RAM state -* @file: the file where the data is saved +* @pss: current PSS channel * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page_to_file (RAMState *rs,QEMUFile *file, +static int save_zero_page_to_file (PageSearchStatus *pss,RAMBlock *block,ram_addr_t offset) {uint8_t *p = block->host + offset; +QEMUFile *file = pss->pss_channel;int len =0 ;if (buffer_is_zero (p,TARGET_PAGE_SIZE )) { - len +=save_page_header (rs, file, block, offset |RAM_SAVE_FLAG_ZERO ); + len +=save_page_header (pss, block, offset |RAM_SAVE_FLAG_ZERO );qemu_put_byte (file,0 ); len +=1 ;ram_release_page (block->idstr, offset);
@@ -1321,14 +1324,14 @@ static int save_zero_page_to_file(RAMState *rs, QEMUFile *file,* * Returns the number of pages written. * -* @rs: current RAM state +* @pss: current PSS channel * @block: block that contains the page we want to send * @offset: offset inside the block for the page */ -static int save_zero_page (RAMState *rs,QEMUFile *file,RAMBlock *block, +static int save_zero_page (PageSearchStatus *pss,RAMBlock *block,ram_addr_t offset) { -int len =save_zero_page_to_file (rs, file, block, offset); +int len =save_zero_page_to_file (pss, block, offset);if (len) {stat64_add (&ram_atomic_counters.duplicate,1 );
@@ -1381,16 +1384,18 @@ static bool control_save_page(PageSearchStatus *pss, RAMBlock *block,* * Returns the number of pages written. * -* @rs: current RAM state +* @pss: current PSS channel * @block: block that contains the page we want to send * @offset: offset inside the block for the page * @buf: the page to be sent * @async: send to page asyncly */ -static int save_normal_page (RAMState *rs,QEMUFile *file,RAMBlock *block, +static int save_normal_page (PageSearchStatus *pss,RAMBlock *block,ram_addr_t offset,uint8_t *buf,bool async) { -ram_transferred_add (save_page_header (rs, file, block, +QEMUFile *file = pss->pss_channel; + +ram_transferred_add (save_page_header (pss, block, offset |RAM_SAVE_FLAG_PAGE ));if (async) { qemu_put_buffer_async(file, buf, TARGET_PAGE_SIZE,
@@ -1430,7 +1435,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)XBZRLE_cache_lock ();if (rs->xbzrle_enabled && !migration_in_postcopy ()) { - pages =save_xbzrle_page (rs, pss->pss_channel, &p, current_addr, + pages =save_xbzrle_page (rs, pss, &p, current_addr, block, offset);if (!rs->last_stage) {/* Can't send this cached data async, since the cache page
@@ -1442,8 +1447,7 @@ static int ram_save_page(RAMState *rs, PageSearchStatus *pss)/* XBZRLE overflow or normal page */ if (pages ==-1 ) { - pages =save_normal_page (rs, pss->pss_channel, block, offset, - p, send_async); + pages =save_normal_page (pss, block, offset, p, send_async); }XBZRLE_cache_unlock ();
@@ -1466,14 +1470,15 @@ static bool do_compress_ram_page(QEMUFile *f, z_stream *stream, RAMBlock *block, ram_addr_t offset, uint8_t *source_buf) { RAMState *rs = ram_state; +PageSearchStatus *pss = &rs->pss[RAM_CHANNEL_PRECOPY ];uint8_t *p = block->host + offset;int ret; -if (save_zero_page_to_file (rs, f, block, offset)) { +if (save_zero_page_to_file (pss, block, offset)) {return true; } -save_page_header (rs, f, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE ); +save_page_header (pss, block, offset |RAM_SAVE_FLAG_COMPRESS_PAGE );/* * copy it to a internal buffer to avoid it being modified by VM
@@ -2293,7 +2298,8 @@ static bool save_page_use_compression(RAMState *rs)* has been properly handled by compression, otherwise needs other * paths to handle it */ -static bool save_compress_page (RAMState *rs,RAMBlock *block,ram_addr_t offset) +static bool save_compress_page (RAMState *rs,PageSearchStatus *pss, +RAMBlock *block,ram_addr_t offset) {if (!save_page_use_compression (rs)) {return false;
@@ -2309,7 +2315,7 @@ static bool save_compress_page(RAMState *rs, RAMBlock *block, ram_addr_t offset)* We post the fist page as normal page as compression will take * much CPU resource. */ -if (block != rs->last_sent_block) { +if (block != pss->last_sent_block) {flush_compressed_data (rs);return false; }
@@ -2340,11 +2346,11 @@ static int ram_save_target_page(RAMState *rs, PageSearchStatus *pss)return res; } -if (save_compress_page (rs, block, offset)) { +if (save_compress_page (rs, pss, block, offset)) {return 1 ; } - res =save_zero_page (rs, pss->pss_channel, block, offset); + res =save_zero_page (pss, block, offset);if (res >0 ) {/* Must let xbzrle know, otherwise a previous (now 0'd) cached * page would be stale
@@ -2475,7 +2481,7 @@ static void postcopy_preempt_choose_channel(RAMState *rs, PageSearchStatus *pss)* If channel switched, reset last_sent_block since the old sent block * may not be on the same channel. */ - rs->last_sent_block =NULL ; + pss->last_sent_block =NULL ;trace_postcopy_preempt_switch_channel (channel); }
@@ -2814,8 +2820,13 @@ static void ram_save_cleanup(void *opaque)static void ram_state_reset (RAMState *rs) { +int i; + +for (i =0 ; i <RAM_CHANNEL_MAX ; i++) { + rs->pss[i].last_sent_block =NULL ; + } + rs->last_seen_block =NULL ; - rs->last_sent_block =NULL ; rs->last_page =0 ; rs->last_version = ram_list.version; rs->xbzrle_enabled = false;
@@ -3009,8 +3020,8 @@ void ram_postcopy_send_discard_bitmap(MigrationState *ms)migration_bitmap_sync (rs);/* Easiest way to make sure we don't resume in the middle of a host-page */ + rs->pss[RAM_CHANNEL_PRECOPY ].last_sent_block =NULL ; rs->last_seen_block =NULL ; - rs->last_sent_block =NULL ; rs->last_page =0 ;postcopy_each_ram_send_discard (ms);
Signature · 1 line
2.38.1
PATCH v2 44/51 migration: Send requested page directly in rp-return thread
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
With all the facilities ready, send the requested page directly in the rp-return thread rather than queuing it in the request queue, if and only if postcopy preempt is enabled. It can achieve so because it uses separate channel for sending urgent pages. The only shared data is bitmap and it's protected by the bitmap_mutex.
Note that since we're moving the ownership of the urgent channel from the migration thread to rp thread it also means the rp thread is responsible for managing the qemufile, e.g. properly close it when pausing migration happens. For this, let migration_release_from_dst_file to cover shutdown of the urgent channel too, renaming it as migration_release_dst_files() to better show what it does.
--- migration/migration.c | 35 +++++++------ migration/ram.c | 112 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 16 deletions(-)
migration/migration.c +19 -16
@@ -2848,8 +2848,11 @@ static int migrate_handle_rp_resume_ack(MigrationState *s, uint32_t value)return 0 ; } -/* Release ms->rp_state.from_dst_file in a safe way */ -static void migration_release_from_dst_file (MigrationState *ms) +/* +* Release ms->rp_state.from_dst_file (and postcopy_qemufile_src if +* existed) in a safe way. +*/ +static void migration_release_dst_files (MigrationState *ms) {QEMUFile *file;
@@ -2862,6 +2865,18 @@ static void migration_release_from_dst_file(MigrationState *ms) ms->rp_state.from_dst_file =NULL ; } +/* +* Do the same to postcopy fast path socket too if there is. No +* locking needed because this qemufile should only be managed by +* return path thread. +*/ +if (ms->postcopy_qemufile_src) { +migration_ioc_unregister_yank_from_file (ms->postcopy_qemufile_src); +qemu_file_shutdown (ms->postcopy_qemufile_src); +qemu_fclose (ms->postcopy_qemufile_src); + ms->postcopy_qemufile_src =NULL ; + } +qemu_fclose (file); }
@@ -3006,7 +3021,7 @@ out:* Maybe there is something we can do: it looks like a * network down issue, and we pause for a recovery. */ -migration_release_from_dst_file (ms); +migration_release_dst_files (ms); rp =NULL ;if (postcopy_pause_return_path_thread (ms)) {/*
@@ -3024,7 +3039,7 @@ out: }trace_source_return_path_thread_end (); -migration_release_from_dst_file (ms); +migration_release_dst_files (ms);rcu_unregister_thread ();return NULL ; }
@@ -3547,18 +3562,6 @@ static MigThrError postcopy_pause(MigrationState *s)qemu_file_shutdown (file);qemu_fclose (file); -/* -* Do the same to postcopy fast path socket too if there is. No -* locking needed because no racer as long as we do this before setting -* status to paused. -*/ -if (s->postcopy_qemufile_src) { -migration_ioc_unregister_yank_from_file (s->postcopy_qemufile_src); -qemu_file_shutdown (s->postcopy_qemufile_src); -qemu_fclose (s->postcopy_qemufile_src); - s->postcopy_qemufile_src =NULL ; - } -migrate_set_state (&s->state, s->state,MIGRATION_STATUS_POSTCOPY_PAUSED );
migration/ram.c +112 -0
136 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH v2 45/51 migration: Remove old preempt code around state maintainance
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
With the new code to send pages in rp-return thread, there's little help to keep lots of the old code on maintaining the preempt state in migration thread, because the new way should always be faster..
Then if we'll always send pages in the rp-return thread anyway, we don't need those logic to maintain preempt state anymore because now we serialize things using the mutex directly instead of using those fields.
It's very unfortunate to have those code for a short period, but that's still one intermediate step that we noticed the next bottleneck on the migration thread. Now what we can do best is to drop unnecessary code as long as the new code is stable to reduce the burden. It's actually a good thing because the new "sending page in rp-return thread" model is (IMHO) even cleaner and with better performance.
Remove the old code that was responsible for maintaining preempt states, at the meantime also remove x-postcopy-preempt-break-huge parameter because with concurrent sender threads we don't really need to break-huge anymore.
--- migration/migration.h | 7 - migration/migration.c | 2 - migration/ram.c | 291 +----------------------------------------- 3 files changed, 3 insertions(+), 297 deletions(-)
migration/migration.h +0 -7
@@ -340,13 +340,6 @@ struct MigrationState {bool send_configuration;/* Whether we send section footer during migration */ bool send_section_footer; -/* -* Whether we allow break sending huge pages when postcopy preempt is -* enabled. When disabled, we won't interrupt precopy within sending a -* host huge page, which is the old behavior of vanilla postcopy. -* NOTE: this parameter is ignored if postcopy preempt is not enabled. -*/ -bool postcopy_preempt_break_huge;/* Needed by postcopy-pause state */ QemuSemaphore postcopy_pause_sem;
migration/migration.c +0 -2
@@ -4402,8 +4402,6 @@ static Property migration_properties[] = {DEFINE_PROP_SIZE ("announce-step" , MigrationState, parameters.announce_step,DEFAULT_MIGRATE_ANNOUNCE_STEP ), -DEFINE_PROP_BOOL ("x-postcopy-preempt-break-huge" , MigrationState, - postcopy_preempt_break_huge, true),DEFINE_PROP_STRING ("tls-creds" , MigrationState, parameters.tls_creds),DEFINE_PROP_STRING ("tls-hostname" , MigrationState, parameters.tls_hostname), DEFINE_PROP_STRING("tls-authz", MigrationState, parameters.tls_authz),
migration/ram.c +3 -288
396 lines not on this page · raw message
Signature · 1 line
2.38.1
PATCH v2 46/51 migration: Drop rs->f
In reply to Juan QuintelaFrom: Peter Xu <[email protected]>
Now with rs->pss we can already cache channels in pss->pss_channels. That pss_channel contains more infromation than rs->f because it's per-channel. So rs->f could be replaced by rss->pss[RAM_CHANNEL_PRECOPY].pss_channel, while rs->f itself is a bit vague now.
Note that vanilla postcopy still send pages via pss[RAM_CHANNEL_PRECOPY], that's slightly confusing but it reflects the reality.
Then, after the replacement we can safely drop rs->f.
--- migration/ram.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
migration/ram.c +4 -8
@@ -323,8 +323,6 @@ struct RAMSrcPageRequest {/* State of RAM for migration */ struct RAMState { -/* QEMUFile used for this migration */ -QEMUFile *f;/* * PageSearchStatus structures for the channels when send pages. * Protected by the bitmap_mutex.
@@ -2532,8 +2530,6 @@ static int ram_find_and_save_block(RAMState *rs) }if (found) { -/* Cache rs->f in pss_channel (TODO: remove rs->f) */ - pss->pss_channel = rs->f; pages =ram_save_host_page (rs, pss); } }while (!pages && again);
@@ -3089,7 +3085,7 @@ static void ram_state_resume_prepare(RAMState *rs, QEMUFile *out)ram_state_reset (rs);/* Update RAMState cache of output QEMUFile */ - rs->f = out; + rs->pss[RAM_CHANNEL_PRECOPY ].pss_channel = out;trace_ram_state_resume_prepare (pages); }
@@ -3180,7 +3176,7 @@ static int ram_save_setup(QEMUFile *f, void *opaque)return -1 ; } } - (*rsp)->f = f; + (*rsp)->pss[RAM_CHANNEL_PRECOPY ].pss_channel = f; WITH_RCU_READ_LOCK_GUARD() {qemu_put_be64 (f,ram_bytes_total_common (true) |RAM_SAVE_FLAG_MEM_SIZE );
@@ -3315,7 +3311,7 @@ static int ram_save_iterate(QEMUFile *f, void *opaque) out:if (ret >=0 &&migration_is_setup_or_active (migrate_get_current ()->state)) { - ret =multifd_send_sync_main (rs->f); + ret =multifd_send_sync_main (rs->pss[RAM_CHANNEL_PRECOPY ].pss_channel);if (ret <0 ) {return ret; }
@@ -3385,7 +3381,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)return ret; } - ret =multifd_send_sync_main (rs->f); + ret =multifd_send_sync_main (rs->pss[RAM_CHANNEL_PRECOPY ].pss_channel);if (ret <0 ) {return ret; }
Signature · 1 line
2.38.1
PATCH v2 47/51 migration: Remove res_compatible parameter
In reply to Juan QuintelaIt was only used for RAM, and in that case, it means that this amount of data was sent for memory. Just delete the field in all callers.
--- include/migration/register.h | 20 ++++++++++---------- migration/savevm.h | 4 +--- hw/s390x/s390-stattrib.c | 6 ++---- hw/vfio/migration.c | 10 ++++------ migration/block-dirty-bitmap.c | 7 +++---- migration/block.c | 7 +++---- migration/migration.c | 9 ++++----- migration/ram.c | 8 +++----- migration/savevm.c | 14 +++++--------- hw/vfio/trace-events | 2 +- migration/trace-events | 2 +- 11 files changed, 37 insertions(+), 52 deletions(-)
include/migration/register.h +10 -10
@@ -48,18 +48,18 @@ typedef struct SaveVMHandlers {int (*save_setup)(QEMUFile *f,void *opaque);void (*save_live_pending)(QEMUFile *f,void *opaque,uint64_t threshold_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only); +uint64_t *rest_precopy, +uint64_t *rest_postcopy);/* Note for save_live_pending: -* - res_precopy_only is for data which must be migrated in precopy phase -* or in stopped state, in other words - before target vm start -* - res_compatible is for data which may be migrated in any phase -* - res_postcopy_only is for data which must be migrated in postcopy phase -* or in stopped state, in other words - after source vm stop +* - res_precopy is for data which must be migrated in precopy +* phase or in stopped state, in other words - before target +* vm start +* - res_postcopy is for data which must be migrated in postcopy +* phase or in stopped state, in other words - after source vm +* stop * -* Sum of res_postcopy_only, res_compatible and res_postcopy_only is the -* whole amount of pending data. +* Sum of res_precopy and res_postcopy is the whole amount of +* pending data. */
migration/savevm.h +1 -3
@@ -41,9 +41,7 @@ void qemu_savevm_state_complete_postcopy(QEMUFile *f);int qemu_savevm_state_complete_precopy (QEMUFile *f,bool iterable_only,bool inactivate_disks);void qemu_savevm_state_pending (QEMUFile *f,uint64_t max_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only); +uint64_t *res_precopy,uint64_t *res_postcopy);void qemu_savevm_send_ping (QEMUFile *f,uint32_t value);void qemu_savevm_send_open_return_path (QEMUFile *f);int qemu_savevm_send_packaged (QEMUFile *f,const uint8_t *buf,size_t len);
hw/s390x/s390-stattrib.c +2 -4
@@ -183,16 +183,14 @@ static int cmma_save_setup(QEMUFile *f, void *opaque) }static void cmma_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only) +uint64_t *res_precopy,uint64_t *res_postcopy) {S390StAttribState *sas =S390_STATTRIB (opaque);S390StAttribClass *sac =S390_STATTRIB_GET_CLASS (sas);long long res = sac->get_dirtycount (sas);if (res >=0 ) { - *res_precopy_only += res; + *res_precopy += res; } }
hw/vfio/migration.c +4 -6
@@ -458,9 +458,8 @@ static void vfio_save_cleanup(void *opaque)static void vfio_save_pending (QEMUFile *f,void *opaque,uint64_t threshold_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only) +uint64_t *res_precopy, +uint64_t *res_postcopy) {VFIODevice *vbasedev = opaque;VFIOMigration *migration = vbasedev->migration;
@@ -471,10 +470,9 @@ static void vfio_save_pending(QEMUFile *f, void *opaque,return ; } - *res_precopy_only += migration->pending_bytes; + *res_precopy += migration->pending_bytes; -trace_vfio_save_pending (vbasedev->name, *res_precopy_only, - *res_postcopy_only, *res_compatible); +trace_vfio_save_pending (vbasedev->name, *res_precopy, *res_postcopy); }static int vfio_save_iterate (QEMUFile *f,void *opaque)
migration/block-dirty-bitmap.c +3 -4
@@ -763,9 +763,8 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)static void dirty_bitmap_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only) +uint64_t *res_precopy, +uint64_t *res_postcopy) {DBMSaveState *s = &((DBMState *)opaque)->save;SaveBitmapState *dbms;
@@ -785,7 +784,7 @@ static void dirty_bitmap_save_pending(QEMUFile *f, void *opaque,trace_dirty_bitmap_save_pending (pending, max_size); - *res_postcopy_only += pending; + *res_postcopy += pending; }/* First occurrence of this bitmap. It should be created if doesn't exist */
migration/block.c +3 -4
@@ -863,9 +863,8 @@ static int block_save_complete(QEMUFile *f, void *opaque) }static void block_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only) +uint64_t *res_precopy, +uint64_t *res_postcopy) {/* Estimate pending number of bytes to send */ uint64_t pending;
@@ -886,7 +885,7 @@ static void block_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,trace_migration_block_save_pending (pending);/* We don't do postcopy */ - *res_precopy_only += pending; + *res_precopy += pending; }static int block_load (QEMUFile *f,void *opaque,int version_id)
migration/migration.c +4 -5
@@ -3756,15 +3756,14 @@ typedef enum {*/ static MigIterateState migration_iteration_run (MigrationState *s) { -uint64_t pending_size, pend_pre, pend_compat, pend_post; +uint64_t pending_size, pend_pre, pend_post;bool in_postcopy = s->state ==MIGRATION_STATUS_POSTCOPY_ACTIVE ;qemu_savevm_state_pending (s->to_dst_file, s->threshold_size, &pend_pre, - &pend_compat, &pend_post); - pending_size = pend_pre + pend_compat + pend_post; + &pend_post); + pending_size = pend_pre + pend_post; -trace_migrate_pending (pending_size, s->threshold_size, - pend_pre, pend_compat, pend_post); +trace_migrate_pending (pending_size, s->threshold_size, pend_pre, pend_post);if (pending_size && pending_size >= s->threshold_size) {/* Still a significant amount to transfer */
migration/ram.c +3 -5
@@ -3393,9 +3393,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque) }static void ram_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only) +uint64_t *res_precopy,uint64_t *res_postcopy) {RAMState **temp = opaque;RAMState *rs = *temp;
@@ -3415,9 +3413,9 @@ static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size,if (migrate_postcopy_ram ()) {/* We can do postcopy, and all the data is postcopiable */ - *res_compatible += remaining_size; + *res_postcopy += remaining_size; }else { - *res_precopy_only += remaining_size; + *res_precopy += remaining_size; } }
migration/savevm.c +5 -9
@@ -1472,16 +1472,13 @@ flush:* for units that can't do postcopy. */ void qemu_savevm_state_pending (QEMUFile *f,uint64_t threshold_size, -uint64_t *res_precopy_only, -uint64_t *res_compatible, -uint64_t *res_postcopy_only) +uint64_t *res_precopy, +uint64_t *res_postcopy) {SaveStateEntry *se; - *res_precopy_only =0 ; - *res_compatible =0 ; - *res_postcopy_only =0 ; - + *res_precopy =0 ; + *res_postcopy =0 ; QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {if (!se->ops || !se->ops->save_live_pending) {
@@ -1493,8 +1490,7 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t threshold_size, } } se->ops->save_live_pending (f, se->opaque, threshold_size, - res_precopy_only, res_compatible, - res_postcopy_only); + res_precopy, res_postcopy); } }
hw/vfio/trace-events +1 -1
@@ -157,7 +157,7 @@ vfio_save_cleanup(const char *name) " (%s)" vfio_save_buffer(const char *name, uint64_t data_offset, uint64_t data_size, uint64_t pending) " (%s) Offset 0x%"PRIx64" size 0x%"PRIx64" pending 0x%"PRIx64 vfio_update_pending(const char *name, uint64_t pending) " (%s) pending 0x%"PRIx64 vfio_save_device_config_state(const char *name) " (%s)" -vfio_save_pending(const char *name, uint64_t precopy, uint64_t postcopy, uint64_t compatible) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64" compatible 0x%"PRIx64 +vfio_save_pending(const char *name, uint64_t precopy, uint64_t postcopy) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64 vfio_save_iterate(const char *name, int data_size) " (%s) data_size %d" vfio_save_complete_precopy(const char *name) " (%s)" vfio_load_device_config_state(const char *name) " (%s)"
migration/trace-events +1 -1
@@ -150,7 +150,7 @@ migrate_fd_cleanup(void) "" migrate_fd_error(const char *error_desc) "error=%s" migrate_fd_cancel(void) "" migrate_handle_rp_req_pages(const char *rbname, size_t start, size_t len) "in %s at 0x%zx len 0x%zx" -migrate_pending(uint64_t size, uint64_t max, uint64_t pre, uint64_t compat, uint64_t post) "pending size %" PRIu64 " max %" PRIu64 " (pre = %" PRIu64 " compat=%" PRIu64 " post=%" PRIu64 ")" +migrate_pending(uint64_t size, uint64_t max, uint64_t pre, uint64_t post) "pending size %" PRIu64 " max %" PRIu64 " (pre = %" PRIu64 " post=%" PRIu64 ")" migrate_send_rp_message(int msg_type, uint16_t len) "%d: len %d" migrate_send_rp_recv_bitmap(char *name, int64_t size) "block '%s' size 0x%"PRIi64 migration_completion_file_err(void) ""
Signature · 1 line
2.38.1
PATCH v2 48/51 migration: No save_live_pending() method uses the QEMUFile parameter
In reply to Juan QuintelaSo remove it everywhere.
--- include/migration/register.h | 6 ++---- migration/savevm.h | 2 +- hw/s390x/s390-stattrib.c | 2 +- hw/vfio/migration.c | 6 ++---- migration/block-dirty-bitmap.c | 5 ++--- migration/block.c | 2 +- migration/migration.c | 3 +-- migration/ram.c | 2 +- migration/savevm.c | 5 ++--- 9 files changed, 13 insertions(+), 20 deletions(-)
include/migration/register.h +2 -4
@@ -46,10 +46,8 @@ typedef struct SaveVMHandlers {/* This runs outside the iothread lock! */ int (*save_setup)(QEMUFile *f,void *opaque); -void (*save_live_pending)(QEMUFile *f,void *opaque, -uint64_t threshold_size, -uint64_t *rest_precopy, -uint64_t *rest_postcopy); +void (*save_live_pending)(void *opaque,uint64_t threshold_size, +uint64_t *rest_precopy,uint64_t *rest_postcopy);/* Note for save_live_pending: * - res_precopy is for data which must be migrated in precopy * phase or in stopped state, in other words - before target
migration/savevm.h +1 -1
@@ -40,7 +40,7 @@ void qemu_savevm_state_cleanup(void);void qemu_savevm_state_complete_postcopy (QEMUFile *f);int qemu_savevm_state_complete_precopy (QEMUFile *f,bool iterable_only,bool inactivate_disks); -void qemu_savevm_state_pending (QEMUFile *f,uint64_t max_size, +void qemu_savevm_state_pending (uint64_t max_size,uint64_t *res_precopy,uint64_t *res_postcopy);void qemu_savevm_send_ping (QEMUFile *f,uint32_t value);void qemu_savevm_send_open_return_path (QEMUFile *f);
hw/s390x/s390-stattrib.c +1 -1
@@ -182,7 +182,7 @@ static int cmma_save_setup(QEMUFile *f, void *opaque)return 0 ; } -static void cmma_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, +static void cmma_save_pending (void *opaque,uint64_t max_size,uint64_t *res_precopy,uint64_t *res_postcopy) {S390StAttribState *sas =S390_STATTRIB (opaque);
hw/vfio/migration.c +2 -4
@@ -456,10 +456,8 @@ static void vfio_save_cleanup(void *opaque)trace_vfio_save_cleanup (vbasedev->name); } -static void vfio_save_pending (QEMUFile *f,void *opaque, -uint64_t threshold_size, -uint64_t *res_precopy, -uint64_t *res_postcopy) +static void vfio_save_pending (void *opaque,uint64_t threshold_size, +uint64_t *res_precopy,uint64_t *res_postcopy) {VFIODevice *vbasedev = opaque;VFIOMigration *migration = vbasedev->migration;
migration/block-dirty-bitmap.c +2 -3
@@ -761,9 +761,8 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void dirty_bitmap_save_pending (QEMUFile *f,void *opaque, -uint64_t max_size, -uint64_t *res_precopy, +static void dirty_bitmap_save_pending (void *opaque,uint64_t max_size, +uint64_t *res_precopy,uint64_t *res_postcopy) {DBMSaveState *s = &((DBMState *)opaque)->save;
migration/block.c +1 -1
@@ -862,7 +862,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void block_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, +static void block_save_pending (void *opaque,uint64_t max_size,uint64_t *res_precopy,uint64_t *res_postcopy) {
migration/migration.c +1 -2
@@ -3759,8 +3759,7 @@ static MigIterateState migration_iteration_run(MigrationState *s)uint64_t pending_size, pend_pre, pend_post;bool in_postcopy = s->state ==MIGRATION_STATUS_POSTCOPY_ACTIVE ; -qemu_savevm_state_pending (s->to_dst_file, s->threshold_size, &pend_pre, - &pend_post); +qemu_savevm_state_pending (s->threshold_size, &pend_pre, &pend_post); pending_size = pend_pre + pend_post;trace_migrate_pending (pending_size, s->threshold_size, pend_pre, pend_post);
migration/ram.c +1 -1
@@ -3392,7 +3392,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void ram_save_pending (QEMUFile *f,void *opaque,uint64_t max_size, +static void ram_save_pending (void *opaque,uint64_t max_size,uint64_t *res_precopy,uint64_t *res_postcopy) {RAMState **temp = opaque;
migration/savevm.c +2 -3
@@ -1471,8 +1471,7 @@ flush:* the result is split into the amount for units that can and * for units that can't do postcopy. */ -void qemu_savevm_state_pending (QEMUFile *f,uint64_t threshold_size, -uint64_t *res_precopy, +void qemu_savevm_state_pending (uint64_t threshold_size,uint64_t *res_precopy,uint64_t *res_postcopy) {SaveStateEntry *se;
@@ -1489,7 +1488,7 @@ void qemu_savevm_state_pending(QEMUFile *f, uint64_t threshold_size,continue ; } } - se->ops->save_live_pending (f, se->opaque, threshold_size, + se->ops->save_live_pending (se->opaque, threshold_size, res_precopy, res_postcopy); } }
Signature · 1 line
2.38.1
PATCH v2 49/51 migration: Split save_live_pending() into state_pending_*
In reply to Juan QuintelaWe split the function into to:
- state_pending_estimate: We estimate the remaining state size without stopping the machine.
- state pending_exact: We calculate the exact amount of remaining state.
The only "device" that implements different functions for _estimate() and _exact() is ram.
--- docs/devel/migration.rst | 18 ++++++++++-------- docs/devel/vfio-migration.rst | 4 ++-- include/migration/register.h | 12 ++++++++---- migration/savevm.h | 8 ++++++-- hw/s390x/s390-stattrib.c | 7 ++++--- hw/vfio/migration.c | 9 +++++---- migration/block-dirty-bitmap.c | 11 ++++++----- migration/block.c | 11 ++++++----- migration/migration.c | 13 +++++++++---- migration/ram.c | 31 ++++++++++++++++++++++++------- migration/savevm.c | 34 +++++++++++++++++++++++++++++----- hw/vfio/trace-events | 2 +- migration/trace-events | 7 ++++--- 13 files changed, 114 insertions(+), 53 deletions(-)
docs/devel/migration.rst +10 -8
@@ -482,15 +482,17 @@ An iterative device must provide: - A ``load_setup`` function that initialises the data structures on the destination. - - A ``save_live_pending`` function that is called repeatedly and must - indicate how much more data the iterative data must save. The core - migration code will use this to determine when to pause the CPUs - and complete the migration. + - A ``state_pending_exact`` function that indicates how much more + data we must save. The core migration code will use this to + determine when to pause the CPUs and complete the migration. - - A ``save_live_iterate`` function (called after ``save_live_pending`` - when there is significant data still to be sent). It should send - a chunk of data until the point that stream bandwidth limits tell it - to stop. Each call generates one section. + - A ``state_pending_estimate`` function that indicates how much more + data we must save. When the estimated amount is smaller than the + threshold, we call ``state_pending_exact``. + + - A ``save_live_iterate`` function should send a chunk of data until + the point that stream bandwidth limits tell it to stop. Each call + generates one section. - A ``save_live_complete_precopy`` function that must transmit the last section for the device containing any remaining data.
docs/devel/vfio-migration.rst +2 -2
@@ -28,7 +28,7 @@ VFIO implements the device hooks for the iterative approach as follows: * A ``load_setup`` function that sets up the migration region on the destination and sets _RESUMING flag in the VFIO device state. -* A ``save_live_pending`` function that reads pending_bytes from the vendor +* A ``state_pending_exact`` function that reads pending_bytes from the vendor driver, which indicates the amount of data that the vendor driver has yet to save for the VFIO device.
@@ -114,7 +114,7 @@ Live migration save path (RUNNING, _SETUP, _RUNNING|_SAVING) | (RUNNING, _ACTIVE, _RUNNING|_SAVING) - If device is active, get pending_bytes by .save_live_pending() + If device is active, get pending_bytes by .state_pending_exact() If total pending_bytes >= threshold_size, call .save_live_iterate() Data of VFIO device for pre-copy phase is copied Iterate till total pending bytes converge and are less than threshold
include/migration/register.h +8 -4
@@ -46,9 +46,7 @@ typedef struct SaveVMHandlers {/* This runs outside the iothread lock! */ int (*save_setup)(QEMUFile *f,void *opaque); -void (*save_live_pending)(void *opaque,uint64_t threshold_size, -uint64_t *rest_precopy,uint64_t *rest_postcopy); -/* Note for save_live_pending: +/* Note for state_pending_*: * - res_precopy is for data which must be migrated in precopy * phase or in stopped state, in other words - before target * vm start
@@ -59,7 +57,13 @@ typedef struct SaveVMHandlers {* Sum of res_precopy and res_postcopy is the whole amount of * pending data. */ - +/* This calculate the exact remaining data to transfer */ +void (*state_pending_exact)(void *opaque,uint64_t threshold_size, +uint64_t *rest_precopy,uint64_t *rest_postcopy); +/* This estimates the remaining data to transfer */ +void (*state_pending_estimate)(void *opaque,uint64_t threshold_size, +uint64_t *rest_precopy, +uint64_t *rest_postcopy);LoadStateHandler *load_state;int (*load_setup)(QEMUFile *f,void *opaque);
migration/savevm.h +6 -2
@@ -40,8 +40,12 @@ void qemu_savevm_state_cleanup(void);void qemu_savevm_state_complete_postcopy (QEMUFile *f);int qemu_savevm_state_complete_precopy (QEMUFile *f,bool iterable_only,bool inactivate_disks); -void qemu_savevm_state_pending (uint64_t max_size, -uint64_t *res_precopy,uint64_t *res_postcopy); +void qemu_savevm_state_pending_exact (uint64_t max_size, +uint64_t *res_precopy, +uint64_t *res_postcopy); +void qemu_savevm_state_pending_estimate (uint64_t max_size, +uint64_t *res_precopy, +uint64_t *res_postcopy);void qemu_savevm_send_ping (QEMUFile *f,uint32_t value);void qemu_savevm_send_open_return_path (QEMUFile *f);int qemu_savevm_send_packaged (QEMUFile *f,const uint8_t *buf,size_t len);
hw/s390x/s390-stattrib.c +4 -3
@@ -182,8 +182,8 @@ static int cmma_save_setup(QEMUFile *f, void *opaque)return 0 ; } -static void cmma_save_pending (void *opaque,uint64_t max_size, -uint64_t *res_precopy,uint64_t *res_postcopy) +static void cmma_state_pending (void *opaque,uint64_t *res_precopy, +uint64_t *res_postcopy) {S390StAttribState *sas =S390_STATTRIB (opaque);S390StAttribClass *sac =S390_STATTRIB_GET_CLASS (sas);
@@ -369,7 +369,8 @@ static SaveVMHandlers savevm_s390_stattrib_handlers = { .save_setup = cmma_save_setup, .save_live_iterate = cmma_save_iterate, .save_live_complete_precopy = cmma_save_complete, - .save_live_pending = cmma_save_pending, + .state_pending_exact = cmma_state_pending, + .state_pending_estimate = cmma_state_pending, .save_cleanup = cmma_save_cleanup, .load_state = cmma_load, .is_active = cmma_active,
hw/vfio/migration.c +5 -4
@@ -456,8 +456,8 @@ static void vfio_save_cleanup(void *opaque)trace_vfio_save_cleanup (vbasedev->name); } -static void vfio_save_pending (void *opaque,uint64_t threshold_size, -uint64_t *res_precopy,uint64_t *res_postcopy) +static void vfio_state_pending (void *opaque,uint64_t threshold_size, +uint64_t *res_precopy,uint64_t *res_postcopy) {VFIODevice *vbasedev = opaque;VFIOMigration *migration = vbasedev->migration;
@@ -470,7 +470,7 @@ static void vfio_save_pending(void *opaque, uint64_t threshold_size, *res_precopy += migration->pending_bytes; -trace_vfio_save_pending (vbasedev->name, *res_precopy, *res_postcopy); +trace_vfio_state_pending (vbasedev->name, *res_precopy, *res_postcopy); }static int vfio_save_iterate (QEMUFile *f,void *opaque)
@@ -681,7 +681,8 @@ static int vfio_load_state(QEMUFile *f, void *opaque, int version_id)static SaveVMHandlers savevm_vfio_handlers = { .save_setup = vfio_save_setup, .save_cleanup = vfio_save_cleanup, - .save_live_pending = vfio_save_pending, + .state_pending_exact = vfio_state_pending, + .state_pending_estimate = vfio_state_pending, .save_live_iterate = vfio_save_iterate, .save_live_complete_precopy = vfio_save_complete_precopy, .save_state = vfio_save_state,
migration/block-dirty-bitmap.c +6 -5
@@ -761,9 +761,9 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void dirty_bitmap_save_pending (void *opaque,uint64_t max_size, -uint64_t *res_precopy, -uint64_t *res_postcopy) +static void dirty_bitmap_state_pending (void *opaque,uint64_t max_size, +uint64_t *res_precopy, +uint64_t *res_postcopy) {DBMSaveState *s = &((DBMState *)opaque)->save;SaveBitmapState *dbms;
@@ -781,7 +781,7 @@ static void dirty_bitmap_save_pending(void *opaque, uint64_t max_size,qemu_mutex_unlock_iothread (); -trace_dirty_bitmap_save_pending (pending, max_size); +trace_dirty_bitmap_state_pending (pending); *res_postcopy += pending; }
@@ -1250,7 +1250,8 @@ static SaveVMHandlers savevm_dirty_bitmap_handlers = { .save_live_complete_postcopy = dirty_bitmap_save_complete, .save_live_complete_precopy = dirty_bitmap_save_complete, .has_postcopy = dirty_bitmap_has_postcopy, - .save_live_pending = dirty_bitmap_save_pending, + .state_pending_exact = dirty_bitmap_state_pending, + .state_pending_estimate = dirty_bitmap_state_pending, .save_live_iterate = dirty_bitmap_save_iterate, .is_active_iterate = dirty_bitmap_is_active_iterate, .load_state = dirty_bitmap_load,
migration/block.c +6 -5
@@ -862,9 +862,9 @@ static int block_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void block_save_pending (void *opaque,uint64_t max_size, -uint64_t *res_precopy, -uint64_t *res_postcopy) +static void block_state_pending (void *opaque,uint64_t max_size, +uint64_t *res_precopy, +uint64_t *res_postcopy) {/* Estimate pending number of bytes to send */ uint64_t pending;
@@ -883,7 +883,7 @@ static void block_save_pending(void *opaque, uint64_t max_size, pending =BLK_MIG_BLOCK_SIZE ; } -trace_migration_block_save_pending (pending); +trace_migration_block_state_pending (pending);/* We don't do postcopy */ *res_precopy += pending; }
@@ -1018,7 +1018,8 @@ static SaveVMHandlers savevm_block_handlers = { .save_setup = block_save_setup, .save_live_iterate = block_save_iterate, .save_live_complete_precopy = block_save_complete, - .save_live_pending = block_save_pending, + .state_pending_exact = block_state_pending, + .state_pending_estimate = block_state_pending, .load_state = block_load, .save_cleanup = block_migration_cleanup, .is_active = block_is_active,
migration/migration.c +9 -4
@@ -3756,13 +3756,18 @@ typedef enum {*/ static MigIterateState migration_iteration_run (MigrationState *s) { -uint64_t pending_size, pend_pre, pend_post; +uint64_t pend_pre, pend_post;bool in_postcopy = s->state ==MIGRATION_STATUS_POSTCOPY_ACTIVE ; -qemu_savevm_state_pending (s->threshold_size, &pend_pre, &pend_post); - pending_size = pend_pre + pend_post; +qemu_savevm_state_pending_estimate (s->threshold_size, &pend_pre, &pend_post); +uint64_t pending_size = pend_pre + pend_post; +trace_migrate_pending_estimate (pending_size, s->threshold_size, pend_pre, pend_post); -trace_migrate_pending (pending_size, s->threshold_size, pend_pre, pend_post); +if (pend_pre <= s->threshold_size) { +qemu_savevm_state_pending_exact (s->threshold_size, &pend_pre, &pend_post); + pending_size = pend_pre + pend_post; +trace_migrate_pending_exact (pending_size, s->threshold_size, pend_pre, pend_post); + }if (pending_size && pending_size >= s->threshold_size) {/* Still a significant amount to transfer */
migration/ram.c +24 -7
@@ -3392,17 +3392,33 @@ static int ram_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void ram_save_pending (void *opaque,uint64_t max_size, -uint64_t *res_precopy,uint64_t *res_postcopy) +static void ram_state_pending_estimate (void *opaque,uint64_t max_size, +uint64_t *res_precopy, +uint64_t *res_postcopy) {RAMState **temp = opaque;RAMState *rs = *temp; -uint64_t remaining_size; - remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; +uint64_t remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; -if (!migration_in_postcopy () && - remaining_size < max_size) { +if (migrate_postcopy_ram ()) { +/* We can do postcopy, and all the data is postcopiable */ + *res_postcopy += remaining_size; + }else { + *res_precopy += remaining_size; + } +} + +static void ram_state_pending_exact (void *opaque,uint64_t max_size, +uint64_t *res_precopy, +uint64_t *res_postcopy) +{ +RAMState **temp = opaque; +RAMState *rs = *temp; + +uint64_t remaining_size = rs->migration_dirty_pages *TARGET_PAGE_SIZE ; + +if (!migration_in_postcopy ()) {qemu_mutex_lock_iothread (); WITH_RCU_READ_LOCK_GUARD() {migration_bitmap_sync_precopy (rs);
@@ -4558,7 +4574,8 @@ static SaveVMHandlers savevm_ram_handlers = { .save_live_complete_postcopy = ram_save_complete, .save_live_complete_precopy = ram_save_complete, .has_postcopy = ram_has_postcopy, - .save_live_pending = ram_save_pending, + .state_pending_exact = ram_state_pending_exact, + .state_pending_estimate = ram_state_pending_estimate, .load_state = ram_load, .save_cleanup = ram_save_cleanup, .load_setup = ram_load_setup,
migration/savevm.c +29 -5
@@ -1471,8 +1471,9 @@ flush:* the result is split into the amount for units that can and * for units that can't do postcopy. */ -void qemu_savevm_state_pending (uint64_t threshold_size,uint64_t *res_precopy, -uint64_t *res_postcopy) +void qemu_savevm_state_pending_exact (uint64_t threshold_size, +uint64_t *res_precopy, +uint64_t *res_postcopy) {SaveStateEntry *se;
@@ -1480,7 +1481,7 @@ void qemu_savevm_state_pending(uint64_t threshold_size, uint64_t *res_precopy, *res_postcopy =0 ; QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { -if (!se->ops || !se->ops->save_live_pending) { +if (!se->ops || !se->ops->state_pending_exact) {continue ; }if (se->ops->is_active) {
@@ -1488,8 +1489,31 @@ void qemu_savevm_state_pending(uint64_t threshold_size, uint64_t *res_precopy,continue ; } } - se->ops->save_live_pending (se->opaque, threshold_size, - res_precopy, res_postcopy); + se->ops->state_pending_exact (se->opaque, threshold_size, + res_precopy, res_postcopy); + } +} + +void qemu_savevm_state_pending_estimate (uint64_t threshold_size, +uint64_t *res_precopy, +uint64_t *res_postcopy) +{ +SaveStateEntry *se; + + *res_precopy =0 ; + *res_postcopy =0 ; + + QTAILQ_FOREACH(se, &savevm_state.handlers, entry) { +if (!se->ops || !se->ops->state_pending_estimate) { +continue ; + } +if (se->ops->is_active) { +if (!se->ops->is_active (se->opaque)) { +continue ; + } + } + se->ops->state_pending_estimate (se->opaque, threshold_size, + res_precopy, res_postcopy); } }
hw/vfio/trace-events +1 -1
@@ -157,7 +157,7 @@ vfio_save_cleanup(const char *name) " (%s)" vfio_save_buffer(const char *name, uint64_t data_offset, uint64_t data_size, uint64_t pending) " (%s) Offset 0x%"PRIx64" size 0x%"PRIx64" pending 0x%"PRIx64 vfio_update_pending(const char *name, uint64_t pending) " (%s) pending 0x%"PRIx64 vfio_save_device_config_state(const char *name) " (%s)" -vfio_save_pending(const char *name, uint64_t precopy, uint64_t postcopy) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64 +vfio_state_pending(const char *name, uint64_t precopy, uint64_t postcopy) " (%s) precopy 0x%"PRIx64" postcopy 0x%"PRIx64 vfio_save_iterate(const char *name, int data_size) " (%s) data_size %d" vfio_save_complete_precopy(const char *name) " (%s)" vfio_load_device_config_state(const char *name) " (%s)"
migration/trace-events +4 -3
@@ -150,7 +150,8 @@ migrate_fd_cleanup(void) "" migrate_fd_error(const char *error_desc) "error=%s" migrate_fd_cancel(void) "" migrate_handle_rp_req_pages(const char *rbname, size_t start, size_t len) "in %s at 0x%zx len 0x%zx" -migrate_pending(uint64_t size, uint64_t max, uint64_t pre, uint64_t post) "pending size %" PRIu64 " max %" PRIu64 " (pre = %" PRIu64 " post=%" PRIu64 ")" +migrate_pending_estimate(uint64_t size, uint64_t max, uint64_t pre, uint64_t post) "pending size %" PRIu64 " max %" PRIu64 " (pre = %" PRIu64 " post=%" PRIu64 ")" +migrate_pending_exact(uint64_t size, uint64_t max, uint64_t pre, uint64_t post) "pending size %" PRIu64 " max %" PRIu64 " (pre = %" PRIu64 " post=%" PRIu64 ")" migrate_send_rp_message(int msg_type, uint16_t len) "%d: len %d" migrate_send_rp_recv_bitmap(char *name, int64_t size) "block '%s' size 0x%"PRIi64 migration_completion_file_err(void) ""
@@ -330,7 +331,7 @@ send_bitmap_bits(uint32_t flags, uint64_t start_sector, uint32_t nr_sectors, uin dirty_bitmap_save_iterate(int in_postcopy) "in postcopy: %d" dirty_bitmap_save_complete_enter(void) "" dirty_bitmap_save_complete_finish(void) "" -dirty_bitmap_save_pending(uint64_t pending, uint64_t max_size) "pending %" PRIu64 " max: %" PRIu64 +dirty_bitmap_state_pending(uint64_t pending) "pending %" PRIu64 dirty_bitmap_load_complete(void) "" dirty_bitmap_load_bits_enter(uint64_t first_sector, uint32_t nr_sectors) "chunk: %" PRIu64 " %" PRIu32 dirty_bitmap_load_bits_zeroes(void) ""
@@ -355,7 +356,7 @@ migration_block_save_device_dirty(int64_t sector) "Error reading sector %" PRId6 migration_block_flush_blks(const char *action, int submitted, int read_done, int transferred) "%s submitted %d read_done %d transferred %d" migration_block_save(const char *mig_stage, int submitted, int transferred) "Enter save live %s submitted %d transferred %d" migration_block_save_complete(void) "Block migration completed" -migration_block_save_pending(uint64_t pending) "Enter save live pending %" PRIu64 +migration_block_state_pending(uint64_t pending) "Enter save live pending %" PRIu64 # page_cache.c migration_pagecache_init(int64_t max_num_items) "Setting cache buckets to %" PRId64
Signature · 1 line
2.38.1
PATCH v2 50/51 migration: Remove unused threshold_size parameter
In reply to Juan QuintelaUntil previous commit, save_live_pending() was used for ram. Now with the split into state_pending_estimate() and state_pending_exact() it is not needed anymore, so remove them.
--- include/migration/register.h | 7 +++---- migration/savevm.h | 6 ++---- hw/vfio/migration.c | 6 +++--- migration/block-dirty-bitmap.c | 3 +-- migration/block.c | 3 +-- migration/migration.c | 4 ++-- migration/ram.c | 6 ++---- migration/savevm.c | 12 ++++-------- 8 files changed, 18 insertions(+), 29 deletions(-)
include/migration/register.h +3 -4
@@ -58,11 +58,10 @@ typedef struct SaveVMHandlers {* pending data. */ /* This calculate the exact remaining data to transfer */ -void (*state_pending_exact)(void *opaque,uint64_t threshold_size, -uint64_t *rest_precopy,uint64_t *rest_postcopy); +void (*state_pending_exact)(void *opaque,uint64_t *rest_precopy, +uint64_t *rest_postcopy);/* This estimates the remaining data to transfer */ -void (*state_pending_estimate)(void *opaque,uint64_t threshold_size, -uint64_t *rest_precopy, +void (*state_pending_estimate)(void *opaque,uint64_t *rest_precopy,uint64_t *rest_postcopy);LoadStateHandler *load_state;
migration/savevm.h +2 -4
@@ -40,11 +40,9 @@ void qemu_savevm_state_cleanup(void);void qemu_savevm_state_complete_postcopy (QEMUFile *f);int qemu_savevm_state_complete_precopy (QEMUFile *f,bool iterable_only,bool inactivate_disks); -void qemu_savevm_state_pending_exact (uint64_t max_size, -uint64_t *res_precopy, +void qemu_savevm_state_pending_exact (uint64_t *res_precopy,uint64_t *res_postcopy); -void qemu_savevm_state_pending_estimate (uint64_t max_size, -uint64_t *res_precopy, +void qemu_savevm_state_pending_estimate (uint64_t *res_precopy,uint64_t *res_postcopy);void qemu_savevm_send_ping (QEMUFile *f,uint32_t value);void qemu_savevm_send_open_return_path (QEMUFile *f);
hw/vfio/migration.c +3 -3
@@ -456,8 +456,8 @@ static void vfio_save_cleanup(void *opaque)trace_vfio_save_cleanup (vbasedev->name); } -static void vfio_state_pending (void *opaque,uint64_t threshold_size, -uint64_t *res_precopy,uint64_t *res_postcopy) +static void vfio_state_pending (void *opaque,uint64_t *res_precopy, +uint64_t *res_postcopy) {VFIODevice *vbasedev = opaque;VFIOMigration *migration = vbasedev->migration;
@@ -511,7 +511,7 @@ static int vfio_save_iterate(QEMUFile *f, void *opaque) }/* -* Reset pending_bytes as .save_live_pending is not called during savevm or +* Reset pending_bytes as .state_pending_* is not called during savevm or * snapshot case, in such case vfio_update_pending() at the start of this * function updates pending_bytes. */
migration/block-dirty-bitmap.c +1 -2
@@ -761,8 +761,7 @@ static int dirty_bitmap_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void dirty_bitmap_state_pending (void *opaque,uint64_t max_size, -uint64_t *res_precopy, +static void dirty_bitmap_state_pending (void *opaque,uint64_t *res_precopy,uint64_t *res_postcopy) {DBMSaveState *s = &((DBMState *)opaque)->save;
migration/block.c +1 -2
@@ -862,8 +862,7 @@ static int block_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void block_state_pending (void *opaque,uint64_t max_size, -uint64_t *res_precopy, +static void block_state_pending (void *opaque,uint64_t *res_precopy,uint64_t *res_postcopy) {/* Estimate pending number of bytes to send */
migration/migration.c +2 -2
@@ -3759,12 +3759,12 @@ static MigIterateState migration_iteration_run(MigrationState *s)uint64_t pend_pre, pend_post;bool in_postcopy = s->state ==MIGRATION_STATUS_POSTCOPY_ACTIVE ; -qemu_savevm_state_pending_estimate (s->threshold_size, &pend_pre, &pend_post); +qemu_savevm_state_pending_estimate (&pend_pre, &pend_post);uint64_t pending_size = pend_pre + pend_post;trace_migrate_pending_estimate (pending_size, s->threshold_size, pend_pre, pend_post);if (pend_pre <= s->threshold_size) { -qemu_savevm_state_pending_exact (s->threshold_size, &pend_pre, &pend_post); +qemu_savevm_state_pending_exact (&pend_pre, &pend_post); pending_size = pend_pre + pend_post;trace_migrate_pending_exact (pending_size, s->threshold_size, pend_pre, pend_post); }
migration/ram.c +2 -4
@@ -3392,8 +3392,7 @@ static int ram_save_complete(QEMUFile *f, void *opaque)return 0 ; } -static void ram_state_pending_estimate (void *opaque,uint64_t max_size, -uint64_t *res_precopy, +static void ram_state_pending_estimate (void *opaque,uint64_t *res_precopy,uint64_t *res_postcopy) {RAMState **temp = opaque;
@@ -3409,8 +3408,7 @@ static void ram_state_pending_estimate(void *opaque, uint64_t max_size, } } -static void ram_state_pending_exact (void *opaque,uint64_t max_size, -uint64_t *res_precopy, +static void ram_state_pending_exact (void *opaque,uint64_t *res_precopy,uint64_t *res_postcopy) {RAMState **temp = opaque;
migration/savevm.c +4 -8
@@ -1471,8 +1471,7 @@ flush:* the result is split into the amount for units that can and * for units that can't do postcopy. */ -void qemu_savevm_state_pending_exact (uint64_t threshold_size, -uint64_t *res_precopy, +void qemu_savevm_state_pending_exact (uint64_t *res_precopy,uint64_t *res_postcopy) {SaveStateEntry *se;
@@ -1489,13 +1488,11 @@ void qemu_savevm_state_pending_exact(uint64_t threshold_size,continue ; } } - se->ops->state_pending_exact (se->opaque, threshold_size, - res_precopy, res_postcopy); + se->ops->state_pending_exact (se->opaque, res_precopy, res_postcopy); } } -void qemu_savevm_state_pending_estimate (uint64_t threshold_size, -uint64_t *res_precopy, +void qemu_savevm_state_pending_estimate (uint64_t *res_precopy,uint64_t *res_postcopy) {SaveStateEntry *se;
@@ -1512,8 +1509,7 @@ void qemu_savevm_state_pending_estimate(uint64_t threshold_size,continue ; } } - se->ops->state_pending_estimate (se->opaque, threshold_size, - res_precopy, res_postcopy); + se->ops->state_pending_estimate (se->opaque, res_precopy, res_postcopy); } }
Signature · 1 line
2.38.1
PATCH v2 51/51 migration: simplify migration_iteration_run()
In reply to Juan Quintela--- migration/migration.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
migration/migration.c +12 -12
@@ -3769,23 +3769,23 @@ static MigIterateState migration_iteration_run(MigrationState *s)trace_migrate_pending_exact (pending_size, s->threshold_size, pend_pre, pend_post); } -if (pending_size && pending_size >= s->threshold_size) { -/* Still a significant amount to transfer */ -if (!in_postcopy && pend_pre <= s->threshold_size && -qatomic_read (&s->start_postcopy)) { -if (postcopy_start (s)) { -error_report ("%s: postcopy failed to start" , __func__); - } -return MIG_ITERATE_SKIP ; - } -/* Just another iteration step */ -qemu_savevm_state_iterate (s->to_dst_file, in_postcopy); - }else { +if (pending_size < s->threshold_size) {trace_migration_thread_low_pending (pending_size);migration_completion (s);return MIG_ITERATE_BREAK ; } +/* Still a significant amount to transfer */ +if (!in_postcopy && pend_pre <= s->threshold_size && +qatomic_read (&s->start_postcopy)) { +if (postcopy_start (s)) { +error_report ("%s: postcopy failed to start" , __func__); + } +return MIG_ITERATE_SKIP ; + } + +/* Just another iteration step */ +qemu_savevm_state_iterate (s->to_dst_file, in_postcopy);return MIG_ITERATE_RESUME ; }
Signature · 1 line
2.38.1
Quoted 1 line · Juan Quintela
Hi
Nack myself
This patch series should be sent against my next-8.0 branch, not master.
Sorry for the noise.
Will resend.
Quoted 112 lines
On this v2:
- Remove the stop of the guest to calculate the size
- Rebase on latest upstream.Please review.
[v1/RFC]
VFIO migration has several requirements:
- the size of the state is only known when the guest is stopped
- they need to send possible lots of data.this series only address the 1st set of problems.
What they do:
-res_compatibleparameter was not used anywhere, just add that information tores_postcopy.
- Remove QEMUFILE parameter fromsave_live_pending
- Splitsave_live_pendinginto
*save_pending_estimate(): the pending state size without trying too hard
*save_pending_exact(): the real pending state size, it is called with the guest stopped.
- Now save_pending_* don't need the threshold parameter
- HACK a way to stop the guest before moving there.ToDo:
- autoconverge test is broken, no real clue why, but it is possible that the test is wrong.- Make an artifact to be able to send massive amount of data in the save state stage (probably more multifd channels).
- Be able to not having to start the guest between cheking the state pending size and
migration_completion().Please review.
Thanks, Juan.
Alex Bennée (4):
tests/qtests: override "force-legacy" for gpio virtio-mmio tests hw/virtio: addstarted_vustatus field to vhost-user-gpio hw/virtio: generaliseCHR_EVENT_CLOSEDhandlinginclude/hw: VM state takes precedence invirtio_device_should_startEvgeny Ermakov (2):
target/arm: Set TCGCPUOps.restore_state_to_opc for v7m hw/display/next-fb: Fix comment typoGerd Hoffmann (2):
update seabios source from 1.16.0 to 1.16.1
update seabios binaries to 1.16.1Juan Quintela (9):
multifd: Createpage_sizefields into both MultiFD{Recv,Send}Params
multifd: Createpage_countfields into both MultiFD{Recv,Send}Params
migration: Exportram_transferred_ram()
migration: Exportram_release_page()
migration: Removeres_compatibleparameter
migration: Nosave_live_pending()method uses the QEMUFile parameter
migration: Splitsave_live_pending()into state_pending_*
migration: Remove unusedthreshold_sizeparameter
migration: simplifymigration_iteration_run()Klaus Jensen (5):
hw/nvme: fix aio cancel in format
hw/nvme: fix aio cancel in flush
hw/nvme: fix aio cancel in zone reset
hw/nvme: fix aio cancel in dsm
hw/nvme: remove copy bh schedulingPaolo Bonzini (1):
target/i386: allow MMX instructions with CR4.OSFXSR=0Peter Xu (15):
migration: Take bitmap mutex when completing ram migration
migration: Addpostcopy_preempt_active()
migration: Cleanup xbzrle zero page cache update logic
migration: Trivial cleanupsave_page_header()on same block check
migration: Remove RAMState.f references in compression code
migration: Yieldbitmap_mutexproperly when sending/sleeping
migration: Use atomic ops properly for page accountings
migration: Teach PSS about host page
migration: Introducepss_channel
migration: Addpss_init()
migration: Make PageSearchStatus part of RAMState
migration: Movelast_sent_blockinto PageSearchStatus
migration: Send requested page directly in rp-return thread
migration: Remove old preempt code around state maintainance
migration: Droprs->fPhilippe Mathieu-Daudé (5):
hw/display/qxl: Haveqxl_log_commandReturn early if nolog_cmd
handler
hw/display/qxl: Documentqxl_phys2virt()
hw/display/qxl: Pass requested buffer size toqxl_phys2virt()hw/display/qxl: Avoid buffer overrun inqxl_phys2virt(CVE-2022-4144) hw/display/qxl: Assert memory slot fits in preallocated MemoryRegionRichard Henderson (2):
replay: Fix declaration ofreplay_read_next_clocktarget/i386: Always completely initialize TranslateFaultStefan Hajnoczi (2):
block-backend: avoidbdrv_unregister_buf()NULL pointer deref Update VERSION for v7.2.0-rc3Stefano Garzarella (1):
vhost: enable vrings invhost_dev_start()for vhost-user devicesThomas Huth (2):
tests/qtest/migration-test: Fix unlink error and memory leaks target/s390x/tcg: Fix and improve the SACF instructionXiaojuan Yang (1):
hw/loongarch/virt: Add cfi01 pflash device