Skip to content

Commit

Permalink
migration/multifd: Enable multifd zero page checking by default.
Browse files Browse the repository at this point in the history
1. Set default "zero-page-detection" option to "multifd". Now
zero page checking can be done in the multifd threads and this
becomes the default configuration.
2. Handle migration QEMU9.0 -> QEMU8.2 compatibility. We provide
backward compatibility where zero page checking is done from the
migration main thread.

Signed-off-by: Hao Xiang <hao.xiang@bytedance.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Link: https://lore.kernel.org/r/20240311180015.3359271-7-hao.xiang@linux.dev
Signed-off-by: Peter Xu <peterx@redhat.com>
  • Loading branch information
haoxiangbd authored and xzpeter committed Mar 11, 2024
1 parent 9ae90f7 commit 70c25c9
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion hw/core/machine.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@
#include "hw/virtio/virtio-net.h"
#include "audio/audio.h"

GlobalProperty hw_compat_8_2[] = {};
GlobalProperty hw_compat_8_2[] = {
{ "migration", "zero-page-detection", "legacy"},
};
const size_t hw_compat_8_2_len = G_N_ELEMENTS(hw_compat_8_2);

GlobalProperty hw_compat_8_1[] = {
Expand Down
2 changes: 1 addition & 1 deletion migration/options.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ Property migration_properties[] = {
MIG_MODE_NORMAL),
DEFINE_PROP_ZERO_PAGE_DETECTION("zero-page-detection", MigrationState,
parameters.zero_page_detection,
ZERO_PAGE_DETECTION_LEGACY),
ZERO_PAGE_DETECTION_MULTIFD),

/* Migration capabilities */
DEFINE_PROP_MIG_CAP("x-xbzrle", MIGRATION_CAPABILITY_XBZRLE),
Expand Down
6 changes: 3 additions & 3 deletions qapi/migration.json
Original file line number Diff line number Diff line change
Expand Up @@ -909,7 +909,7 @@
# (Since 8.2)
#
# @zero-page-detection: Whether and how to detect zero pages.
# See description in @ZeroPageDetection. Default is 'legacy'.
# See description in @ZeroPageDetection. Default is 'multifd'.
# (since 9.0)
#
# Features:
Expand Down Expand Up @@ -1106,7 +1106,7 @@
# (Since 8.2)
#
# @zero-page-detection: Whether and how to detect zero pages.
# See description in @ZeroPageDetection. Default is 'legacy'.
# See description in @ZeroPageDetection. Default is 'multifd'.
# (since 9.0)
#
# Features:
Expand Down Expand Up @@ -1339,7 +1339,7 @@
# (Since 8.2)
#
# @zero-page-detection: Whether and how to detect zero pages.
# See description in @ZeroPageDetection. Default is 'legacy'.
# See description in @ZeroPageDetection. Default is 'multifd'.
# (since 9.0)
#
# Features:
Expand Down

0 comments on commit 70c25c9

Please sign in to comment.