multifd: Add colo support
PATCH 3/5 multifd: Introduce multifd-internal.h
In reply to Lukas StraubIntroduce multifd-internal.h so code that would normally go into multifd.c can go into an extra file. This way, multifd.c hopefully won't grow to 4000 lines like ram.c
This will be used in the next commits to add colo support to multifd.
--- migration/multifd-internal.h | 34 ++++++++++++++++++++++++++++++++++ migration/multifd.c | 15 ++++----------- 2 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 migration/multifd-internal.h
migration/multifd-internal.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Internal Multifd header +* +* Copyright (c) 2019-2020 Red Hat Inc +* +* Authors: +* Juan Quintela <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#ifdef QEMU_MIGRATION_MULTIFD_INTERNAL_H +#error Only include this header directly +#endif +#define QEMU_MIGRATION_MULTIFD_INTERNAL_H + +#ifndef MULTIFD_INTERNAL +#error This header is internal to multifd +#endif + +struct MultiFDRecvState { +MultiFDRecvParams *params; +/* number of created threads */ +int count; +/* syncs main thread and channels */ +QemuSemaphore sem_sync; +/* global number of generated multifd packets */ +uint64_t packet_num; +/* multifd ops */ +MultiFDMethods *ops; +}; + +extern struct MultiFDRecvState *multifd_recv_state;
migration/multifd.c +4 -11
@@ -31,6 +31,9 @@#include "io/channel-socket.h" #include "yank_functions.h" +#define MULTIFD_INTERNAL +#include "multifd-internal.h" +/* Multiple fd's */ #define MULTIFD_MAGIC 0x11223344U
@@ -967,17 +970,7 @@ int multifd_save_setup(Error **errp)return 0 ; } -struct { -MultiFDRecvParams *params; -/* number of created threads */ -int count; -/* syncs main thread and channels */ -QemuSemaphore sem_sync; -/* global number of generated multifd packets */ -uint64_t packet_num; -/* multifd ops */ -MultiFDMethods *ops; -} *multifd_recv_state; +struct MultiFDRecvState *multifd_recv_state;static void multifd_recv_terminate_threads (Error *err) {
Signature · 1 line
2.39.2
PATCH 2/5 ram: Let colo_flush_ram_cache take the bitmap_mutex
In reply to Lukas StraubThis will be used in the next commits to add colo support to multifd.
--- migration/ram.c | 2 ++ 1 file changed, 2 insertions(+)
migration/ram.c +2 -0
@@ -4230,6 +4230,7 @@ void colo_flush_ram_cache(void)unsigned long offset =0 ;memory_global_dirty_log_sync (); +qemu_mutex_lock (&ram_state->bitmap_mutex); WITH_RCU_READ_LOCK_GUARD() {RAMBLOCK_FOREACH_NOT_IGNORED (block) {ramblock_sync_dirty_bitmap (ram_state, block);
@@ -4264,6 +4265,7 @@ void colo_flush_ram_cache(void) } } } +qemu_mutex_unlock (&ram_state->bitmap_mutex);trace_colo_flush_ram_cache_end (); }
Signature · 1 line
2.39.2
PATCH 4/5 multifd: Introduce a overridable revc_pages method
In reply to Lukas StraubThis allows to override the behaviour around recv_pages. Think of it like a "multifd_colo" child class of multifd.
This will be used in the next commits to add colo support to multifd.
--- migration/meson.build | 1 + migration/multifd-colo.c | 39 +++++++++++++++++++++++++++++ migration/multifd-internal.h | 5 ++++ migration/multifd.c | 48 ++++++++++++++++++++++++++++-------- 4 files changed, 83 insertions(+), 10 deletions(-) create mode 100644 migration/multifd-colo.c
migration/meson.build +1 -0
@@ -23,6 +23,7 @@ softmmu_ss.add(files( 'migration.c', 'multifd.c', 'multifd-zlib.c', + 'multifd-colo.c', 'options.c', 'postcopy-ram.c', 'savevm.c',
migration/multifd-colo.c new file +39 -0
@@ -0,0 +1,39 @@ +/* +* multifd colo implementation +* +* Copyright (c) Lukas Straub <[email protected]> +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +*/ + +#include "qemu/osdep.h" +#include "exec/target_page.h" +#include "exec/ramblock.h" +#include "qemu/error-report.h" +#include "qapi/error.h" +#include "ram.h" +#include "multifd.h" +#include "io/channel-socket.h" + +#define MULTIFD_INTERNAL +#include "multifd-internal.h" + +static int multifd_colo_recv_pages (MultiFDRecvParams *p,Error **errp) +{ +return multifd_recv_state->ops->recv_pages (p, errp); +} + +int multifd_colo_load_setup (Error **errp) +{ +int ret; + + ret =_multifd_load_setup (errp); +if (ret) { +return ret; + } + + multifd_recv_state->recv_pages = multifd_colo_recv_pages; + +return 0 ; +}
migration/multifd-internal.h +5 -0
@@ -29,6 +29,11 @@ struct MultiFDRecvState {uint64_t packet_num;/* multifd ops */ MultiFDMethods *ops; +/* overridable recv method */ +int (*recv_pages)(MultiFDRecvParams *p,Error **errp); };extern struct MultiFDRecvState *multifd_recv_state; + +int _multifd_load_setup (Error **errp); +int multifd_colo_load_setup (Error **errp);
migration/multifd.c +38 -10
71 lines not on this page · raw message
Signature · 1 line
2.39.2
cover multifd: Add colo support
Hello Everyone,
These patches add support for colo to multifd.
Lukas Straub (5):
ram: Add public helper to set colo bitmap
ram: Let colo_flush_ram_cache take the bitmap_mutex
multifd: Introduce multifd-internal.h
multifd: Introduce a overridable revc_pages method
multifd: Add colo support
migration/meson.build | 1 + migration/multifd-colo.c | 67 ++++++++++++++++++++++++++++++++ migration/multifd-internal.h | 39 +++++++++++++++++++ migration/multifd.c | 74 +++++++++++++++++++++++------------- migration/multifd.h | 2 + migration/ram.c | 19 +++++++-- migration/ram.h | 1 + 7 files changed, 173 insertions(+), 30 deletions(-) create mode 100644 migration/multifd-colo.c create mode 100644 migration/multifd-internal.h
Signature · 1 line
2.39.2
PATCH 5/5 multifd: Add colo support
--- migration/multifd-colo.c | 30 +++++++++++++++++++++++++++++- migration/multifd.c | 11 +++++------ migration/multifd.h | 2 ++ 3 files changed, 36 insertions(+), 7 deletions(-)
migration/multifd-colo.c +29 -1
@@ -15,13 +15,41 @@#include "ram.h" #include "multifd.h" #include "io/channel-socket.h" +#include "migration/colo.h" #define MULTIFD_INTERNAL #include "multifd-internal.h" static int multifd_colo_recv_pages (MultiFDRecvParams *p,Error **errp) { -return multifd_recv_state->ops->recv_pages (p, errp); +int ret =0 ; + +/* +* While we're still in precopy mode, we copy received pages to both guest +* and cache. No need to set dirty bits, since guest and cache memory are +* in sync. +*/ +if (migration_incoming_in_colo_state ()) { +colo_record_bitmap (p->block, p->normal, p->normal_num); + } + + p->host = p->block->colo_cache; + ret = multifd_recv_state->ops->recv_pages (p, errp); +if (ret !=0 ) { + p->host = p->block->host; +return ret; + } + +if (!migration_incoming_in_colo_state ()) { +for (int i =0 ; i < p->normal_num; i++) { +void *guest = p->block->host + p->normal[i]; +void *cache = p->host + p->normal[i]; +memcpy (guest, cache, p->page_size); + } + } + + p->host = p->block->host; +return ret; }int multifd_colo_load_setup (Error **errp)
migration/multifd.c +5 -6
@@ -284,7 +284,6 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)static int multifd_recv_unfill_packet (MultiFDRecvParams *p,Error **errp) {MultiFDPacket_t *packet = p->packet; -RAMBlock *block;int i; packet->magic =be32_to_cpu (packet->magic);
@@ -334,21 +333,21 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)/* make sure that ramblock is 0 terminated */ packet->ramblock[255 ] =0 ; - block =qemu_ram_block_by_name (packet->ramblock); -if (!block) { + p->block =qemu_ram_block_by_name (packet->ramblock); +if (!p->block) {error_setg (errp,"multifd: unknown ram block %s" , packet->ramblock);return -1 ; } - p->host = block->host; + p->host = p->block->host;for (i =0 ; i < p->normal_num; i++) {uint64_t offset =be64_to_cpu (packet->offset[i]); -if (offset > (block->used_length - p->page_size)) { +if (offset > (p->block->used_length - p->page_size)) {error_setg (errp,"multifd: offset too long %" PRIu64" (max " RAM_ADDR_FMT ")" , - offset, block->used_length); + offset, p->block->used_length);return -1 ; } p->normal[i] = offset;
migration/multifd.h +2 -0
@@ -175,6 +175,8 @@ typedef struct {uint32_t next_packet_size;/* packets sent through this channel */ uint64_t num_packets; +/* ramblock */ +RAMBlock *block;/* ramblock host address */ uint8_t *host;/* non zero pages recv through this channel */
Signature · 1 line
2.39.2
PATCH 1/5 ram: Add public helper to set colo bitmap
In reply to Lukas StraubThe overhead of the mutex in non-multifd mode is negligible, because in that case its just the single thread taking the mutex.
This will be used in the next commits to add colo support to multifd.
--- migration/ram.c | 17 ++++++++++++++--- migration/ram.h | 1 + 2 files changed, 15 insertions(+), 3 deletions(-)
migration/ram.c +14 -3
@@ -3633,6 +3633,18 @@ static ram_addr_t host_page_offset_from_ram_block_offset(RAMBlock *block,return ((uintptr_t )block->host + offset) & (block->page_size -1 ); } +void colo_record_bitmap (RAMBlock *block,ram_addr_t *normal,uint normal_num) +{ +qemu_mutex_lock (&ram_state->bitmap_mutex); +for (int i =0 ; i < normal_num; i++) { +ram_addr_t offset = normal[i]; + ram_state->migration_dirty_pages += !test_and_set_bit ( + offset >>TARGET_PAGE_BITS , + block->bmap); + } +qemu_mutex_unlock (&ram_state->bitmap_mutex); +} +static inline void *colo_cache_from_block_offset (RAMBlock *block,ram_addr_t offset,bool record_bitmap) {
@@ -3650,9 +3662,8 @@ static inline void *colo_cache_from_block_offset(RAMBlock *block,* It help us to decide which pages in ram cache should be flushed * into VM's RAM later. */ -if (record_bitmap && - !test_and_set_bit (offset >>TARGET_PAGE_BITS , block->bmap)) { - ram_state->migration_dirty_pages++; +if (record_bitmap) { +colo_record_bitmap (block, &offset,1 ); }return block->colo_cache + offset; }
migration/ram.h +1 -0
@@ -82,6 +82,7 @@ int colo_init_ram_cache(void);void colo_flush_ram_cache (void );void colo_release_ram_cache (void );void colo_incoming_start_dirty_log (void ); +void colo_record_bitmap (RAMBlock *block,ram_addr_t *normal,uint normal_num);/* Background snapshot */ bool ram_write_tracking_available (void );
Signature · 1 line
2.39.2
Copy Hailiang Zhang
Quoted 23 lines · Lukas Straub
Hello Everyone,
These patches add support for colo to multifd.Lukas Straub (5):
ram: Add public helper to set colo bitmap
ram: Letcolo_flush_ram_cachetake thebitmap_mutex
multifd: Introducemultifd-internal.h
multifd: Introduce a overridablerevc_pagesmethod
multifd: Add colo supportmigration/meson.build | 1 + migration/multifd-colo.c | 67 ++++++++++++++++++++++++++++++++ migration/multifd-internal.h | 39 +++++++++++++++++++ migration/multifd.c | 74 +++++++++++++++++++++++------------- migration/multifd.h | 2 + migration/ram.c | 19 +++++++-- migration/ram.h | 1 + 7 files changed, 173 insertions(+), 30 deletions(-) create mode 100644 migration/multifd-colo.c create mode 100644 migration/multifd-internal.hSignature · 1 line
2.39.2
Signature · 1 line
Peter Xu
Quoted 2 lines · Lukas Straub
Signed-off-by Lukas Straub <[email protected]>---
Please, split the move the creation of the p->block and the rest of the patch.
Quoted 52 lines
migration/multifd.c +5
-6@@ -284,7 +284,6 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)static int multifd_recv_unfill_packet (MultiFDRecvParams *p,Error **errp) {MultiFDPacket_t *packet = p->packet; -RAMBlock *block;int i; packet->magic =be32_to_cpu (packet->magic);@@ -334,21 +333,21 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)/* make sure that ramblock is 0 terminated */ packet->ramblock[255 ] =0 ; - block =qemu_ram_block_by_name (packet->ramblock); -if (!block) { + p->block =qemu_ram_block_by_name (packet->ramblock); +if (!p->block) {error_setg (errp,"multifd: unknown ram block %s" , packet->ramblock);return -1 ; } - p->host = block->host; + p->host = p->block->host;for (i =0 ; i < p->normal_num; i++) {uint64_t offset =be64_to_cpu (packet->offset[i]); -if (offset > (block->used_length - p->page_size)) { +if (offset > (p->block->used_length - p->page_size)) {error_setg (errp,"multifd: offset too long %" PRIu64" (max " RAM_ADDR_FMT ")" , - offset, block->used_length); + offset, p->block->used_length);return -1 ; } p->normal[i] = offset;migration/multifd.h +2
-0@@ -175,6 +175,8 @@ typedef struct {uint32_t next_packet_size;/* packets sent through this channel */ uint64_t num_packets; +/* ramblock */ +RAMBlock *block;/* ramblock host address */ uint8_t *host;/* non zero pages recv through this channel */