[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/6] replace cpu_physical_memory_rw
From: |
Glauber Costa |
Subject: |
[Qemu-devel] [PATCH 4/6] replace cpu_physical_memory_rw |
Date: |
Thu, 18 Dec 2008 12:01:40 -0500 |
This patch introduces a kvm version of cpu_physical_memory_rw.
The main motivation is to bypass tcg version, which contains
tcg-specific code, as well as data structures not used by kvm,
such as l1_phys_map.
In this patch, I'm using a runtime selection of which function
to call, but the mid-term goal is to use function pointers in
a way very close to which QEMUAccel used to be.
Signed-off-by: Glauber Costa <address@hidden>
---
exec.c | 13 +++++++++++--
kvm-all.c | 44 ++++++++++++++++++++++++++++++++++++++++----
kvm.h | 2 ++
3 files changed, 53 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index 25b403e..9a52275 100644
--- a/exec.c
+++ b/exec.c
@@ -2937,8 +2937,8 @@ int cpu_physical_memory_do_io(target_phys_addr_t addr,
uint8_t *buf, int l, int
return l;
}
-void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
- int len, int is_write)
+static void tcg_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
+ int len, int is_write)
{
int l;
uint8_t *ptr;
@@ -2996,6 +2996,15 @@ void cpu_physical_memory_rw(target_phys_addr_t addr,
uint8_t *buf,
}
}
+void cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
+ int len, int is_write)
+{
+ if (kvm_enabled())
+ kvm_cpu_physical_memory_rw(addr, buf, len, is_write);
+ else
+ tcg_physical_memory_rw(addr, buf, len, is_write);
+}
+
/* used for ROM loading : can write in RAM and ROM */
void cpu_physical_memory_write_rom(target_phys_addr_t addr,
const uint8_t *buf, int len)
diff --git a/kvm-all.c b/kvm-all.c
index 3c12c37..90c1413 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -540,7 +540,7 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr,
mem = kvm_lookup_slot(s, start_addr);
if (mem) {
- if ((flags == IO_MEM_UNASSIGNED) || (flags >= TLB_MMIO)) {
+ if ((flags == IO_MEM_UNASSIGNED)) {
mem->memory_size = 0;
mem->start_addr = start_addr;
mem->phys_offset = 0;
@@ -559,6 +559,8 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr,
mem->phys_offset)
return;
+ if ((phys_offset & ~TARGET_PAGE_MASK) != 0)
+ return;
/* unregister whole slot */
memcpy(&slot, mem, sizeof(slot));
mem->memory_size = 0;
@@ -598,16 +600,21 @@ void kvm_set_phys_mem(target_phys_addr_t start_addr,
}
}
/* KVM does not need to know about this memory */
- if (flags >= IO_MEM_UNASSIGNED)
+ if (flags == IO_MEM_UNASSIGNED)
return;
- mem = kvm_alloc_slot(s);
+ if (!mem)
+ mem = kvm_alloc_slot(s);
mem->memory_size = size;
mem->start_addr = start_addr;
mem->phys_offset = phys_offset;
mem->flags = 0;
- kvm_set_user_memory_region(s, mem);
+ if (flags < TLB_MMIO)
+ kvm_set_user_memory_region(s, mem);
+ else{
+ mem->phys_offset = flags;
+ }
/* FIXME deal with errors */
}
@@ -673,3 +680,32 @@ int kvm_has_sync_mmu(void)
return 0;
}
+
+void kvm_cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
+ int len, int is_write)
+{
+ KVMSlot *mem;
+ KVMState *s = kvm_state;
+ int l;
+
+ mem = kvm_lookup_slot(s, addr);
+ if (!mem)
+ return;
+
+ if ((mem->phys_offset & ~TARGET_PAGE_MASK) >= TLB_MMIO) {
+ l = 0;
+ while (len > l)
+ l += cpu_physical_memory_do_io(addr + l, buf + l, len - l,
is_write, mem->phys_offset);
+ } else {
+ uint8_t *uaddr = phys_ram_base + mem->phys_offset + (addr -
mem->start_addr);
+ l = len;
+ if (addr + len > mem->start_addr + mem->memory_size)
+ l = mem->memory_size - addr;
+ if (!is_write)
+ memcpy(buf, uaddr, l);
+ else
+ memcpy(uaddr, buf, l);
+ if (l != len)
+ kvm_cpu_physical_memory_rw(addr + l, buf + l, len - l, is_write);
+ }
+}
diff --git a/kvm.h b/kvm.h
index efce145..e3e9ca0 100644
--- a/kvm.h
+++ b/kvm.h
@@ -49,6 +49,8 @@ int kvm_has_sync_mmu(void);
int kvm_coalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);
int kvm_uncoalesce_mmio_region(target_phys_addr_t start, ram_addr_t size);
+void kvm_cpu_physical_memory_rw(target_phys_addr_t addr, uint8_t *buf,
+ int len, int is_write);
/* internal API */
struct KVMState;
--
1.5.6.5
- [Qemu-devel] [PATCH 0/6] bypass tcg memory functions -v2, Glauber Costa, 2008/12/18
- [Qemu-devel] [PATCH 1/6] remove smaller slots if registering a bigger one, Glauber Costa, 2008/12/18
- [Qemu-devel] [PATCH 2/6] re-register whole area upon lfb unmap., Glauber Costa, 2008/12/18
- [Qemu-devel] [PATCH 3/6] isolate io handling routine, Glauber Costa, 2008/12/18
- [Qemu-devel] [PATCH 4/6] replace cpu_physical_memory_rw,
Glauber Costa <=
- [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Glauber Costa, 2008/12/18
- [Qemu-devel] [PATCH 6/6] cache slot lookup, Glauber Costa, 2008/12/18
- Re: [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Blue Swirl, 2008/12/19
- Re: [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Laurent Desnogues, 2008/12/19
- Re: [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Anthony Liguori, 2008/12/19
- Re: [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Blue Swirl, 2008/12/20
- Re: [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Glauber Costa, 2008/12/22
- Re: [Qemu-devel] [PATCH 5/6] hook cpu_register_physical_mem, Blue Swirl, 2008/12/23