[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 3/7] exec: extend skip field to 6 bit, page entry
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PATCH v2 3/7] exec: extend skip field to 6 bit, page entry to 32 bit |
Date: |
Wed, 13 Nov 2013 21:23:52 +0200 |
Extend skip to 6 bit. As page entry doesn't fit in 16 bit
any longer anyway, extend it to 32 bit.
This doubles node map memory requirements, but follow-up
patches will save this memory.
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
exec.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/exec.c b/exec.c
index 51e4953..ec46aea 100644
--- a/exec.c
+++ b/exec.c
@@ -84,11 +84,13 @@ typedef struct PhysPageEntry PhysPageEntry;
struct PhysPageEntry {
/* How many bits skip to next level (in units of L2_SIZE). 0 for a leaf. */
- uint16_t skip : 1;
+ uint32_t skip : 6;
/* index into phys_sections (!skip) or phys_map_nodes (skip) */
- uint16_t ptr : 15;
+ uint32_t ptr : 26;
};
+#define PHYS_MAP_NODE_NIL (((uint32_t)~0) >> 6)
+
/* Size of the L2 (and L3, etc) page tables. */
#define ADDR_SPACE_BITS TARGET_PHYS_ADDR_SPACE_BITS
@@ -134,8 +136,6 @@ typedef struct PhysPageMap {
static PhysPageMap *prev_map;
static PhysPageMap next_map;
-#define PHYS_MAP_NODE_NIL (((uint16_t)~0) >> 1)
-
static void io_mem_init(void);
static void memory_map_init(void);
@@ -156,10 +156,10 @@ static void phys_map_node_reserve(unsigned nodes)
}
}
-static uint16_t phys_map_node_alloc(void)
+static uint32_t phys_map_node_alloc(void)
{
unsigned i;
- uint16_t ret;
+ uint32_t ret;
ret = next_map.nodes_nb++;
assert(ret != PHYS_MAP_NODE_NIL);
--
MST
- [Qemu-devel] [PATCH v2 0/7] making address spaces 64 bit wide, Michael S. Tsirkin, 2013/11/13
- [Qemu-devel] [PATCH v2 1/7] split definitions for exec.c and translate-all.c radix trees, Michael S. Tsirkin, 2013/11/13
- [Qemu-devel] [PATCH v2 2/7] exec: replace leaf with skip, Michael S. Tsirkin, 2013/11/13
- [Qemu-devel] [PATCH v2 3/7] exec: extend skip field to 6 bit, page entry to 32 bit,
Michael S. Tsirkin <=
- [Qemu-devel] [PATCH v2 4/7] exec: pass hw address to phys_page_find, Michael S. Tsirkin, 2013/11/13
- [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level compression, Michael S. Tsirkin, 2013/11/13
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tr ee page level compression, Avi Kivity, 2013/11/14
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level?compression, Michael S. Tsirkin, 2013/11/14
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level?compression, Avi Kivity, 2013/11/14
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level?compression, Michael S. Tsirkin, 2013/11/14
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level?compression, Avi Kivity, 2013/11/14
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level?compression, Michael S. Tsirkin, 2013/11/17
- Re: [Qemu-devel] [PATCH v2 5/7] exec: memory radix tree page level?compression, Avi Kivity, 2013/11/17
[Qemu-devel] [PATCH v2 6/7] exec: make address spaces 64-bit wide, Michael S. Tsirkin, 2013/11/13