qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Anthony Liguori <aliguori@us.ibm.com>
To: qemu-devel@nongnu.org
Cc: Chris Wright <chrisw@redhat.com>,
	Uri Lublin <uri.lublin@qumranet.com>,
	Anthony Liguori <aliguori@us.ibm.com>,
	kvm@vger.kernel.org
Subject: [Qemu-devel] [PATCH 4/10] Add dirty tracking for live migration
Date: Tue,  9 Sep 2008 14:49:56 -0500	[thread overview]
Message-ID: <1220989802-13706-5-git-send-email-aliguori@us.ibm.com> (raw)
In-Reply-To: <1220989802-13706-1-git-send-email-aliguori@us.ibm.com>

This patch adds a dirty tracking bit for live migration.  We use 0x08 because
kqemu uses 0x04.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/cpu-all.h b/cpu-all.h
index d350b30..fdac353 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -944,6 +944,7 @@ int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
 
 #define VGA_DIRTY_FLAG  0x01
 #define CODE_DIRTY_FLAG 0x02
+#define MIGRATION_DIRTY_FLAG 0x08
 
 /* read dirty bit (return 0 or 1) */
 static inline int cpu_physical_memory_is_dirty(ram_addr_t addr)
@@ -966,6 +967,10 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
                                      int dirty_flags);
 void cpu_tlb_update_dirty(CPUState *env);
 
+int cpu_physical_memory_set_dirty_tracking(int enable);
+
+int cpu_physical_memory_get_dirty_tracking(void);
+
 void dump_exec_info(FILE *f,
                     int (*cpu_fprintf)(FILE *f, const char *fmt, ...));
 
diff --git a/exec.c b/exec.c
index 3ab4ad0..9dba5c8 100644
--- a/exec.c
+++ b/exec.c
@@ -38,6 +38,7 @@
 #include "qemu-common.h"
 #include "tcg.h"
 #include "hw/hw.h"
+#include "osdep.h"
 #if defined(CONFIG_USER_ONLY)
 #include <qemu.h>
 #endif
@@ -113,6 +114,7 @@ ram_addr_t phys_ram_size;
 int phys_ram_fd;
 uint8_t *phys_ram_base;
 uint8_t *phys_ram_dirty;
+static int in_migration;
 static ram_addr_t phys_ram_alloc_offset = 0;
 #endif
 
@@ -1777,6 +1779,17 @@ void cpu_physical_memory_reset_dirty(ram_addr_t start, ram_addr_t end,
     }
 }
 
