OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

migration: Make dirty_pages_rate atomic

Browse Source 
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>

---

Don't use __nocheck() variants
Use stat64_get()
This commit is contained in:
Juan Quintela 2023-04-11 18:19:05 +02:00
parent 7757b55eed
commit 72f8e58707
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
migration/migration.c
View File

@ -958,7 +958,8 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
if (s->state != MIGRATION_STATUS_COMPLETED) { if (s->state != MIGRATION_STATUS_COMPLETED) {
info->ram->remaining = ram_bytes_remaining(); info->ram->remaining = ram_bytes_remaining();
info->ram->dirty_pages_rate = ram_counters.dirty_pages_rate; info->ram->dirty_pages_rate =
stat64_get(&ram_counters.dirty_pages_rate);
} }
} }
@ -2689,7 +2690,8 @@ static void migration_update_counters(MigrationState *s,
* if we haven't sent anything, we don't want to * if we haven't sent anything, we don't want to
* recalculate. 10000 is a small enough number for our purposes * recalculate. 10000 is a small enough number for our purposes
*/ */
if (ram_counters.dirty_pages_rate && transferred > 10000) { if (stat64_get(&ram_counters.dirty_pages_rate) &&
transferred > 10000) {
s->expected_downtime = ram_counters.remaining / bandwidth; s->expected_downtime = ram_counters.remaining / bandwidth;
} }

5
migration/ram.c
View File

@ -1130,8 +1130,9 @@ static void migration_update_rates(RAMState *rs, int64_t end_time)
double compressed_size; double compressed_size;
/* calculate period counters */ /* calculate period counters */
ram_counters.dirty_pages_rate = rs->num_dirty_pages_period * 1000 stat64_set(&ram_counters.dirty_pages_rate,
/ (end_time - rs->time_last_bitmap_sync); rs->num_dirty_pages_period * 1000 /
(end_time - rs->time_last_bitmap_sync));
if (!page_count) { if (!page_count) {
return; return;

2
migration/ram.h
View File

@ -41,7 +41,7 @@
* one thread). * one thread).
*/ */
typedef struct { typedef struct {
int64_t dirty_pages_rate; Stat64 dirty_pages_rate;
Stat64 dirty_sync_count; Stat64 dirty_sync_count;
Stat64 dirty_sync_missed_zero_copy; Stat64 dirty_sync_missed_zero_copy;
Stat64 downtime_bytes; Stat64 downtime_bytes;