Commit 26499151 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ericb/tags/pull-bitmaps-2020-07-27' into staging 



bitmaps patches for 2020-07-27

- Improve handling of various post-copy bitmap migration scenarios. A lost
bitmap should merely mean that the next backup must be full rather than
incremental, rather than abruptly breaking the entire guest migration.
- Associated iotest improvements

# gpg: Signature made Mon 27 Jul 2020 21:46:17 BST
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-bitmaps-2020-07-27: (24 commits)
  migration: Fix typos in bitmap migration comments
  iotests: Adjust which migration tests are quick
  qemu-iotests/199: add source-killed case to bitmaps postcopy
  qemu-iotests/199: add early shutdown case to bitmaps postcopy
  qemu-iotests/199: check persistent bitmaps
  qemu-iotests/199: prepare for new test-cases addition
  migration/savevm: don't worry if bitmap migration postcopy failed
  migration/block-dirty-bitmap: cancel migration on shutdown
  migration/block-dirty-bitmap: relax error handling in incoming part
  migration/block-dirty-bitmap: keep bitmap state for all bitmaps
  migration/block-dirty-bitmap: simplify dirty_bitmap_load_complete
  migration/block-dirty-bitmap: rename finish_lock to just lock
  migration/block-dirty-bitmap: refactor state global variables
  migration/block-dirty-bitmap: move mutex init to dirty_bitmap_mig_init
  migration/block-dirty-bitmap: rename dirty_bitmap_mig_cleanup
  migration/block-dirty-bitmap: rename state structure types
  migration/block-dirty-bitmap: fix dirty_bitmap_mig_before_vm_start
  qemu-iotests/199: increase postcopy period
  qemu-iotests/199: change discard patterns
  qemu-iotests/199: improve performance: set bitmap by discard
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1b242c3b 37931e00

block/qcow2.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ typedef struct { 
} QEMU_PACKED QCowExtension;



#define  QCOW2_EXT_MAGIC_END 0

#define  QCOW2_EXT_MAGIC_BACKING_FORMAT 0xE2792ACA

#define  QCOW2_EXT_MAGIC_BACKING_FORMAT 0xe2792aca

#define  QCOW2_EXT_MAGIC_FEATURE_TABLE 0x6803f857

#define  QCOW2_EXT_MAGIC_CRYPTO_HEADER 0x0537be77

#define  QCOW2_EXT_MAGIC_BITMAPS 0x23852875

docs/interop/qcow2.txt

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ be stored. Each extension has a structure like the following: 


    Byte  0 -  3:   Header extension type:

                        0x00000000 - End of the header extension area

                        0xE2792ACA - Backing file format name string

                        0xe2792aca - Backing file format name string

                        0x6803f857 - Feature name table

                        0x23852875 - Bitmaps extension

                        0x0537be77 - Full disk encryption header pointer

migration/block-dirty-bitmap.c

+302 −172

File changed.

Preview size limit exceeded, changes collapsed.

migration/migration.c

+13 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ void migration_object_init(void) 
    qemu_sem_init(&current_incoming->postcopy_pause_sem_dst, 0);

    qemu_sem_init(&current_incoming->postcopy_pause_sem_fault, 0);



    init_dirty_bitmap_incoming_migration();



    if (!migration_object_check(current_migration, &err)) {

        error_report_err(err);

        exit(1);
@@ -190,6 +188,19 @@ void migration_shutdown(void) 
     */

    migrate_fd_cancel(current_migration);

    object_unref(OBJECT(current_migration));



    /*

     * Cancel outgoing migration of dirty bitmaps. It should

     * at least unref used block nodes.

     */

    dirty_bitmap_mig_cancel_outgoing();



    /*

     * Cancel incoming migration of dirty bitmaps. Dirty bitmaps

     * are non-critical data, and their loss never considered as

     * something serious.

     */

    dirty_bitmap_mig_cancel_incoming();

}



/* For outgoing */

migration/migration.h

+2 −1
Original line number Diff line number Diff line
@@ -335,7 +335,8 @@ void migrate_send_rp_recv_bitmap(MigrationIncomingState *mis, 
void migrate_send_rp_resume_ack(MigrationIncomingState *mis, uint32_t value);



void dirty_bitmap_mig_before_vm_start(void);

void init_dirty_bitmap_incoming_migration(void);

void dirty_bitmap_mig_cancel_outgoing(void);

void dirty_bitmap_mig_cancel_incoming(void);

void migrate_add_address(SocketAddress *address);



int foreach_not_ignored_block(RAMBlockIterFunc func, void *opaque);