SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migration: Never call twice qemu_target_page_size()

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Juan Quintela 2021-11-22 16:21:16 +01:00
parent 47a1782461
commit 144fa06b34
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
migration/migration.c
View File

@ -996,6 +996,8 @@ static void populate_time_info(MigrationInfo *info, MigrationState *s)
static void populate_ram_info(MigrationInfo *info, MigrationState *s) static void populate_ram_info(MigrationInfo *info, MigrationState *s)
{ {
size_t page_size = qemu_target_page_size();
info->has_ram = true; info->has_ram = true;
info->ram = g_malloc0(sizeof(*info->ram)); info->ram = g_malloc0(sizeof(*info->ram));
info->ram->transferred = ram_counters.transferred; info->ram->transferred = ram_counters.transferred;
@ -1004,12 +1006,11 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
/* legacy value. It is not used anymore */ /* legacy value. It is not used anymore */
info->ram->skipped = 0; info->ram->skipped = 0;
info->ram->normal = ram_counters.normal; info->ram->normal = ram_counters.normal;
info->ram->normal_bytes = ram_counters.normal * info->ram->normal_bytes = ram_counters.normal * page_size;
qemu_target_page_size();
info->ram->mbps = s->mbps; info->ram->mbps = s->mbps;
info->ram->dirty_sync_count = ram_counters.dirty_sync_count; info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
info->ram->postcopy_requests = ram_counters.postcopy_requests; info->ram->postcopy_requests = ram_counters.postcopy_requests;
info->ram->page_size = qemu_target_page_size(); info->ram->page_size = page_size;
info->ram->multifd_bytes = ram_counters.multifd_bytes; info->ram->multifd_bytes = ram_counters.multifd_bytes;
info->ram->pages_per_second = s->pages_per_second; info->ram->pages_per_second = s->pages_per_second;

7
migration/multifd.c
View File

@ -289,7 +289,8 @@ static void multifd_send_fill_packet(MultiFDSendParams *p)
static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp) static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
{ {
MultiFDPacket_t *packet = p->packet; MultiFDPacket_t *packet = p->packet;
uint32_t pages_max = MULTIFD_PACKET_SIZE / qemu_target_page_size(); size_t page_size = qemu_target_page_size();
uint32_t pages_max = MULTIFD_PACKET_SIZE / page_size;
RAMBlock *block; RAMBlock *block;
int i; int i;
@ -358,14 +359,14 @@ static int multifd_recv_unfill_packet(MultiFDRecvParams *p, Error **errp)
for (i = 0; i < p->pages->used; i++) { for (i = 0; i < p->pages->used; i++) {
uint64_t offset = be64_to_cpu(packet->offset[i]); uint64_t offset = be64_to_cpu(packet->offset[i]);
if (offset > (block->used_length - qemu_target_page_size())) { if (offset > (block->used_length - page_size)) {
error_setg(errp, "multifd: offset too long %" PRIu64 error_setg(errp, "multifd: offset too long %" PRIu64
" (max " RAM_ADDR_FMT ")", " (max " RAM_ADDR_FMT ")",
offset, block->used_length); offset, block->used_length);
return -1; return -1;
} }
p->pages->iov[i].iov_base = block->host + offset; p->pages->iov[i].iov_base = block->host + offset;
p->pages->iov[i].iov_len = qemu_target_page_size(); p->pages->iov[i].iov_len = page_size;
} }
return 0; return 0;

5
migration/savevm.c
View File

@ -1685,6 +1685,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis,
{ {
PostcopyState ps = postcopy_state_set(POSTCOPY_INCOMING_ADVISE); PostcopyState ps = postcopy_state_set(POSTCOPY_INCOMING_ADVISE);
uint64_t remote_pagesize_summary, local_pagesize_summary, remote_tps; uint64_t remote_pagesize_summary, local_pagesize_summary, remote_tps;
size_t page_size = qemu_target_page_size();
Error *local_err = NULL; Error *local_err = NULL;
trace_loadvm_postcopy_handle_advise(); trace_loadvm_postcopy_handle_advise();
@ -1741,13 +1742,13 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis,
} }
remote_tps = qemu_get_be64(mis->from_src_file); remote_tps = qemu_get_be64(mis->from_src_file);
if (remote_tps != qemu_target_page_size()) { if (remote_tps != page_size) {
/* /*
* Again, some differences could be dealt with, but for now keep it * Again, some differences could be dealt with, but for now keep it
* simple. * simple.
*/ */
error_report("Postcopy needs matching target page sizes (s=%d d=%zd)", error_report("Postcopy needs matching target page sizes (s=%d d=%zd)",
(int)remote_tps, qemu_target_page_size()); (int)remote_tps, page_size);
return -1; return -1;
} }