qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Juan Quintela <quintela@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>, Juan Quintela <quintela@redhat.com>,
	Leonardo Bras <leobras@redhat.com>
Subject: [PATCH v3 04/12] migration: Make dirty_sync_missed_zero_copy atomic
Date: Wed, 19 Apr 2023 18:24:07 +0200	[thread overview]
Message-ID: <20230419162415.16260-5-quintela@redhat.com> (raw)
In-Reply-To: <20230419162415.16260-1-quintela@redhat.com>

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 migration/ram.h       | 4 +---
 migration/migration.c | 2 +-
 migration/multifd.c   | 2 +-
 migration/ram.c       | 5 -----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/migration/ram.h b/migration/ram.h
index ed70391317..2170c55e67 100644
--- a/migration/ram.h
+++ b/migration/ram.h
@@ -43,7 +43,7 @@
 typedef struct {
     int64_t dirty_pages_rate;
     int64_t dirty_sync_count;
-    uint64_t dirty_sync_missed_zero_copy;
+    Stat64 dirty_sync_missed_zero_copy;
     uint64_t downtime_bytes;
     Stat64 duplicate;
     Stat64 multifd_bytes;
@@ -114,6 +114,4 @@ void ram_write_tracking_prepare(void);
 int ram_write_tracking_start(void);
 void ram_write_tracking_stop(void);
 
-void dirty_sync_missed_zero_copy(void);
-
 #endif
diff --git a/migration/migration.c b/migration/migration.c
index c3debe71f6..66e5197b77 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -1150,7 +1150,7 @@ static void populate_ram_info(MigrationInfo *info, MigrationState *s)
     info->ram->mbps = s->mbps;
     info->ram->dirty_sync_count = ram_counters.dirty_sync_count;
     info->ram->dirty_sync_missed_zero_copy =
-            ram_counters.dirty_sync_missed_zero_copy;
+        stat64_get(&ram_counters.dirty_sync_missed_zero_copy);
     info->ram->postcopy_requests = ram_counters.postcopy_requests;
     info->ram->page_size = page_size;
     info->ram->multifd_bytes = stat64_get(&ram_counters.multifd_bytes);
diff --git a/migration/multifd.c b/migration/multifd.c
index 1c992abf53..903df2117b 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -576,7 +576,7 @@ static int multifd_zero_copy_flush(QIOChannel *c)
         return -1;
     }
     if (ret == 1) {
-        dirty_sync_missed_zero_copy();
+        stat64_add(&ram_counters.dirty_sync_missed_zero_copy, 1);
     }
 
     return ret;
diff --git a/migration/ram.c b/migration/ram.c
index 95ba5ea0c5..72e3d78589 100644
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -472,11 +472,6 @@ void ram_transferred_add(uint64_t bytes)
     stat64_add(&ram_counters.transferred, bytes);
 }
 
-void dirty_sync_missed_zero_copy(void)
-{
-    ram_counters.dirty_sync_missed_zero_copy++;
-}
-
 struct MigrationOps {
     int (*ram_save_target_page)(RAMState *rs, PageSearchStatus *pss);
 };
-- 
2.39.2



  parent reply	other threads:[~2023-04-19 16:25 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-19 16:24 [PATCH v3 00/12] Migration: Make more ram_counters atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 01/12] migration: Merge ram_counters and ram_atomic_counters Juan Quintela
2023-04-19 16:24 ` [PATCH v3 02/12] migration: Update atomic stats out of the mutex Juan Quintela
2023-04-19 16:24 ` [PATCH v3 03/12] migration: Make multifd_bytes atomic Juan Quintela
2023-04-19 16:24 ` Juan Quintela [this message]
2023-04-19 16:24 ` [PATCH v3 05/12] migration: Make precopy_bytes atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 06/12] migration: Make downtime_bytes atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 07/12] migration: Make dirty_sync_count atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 08/12] migration: Make postcopy_requests atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 09/12] migration: Make dirty_pages_rate atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 10/12] migration: Make dirty_bytes_last_sync atomic Juan Quintela
2023-04-19 16:24 ` [PATCH v3 11/12] migration: Rename duplicate to zero_pages Juan Quintela
2023-04-19 16:24 ` [PATCH v3 12/12] migration: Rename normal to full_pages Juan Quintela
2023-04-19 19:29 ` [PATCH v3 00/12] Migration: Make more ram_counters atomic Peter Xu
2023-04-19 19:54   ` Juan Quintela

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230419162415.16260-5-quintela@redhat.com \
    --to=quintela@redhat.com \
    --cc=leobras@redhat.com \
    --cc=peterx@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).