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

Merge remote-tracking branch 'remotes/juanquintela/tags/pull-migration-pull-request' into staging 



Migration pull request

# gpg: Signature made Wed 29 Jan 2020 10:57:23 GMT
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* remotes/juanquintela/tags/pull-migration-pull-request:
  migration/compress: compress QEMUFile is not writable
  migration: Simplify get_qlist
  multifd: Split multifd code into its own file
  multifd: Make multifd_load_setup() get an Error parameter
  multifd: Make multifd_save_setup() get an Error parameter
  migration: Make checkpatch happy with comments
  multifd: Use qemu_target_page_size()
  multifd: multifd_send_sync_main only needs the qemufile
  multifd: multifd_queue_page only needs the qemufile
  multifd: multifd_send_pages only needs the qemufile
  ram_addr: Split RAMBlock definition
  migration/multifd: fix nullptr access in multifd_send_terminate_threads
  migration: Create migration_is_running()
  migration-test: Make sure that multifd and cancel works
  migration: Don't send data if we have stopped
  qemu-file: Don't do IO after shutdown
  multifd: Make sure that we don't do any IO after an error
  migration-test: Use g_free() instead of free()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents bddff6f6 42d24611

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -1975,6 +1975,7 @@ F: ioport.c 
F: include/exec/memop.h

F: include/exec/memory.h

F: include/exec/ram_addr.h

F: include/exec/ramblock.h

F: memory.c

F: include/exec/memory-internal.h

F: exec.c

include/exec/ram_addr.h

+1 −39
Original line number Diff line number Diff line
@@ -24,45 +24,7 @@ 
#include "hw/xen/xen.h"

#include "sysemu/tcg.h"

#include "exec/ramlist.h"



struct RAMBlock {

    struct rcu_head rcu;

    struct MemoryRegion *mr;

    uint8_t *host;

    uint8_t *colo_cache; /* For colo, VM's ram cache */

    ram_addr_t offset;

    ram_addr_t used_length;

    ram_addr_t max_length;

    void (*resized)(const char*, uint64_t length, void *host);

    uint32_t flags;

    /* Protected by iothread lock.  */

    char idstr[256];

    /* RCU-enabled, writes protected by the ramlist lock */

    QLIST_ENTRY(RAMBlock) next;

    QLIST_HEAD(, RAMBlockNotifier) ramblock_notifiers;

    int fd;

    size_t page_size;

    /* dirty bitmap used during migration */

    unsigned long *bmap;

    /* bitmap of already received pages in postcopy */

    unsigned long *receivedmap;



    /*

     * bitmap to track already cleared dirty bitmap.  When the bit is

     * set, it means the corresponding memory chunk needs a log-clear.

     * Set this up to non-NULL to enable the capability to postpone

     * and split clearing of dirty bitmap on the remote node (e.g.,

     * KVM).  The bitmap will be set only when doing global sync.

     *

     * NOTE: this bitmap is different comparing to the other bitmaps

     * in that one bit can represent multiple guest pages (which is

     * decided by the `clear_bmap_shift' variable below).  On

     * destination side, this should always be NULL, and the variable

     * `clear_bmap_shift' is meaningless.

     */

    unsigned long *clear_bmap;

    uint8_t clear_bmap_shift;

};

#include "exec/ramblock.h"



/**

 * clear_bmap_size: calculate clear bitmap size

include/exec/ramblock.h

0 → 100644
+64 −0
Original line number Diff line number Diff line 
/*

 * Declarations for cpu physical memory functions

 *

 * Copyright 2011 Red Hat, Inc. and/or its affiliates

 *

 * Authors:

 *  Avi Kivity <avi@redhat.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or

 * later.  See the COPYING file in the top-level directory.

 *

 */



/*

 * This header is for use by exec.c and memory.c ONLY.  Do not include it.

 * The functions declared here will be removed soon.

 */



#ifndef QEMU_EXEC_RAMBLOCK_H

#define QEMU_EXEC_RAMBLOCK_H



#ifndef CONFIG_USER_ONLY

#include "cpu-common.h"



struct RAMBlock {

    struct rcu_head rcu;

    struct MemoryRegion *mr;

    uint8_t *host;

    uint8_t *colo_cache; /* For colo, VM's ram cache */

    ram_addr_t offset;

    ram_addr_t used_length;

    ram_addr_t max_length;

    void (*resized)(const char*, uint64_t length, void *host);

    uint32_t flags;

    /* Protected by iothread lock.  */

    char idstr[256];

    /* RCU-enabled, writes protected by the ramlist lock */

    QLIST_ENTRY(RAMBlock) next;

    QLIST_HEAD(, RAMBlockNotifier) ramblock_notifiers;

    int fd;

    size_t page_size;

    /* dirty bitmap used during migration */

    unsigned long *bmap;

    /* bitmap of already received pages in postcopy */

    unsigned long *receivedmap;



    /*

     * bitmap to track already cleared dirty bitmap.  When the bit is

     * set, it means the corresponding memory chunk needs a log-clear.

     * Set this up to non-NULL to enable the capability to postpone

     * and split clearing of dirty bitmap on the remote node (e.g.,

     * KVM).  The bitmap will be set only when doing global sync.

     *

     * NOTE: this bitmap is different comparing to the other bitmaps

     * in that one bit can represent multiple guest pages (which is

     * decided by the `clear_bmap_shift' variable below).  On

     * destination side, this should always be NULL, and the variable

     * `clear_bmap_shift' is meaningless.

     */

    unsigned long *clear_bmap;

    uint8_t clear_bmap_shift;

};

#endif

#endif

include/qemu/queue.h

+6 −13
Original line number Diff line number Diff line
@@ -515,6 +515,12 @@ union { \ 
             (elm);                                                            \

             (elm) = *QLIST_RAW_NEXT(elm, entry))



#define QLIST_RAW_INSERT_AFTER(head, prev, elem, entry) do {                   \

        *QLIST_RAW_NEXT(prev, entry) = elem;                                   \

        *QLIST_RAW_PREVIOUS(elem, entry) = QLIST_RAW_NEXT(prev, entry);        \

        *QLIST_RAW_NEXT(elem, entry) = NULL;                                   \

} while (0)



#define QLIST_RAW_INSERT_HEAD(head, elm, entry) do {                           \

        void *first = *QLIST_RAW_FIRST(head);                                  \

        *QLIST_RAW_FIRST(head) = elm;                                          \
@@ -527,17 +533,4 @@ union { \ 
        }                                                                      \

} while (0)



#define QLIST_RAW_REVERSE(head, elm, entry) do {                               \

        void *iter = *QLIST_RAW_FIRST(head), *prev = NULL, *next;              \

        while (iter) {                                                         \

            next = *QLIST_RAW_NEXT(iter, entry);                               \

            *QLIST_RAW_PREVIOUS(iter, entry) = QLIST_RAW_NEXT(next, entry);    \

            *QLIST_RAW_NEXT(iter, entry) = prev;                               \

            prev = iter;                                                       \

            iter = next;                                                       \

        }                                                                      \

        *QLIST_RAW_FIRST(head) = prev;                                         \

        *QLIST_RAW_PREVIOUS(prev, entry) = QLIST_RAW_FIRST(head);              \

} while (0)



#endif /* QEMU_SYS_QUEUE_H */

migration/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ common-obj-y += qemu-file-channel.o 
common-obj-y += xbzrle.o postcopy-ram.o

common-obj-y += qjson.o

common-obj-y += block-dirty-bitmap.o

common-obj-y += multifd.o



common-obj-$(CONFIG_RDMA) += rdma.o