+int cpu_physical_memory_set_dirty_tracking(int enable)
+{
+    in_migration = enable;
+    return 0;
+}
+
+int cpu_physical_memory_get_dirty_tracking(void)
+{
+    return in_migration;
+}
+
 static inline void tlb_update_dirty(CPUTLBEntry *tlb_entry)
 {
     ram_addr_t ram_addr;
@@ -2932,9 +2945,19 @@ void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val)
         io_index = (pd >> IO_MEM_SHIFT) & (IO_MEM_NB_ENTRIES - 1);
         io_mem_write[io_index][2](io_mem_opaque[io_index], addr, val);
     } else {
-        ptr = phys_ram_base + (pd & TARGET_PAGE_MASK) +
-            (addr & ~TARGET_PAGE_MASK);
+        unsigned long addr1 = (pd & TARGET_PAGE_MASK) + (addr & ~TARGET_PAGE_MASK);
+        ptr = phys_ram_base + addr1;
         stl_p(ptr, val);
+
+        if (unlikely(in_migration)) {
+            if (!cpu_physical_memory_is_dirty(addr1)) {
+                /* invalidate code */
+                tb_invalidate_phys_page_range(addr1, addr1 + 4, 0);
+                /* set dirty bit */
+                phys_ram_dirty[addr1 >> TARGET_PAGE_BITS] |=
+                    (0xff & ~CODE_DIRTY_FLAG);
+            }
+        }
     }
 }
 

  parent reply	other threads:[~2008-09-09 19:51 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-09-09 19:49 [Qemu-devel] [PATCH 0/10] Live migration for QEMU Anthony Liguori
2008-09-09 19:49 ` [Qemu-devel] [PATCH 1/10] Refactor QEMUFile for live migration Anthony Liguori
2008-09-10 13:25   ` Chris Lalancette
2008-09-10 14:38   ` [Qemu-devel] " Glauber Costa
2008-09-10 15:05     ` Avi Kivity
2008-09-10 15:16     ` Anthony Liguori
2008-09-12 15:40   ` [Qemu-devel] " Blue Swirl
2008-09-09 19:49 ` [Qemu-devel] [PATCH 2/10] Allow the monitor to be suspended during non-blocking op Anthony Liguori
2008-09-10  6:52   ` Avi Kivity
2008-09-10 10:05     ` Daniel P. Berrange
2008-09-10 11:11       ` Avi Kivity
2008-09-10 11:14         ` Daniel P. Berrange
2008-09-10 15:36           ` Avi Kivity
2008-09-10 15:40             ` Anthony Liguori
2008-09-10 15:58         ` Jamie Lokier
2008-09-11 10:16           ` Avi Kivity
2008-09-11 11:59             ` Jamie Lokier
2008-09-10 13:07     ` Anthony Liguori
2008-09-10 13:26     ` Chris Lalancette
2008-09-10 10:01   ` Daniel P. Berrange
2008-09-10 13:11     ` Anthony Liguori
2008-09-09 19:49 ` [Qemu-devel] [PATCH 3/10] Add bdrv_flush_all() Anthony Liguori
2008-09-10 13:26   ` Chris Lalancette
2008-09-10 14:46     ` Glauber Costa
2008-09-10 15:19       ` Anthony Liguori
2008-09-10 15:32         ` Glauber Costa
2008-09-10 15:39         ` Avi Kivity
2008-09-10 16:37         ` Paul Brook
2008-09-12 15:43   ` Blue Swirl
2008-09-09 19:49 ` Anthony Liguori [this message]
2008-09-10 14:52   ` [Qemu-devel] [PATCH 4/10] Add dirty tracking for live migration Glauber Costa
2008-09-10 14:56     ` Anthony Liguori
2008-09-10 15:01       ` Glauber Costa
2008-09-09 19:49 ` [Qemu-devel] [PATCH 5/10] Add network announce function Anthony Liguori
2008-09-10 13:27   ` Chris Lalancette
2008-09-10 13:54     ` Anthony Liguori
2008-09-10 14:00     ` Avi Kivity
2008-09-09 19:49 ` [Qemu-devel] [PATCH 6/10] Introduce v3 of savevm protocol Anthony Liguori
2008-09-10  7:09   ` Avi Kivity
2008-09-09 19:49 ` [Qemu-devel] [PATCH 7/10] Switch the memory savevm handler to be "live" Anthony Liguori
2008-09-09 22:25   ` Jamie Lokier
2008-09-09 22:49     ` Anthony Liguori
2008-09-10  7:17   ` Avi Kivity
2008-09-10 13:10     ` Anthony Liguori
2008-09-09 19:50 ` [Qemu-devel] [PATCH 8/10] Introduce a buffered QEMUFile wrapper Anthony Liguori
2008-09-12 15:16   ` Blue Swirl
2008-09-09 19:50 ` [Qemu-devel] [PATCH 9/10] Introduce the UI components for live migration Anthony Liguori
2008-09-09 19:50 ` [Qemu-devel] [PATCH 10/10] TCP based " Anthony Liguori
2008-09-10 16:46   ` Blue Swirl
2008-09-10 16:51     ` Anthony Liguori
2008-09-11 12:13 ` [Qemu-devel] [PATCH 0/10] Live migration for QEMU Atsushi SAKAI
2008-09-11 13:06   ` Anthony Liguori
2008-09-11 13:30     ` Jamie Lokier
2008-09-11 14:12       ` Anthony Liguori
2008-09-11 15:32         ` Avi Kivity
2008-09-11 16:22           ` Anthony Liguori
2008-09-11 16:32             ` Avi Kivity

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=1220989802-13706-5-git-send-email-aliguori@us.ibm.com \
    --to=aliguori@us.ibm.com \
    --cc=chrisw@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=qemu-devel@nongnu.org \
    --cc=uri.lublin@qumranet.com \
    /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).