From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>,
Sergio Andres Gomez Del Real <Sergio.G.DelReal@gmail.com>
Subject: [Qemu-devel] [PULL 07/19] i386: hvf: implement vga dirty page tracking
Date: Wed, 20 Dec 2017 19:03:46 +0100 [thread overview]
Message-ID: <20171220180358.29316-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20171220180358.29316-1-pbonzini@redhat.com>
From: Sergio Andres Gomez Del Real <sergio.g.delreal@gmail.com>
This patch implements setting the tracking of dirty vga pages, using hvf's
interface to protect guest memory. It uses the MemoryListener callback
mechanism through .log_start/stop/sync
Signed-off-by: Sergio Andres Gomez Del Real <Sergio.G.DelReal@gmail.com>
Message-Id: <20170913090522.4022-13-Sergio.G.DelReal@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/sysemu/hvf.h | 5 ++++
target/i386/hvf-all.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 71 insertions(+), 7 deletions(-)
diff --git a/include/sysemu/hvf.h b/include/sysemu/hvf.h
index 614a2d203b..e4e43f6468 100644
--- a/include/sysemu/hvf.h
+++ b/include/sysemu/hvf.h
@@ -34,11 +34,16 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx,
#define hvf_get_supported_cpuid(func, idx, reg) 0
#endif
+/* hvf_slot flags */
+#define HVF_SLOT_LOG (1 << 0)
+
typedef struct hvf_slot {
uint64_t start;
uint64_t size;
uint8_t *mem;
int slot_id;
+ uint32_t flags;
+ MemoryRegion *region;
} hvf_slot;
typedef struct hvf_vcpu_caps {
diff --git a/target/i386/hvf-all.c b/target/i386/hvf-all.c
index cfd7de4f6a..d8c7981120 100644
--- a/target/i386/hvf-all.c
+++ b/target/i386/hvf-all.c
@@ -193,6 +193,7 @@ void hvf_set_phys_mem(MemoryRegionSection *section, bool add)
mem->size = int128_get64(section->size);
mem->mem = memory_region_get_ram_ptr(area) + section->offset_within_region;
mem->start = section->offset_within_address_space;
+ mem->region = area;
if (do_hvf_set_memory(mem)) {
error_report("Error registering new memory slot\n");
@@ -289,8 +290,7 @@ void hvf_cpu_synchronize_post_init(CPUState *cpu_state)
run_on_cpu(cpu_state, _hvf_cpu_synchronize_post_init, RUN_ON_CPU_NULL);
}
-/* TODO: ept fault handlig */
-static bool ept_emulation_fault(uint64_t ept_qual)
+static bool ept_emulation_fault(hvf_slot *slot, addr_t gpa, uint64_t ept_qual)
{
int read, write;
@@ -306,6 +306,14 @@ static bool ept_emulation_fault(uint64_t ept_qual)
return false;
}
+ if (write && slot) {
+ if (slot->flags & HVF_SLOT_LOG) {
+ memory_region_set_dirty(slot->region, gpa - slot->start, 1);
+ hv_vm_protect((hv_gpaddr_t)slot->start, (size_t)slot->size,
+ HV_MEMORY_READ | HV_MEMORY_WRITE);
+ }
+ }
+
/*
* The EPT violation must have been caused by accessing a
* guest-physical address that is a translation of a guest-linear
@@ -316,7 +324,58 @@ static bool ept_emulation_fault(uint64_t ept_qual)
return false;
}
- return true;
+ return !slot;
+}
+
+static void hvf_set_dirty_tracking(MemoryRegionSection *section, bool on)
+{
+ hvf_slot *slot;
+
+ slot = hvf_find_overlap_slot(
+ section->offset_within_address_space,
+ section->offset_within_address_space + int128_get64(section->size));
+
+ /* protect region against writes; begin tracking it */
+ if (on) {
+ slot->flags |= HVF_SLOT_LOG;
+ hv_vm_protect((hv_gpaddr_t)slot->start, (size_t)slot->size,
+ HV_MEMORY_READ);
+ /* stop tracking region*/
+ } else {
+ slot->flags &= ~HVF_SLOT_LOG;
+ hv_vm_protect((hv_gpaddr_t)slot->start, (size_t)slot->size,
+ HV_MEMORY_READ | HV_MEMORY_WRITE);
+ }
+}
+
+static void hvf_log_start(MemoryListener *listener,
+ MemoryRegionSection *section, int old, int new)
+{
+ if (old != 0) {
+ return;
+ }
+
+ hvf_set_dirty_tracking(section, 1);
+}
+
+static void hvf_log_stop(MemoryListener *listener,
+ MemoryRegionSection *section, int old, int new)
+{
+ if (new != 0) {
+ return;
+ }
+
+ hvf_set_dirty_tracking(section, 0);
+}
+
+static void hvf_log_sync(MemoryListener *listener,
+ MemoryRegionSection *section)
+{
+ /*
+ * sync of dirty pages is handled elsewhere; just make sure we keep
+ * tracking the region.
+ */
+ hvf_set_dirty_tracking(section, 1);
}
static void hvf_region_add(MemoryListener *listener,
@@ -335,6 +394,9 @@ static MemoryListener hvf_memory_listener = {
.priority = 10,
.region_add = hvf_region_add,
.region_del = hvf_region_del,
+ .log_start = hvf_log_start,
+ .log_stop = hvf_log_stop,
+ .log_sync = hvf_log_sync,
};
void hvf_reset_vcpu(CPUState *cpu) {
@@ -605,7 +667,7 @@ int hvf_vcpu_exec(CPUState *cpu)
slot = hvf_find_overlap_slot(gpa, gpa);
/* mmio */
- if (ept_emulation_fault(exit_qual) && !slot) {
+ if (ept_emulation_fault(slot, gpa, exit_qual)) {
struct x86_decode decode;
load_regs(cpu);
@@ -616,9 +678,6 @@ int hvf_vcpu_exec(CPUState *cpu)
store_regs(cpu);
break;
}
-#ifdef DIRTY_VGA_TRACKING
- /* TODO: handle dirty page tracking */
-#endif
break;
}
case EXIT_REASON_INOUT:
--
2.14.3
next prev parent reply other threads:[~2017-12-20 18:04 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-20 18:03 [Qemu-devel] [PULL 00/19] Initial support for Hypervisor.framework Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 01/19] apic: add function to apic that will be used by hvf Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 02/19] i386: hvf: add code base from Google's QEMU repository Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 03/19] i386: hvf: fix licensing issues; isolate task handling code (GPL v2-only) Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 04/19] i386: hvf: use new helper functions for put/get xsave Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 05/19] i386: hvf: implement hvf_get_supported_cpuid Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 06/19] i386: refactor KVM cpuid code so that it applies to hvf as well Paolo Bonzini
2017-12-20 18:03 ` Paolo Bonzini [this message]
2017-12-20 18:03 ` [Qemu-devel] [PULL 08/19] i386: hvf: refactor event injection code for hvf Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 09/19] i386: hvf: inject General Protection Fault when vmexit through vmcall Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 10/19] i386: hvf: move all hvf files in the same directory Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 11/19] i386: hvf: header cleanup Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 12/19] i386: hvf: unify register enums between HVF and the rest Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 13/19] i386: hvf: remove more dead emulator code Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 14/19] i386: hvf: remove ZERO_INIT macro Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 15/19] i386: hvf: abort on decoding error Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 16/19] i386: hvf: simplify flag handling Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 17/19] i386: hvf: remove addr_t Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 18/19] i386: hvf: remove VM_PANIC from "in" Paolo Bonzini
2017-12-20 18:03 ` [Qemu-devel] [PULL 19/19] i386: hvf: cleanup x86_gen.h Paolo Bonzini
2017-12-20 19:15 ` [Qemu-devel] [PULL 00/19] Initial support for Hypervisor.framework no-reply
2017-12-20 19:16 ` no-reply
2017-12-20 20:31 ` Peter Maydell
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=20171220180358.29316-8-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=sergio.g.delreal@gmail.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).