tools/hvmloader: sync memory map[]

Currently we always use memory map[] to help hvmloader construct e820 table
but hvmloader may have relocated RAM to support mmio allocation or just
populated ram to ensure we can have enough room to load ovmf. Anyway we
need to sync these changes into memory map[].

CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Jackson <ian.jackson@eu.citrix.com>
CC: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
CC: Ian Campbell <ian.campbell@citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
CC: George Dunlap <george.dunlap@eu.citrix.com>
Signed-off-by: Tiejun Chen <tiejun.chen@intel.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>

diff --git a/tools/firmware/hvmloader/e820.c b/tools/firmware/hvmloader/e820.c
index a6cacdf9e6be17343d0c7b6bcbd27342b73bd856..f4ccacbd7ebd7ebec444c48850bf6611deaa7fc5 100644 (file)
--- a/tools/firmware/hvmloader/e820.c
+++ b/tools/firmware/hvmloader/e820.c
@@ -55,6 +55,54 @@ void memory_map_setup(void)
     }
 }
 
+/*
+ * Sometimes hvmloader may have relocated RAM so low_mem_pgend/high_mem_end
+ * would be changed over there. But memory_map[] just records the
+ * original low/high memory, so we need to sync these entries once
+ * hvmloader modifies low/high memory.
+ */
+void adjust_memory_map(void)
+{
+    uint32_t low_mem_end = hvm_info->low_mem_pgend << PAGE_SHIFT;
+    uint64_t high_mem_end = (uint64_t)hvm_info->high_mem_pgend << PAGE_SHIFT;
+    unsigned int i;
+
+    for ( i = 0; i < memory_map.nr_map; i++ )
+    {
+        uint64_t map_start = memory_map.map[i].addr;
+        uint64_t map_size = memory_map.map[i].size;
+        uint64_t map_end = map_start + map_size;
+
+        /* If we need to adjust lowmem. */
+        if ( memory_map.map[i].type == E820_RAM &&
+             low_mem_end > map_start && low_mem_end < map_end )
+        {
+            memory_map.map[i].size = low_mem_end - map_start;
+            continue;
+        }
+
+        /* Modify the existing highmem region if it exists. */
+        if ( memory_map.map[i].type == E820_RAM &&
+             high_mem_end && map_start == ((uint64_t)1 << 32) )
+        {
+            if ( high_mem_end != map_end )
+                memory_map.map[i].size = high_mem_end - map_start;
+            high_mem_end = 0;
+            continue;
+        }
+    }
+
+    /* If there was no highmem region, just create one. */
+    if ( high_mem_end )
+    {
+        memory_map.map[i].addr = ((uint64_t)1 << 32);
+        memory_map.map[i].size =
+                ((uint64_t)hvm_info->high_mem_pgend << PAGE_SHIFT) -
+                    memory_map.map[i].addr;
+        memory_map.map[i].type = E820_RAM;
+    }
+}
+
 void dump_e820_table(struct e820entry *e820, unsigned int nr)
 {
     uint64_t last_end = 0, start, end;
@@ -107,9 +155,6 @@ int build_e820_table(struct e820entry *e820,
 {
     unsigned int nr = 0, i, j;
     uint32_t low_mem_end = hvm_info->low_mem_pgend << PAGE_SHIFT;
-    uint32_t add_high_mem = 0;
-    uint64_t high_mem_end = (uint64_t)hvm_info->high_mem_pgend << PAGE_SHIFT;
-    uint64_t map_start, map_size, map_end;
 
     if ( !lowmem_reserved_base )
             lowmem_reserved_base = 0xA0000;
@@ -208,62 +253,8 @@ int build_e820_table(struct e820entry *e820,
      *
      * Note we just have one low memory entry and one high mmeory entry if
      * exists.
-     *
-     * But we may have relocated RAM to allocate sufficient MMIO previously
-     * so low_mem_pgend would be changed over there. And here memory_map[]
-     * records the original low/high memory, so if low_mem_end is less than
-     * the original we need to revise low/high memory range firstly.
      */
     for ( i = 0; i < memory_map.nr_map; i++ )
-    {
-        map_start = memory_map.map[i].addr;
-        map_size = memory_map.map[i].size;
-        map_end = map_start + map_size;
-
-        /* If we need to adjust lowmem. */
-        if ( memory_map.map[i].type == E820_RAM &&
-             low_mem_end > map_start && low_mem_end < map_end )
-        {
-            add_high_mem = map_end - low_mem_end;
-            memory_map.map[i].size = low_mem_end - map_start;
-            break;
-        }
-    }
-
-    /* If we need to adjust highmem. */
-    if ( add_high_mem )
-    {
-        /* Modify the existing highmem region if it exists. */
-        for ( i = 0; i < memory_map.nr_map; i++ )
-        {
-            map_start = memory_map.map[i].addr;
-            map_size = memory_map.map[i].size;
-            map_end = map_start + map_size;
-
-            if ( memory_map.map[i].type == E820_RAM &&
-                 map_start == ((uint64_t)1 << 32))
-            {
-                memory_map.map[i].size += add_high_mem;
-                break;
-            }
-        }
-
-        /* If there was no highmem region, just create one. */
-        if ( i == memory_map.nr_map )
-        {
-            memory_map.map[i].addr = ((uint64_t)1 << 32);
-            memory_map.map[i].size = add_high_mem;
-            memory_map.map[i].type = E820_RAM;
-            memory_map.nr_map++;
-        }
-
-        /* A sanity check if high memory is broken. */
-        BUG_ON( high_mem_end !=
-                memory_map.map[i].addr + memory_map.map[i].size);
-    }
-
-    /* Now fill e820. */
-    for ( i = 0; i < memory_map.nr_map; i++ )
     {
         e820[nr] = memory_map.map[i];
         nr++;

diff --git a/tools/firmware/hvmloader/pci.c b/tools/firmware/hvmloader/pci.c
index ff81fbad575f75167ce991a669adbd4d3caaf976..69b98d62460943510fedba3bbd23c8a01152e038 100644 (file)
--- a/tools/firmware/hvmloader/pci.c
+++ b/tools/firmware/hvmloader/pci.c
@@ -383,6 +383,9 @@ void pci_setup(void)
         hvm_info->high_mem_pgend += nr_pages;
     }
 
+    /* Sync memory map[] if necessary. */
+    adjust_memory_map();
+
     high_mem_resource.base = ((uint64_t)hvm_info->high_mem_pgend) << PAGE_SHIFT;
     if ( high_mem_resource.base < 1ull << 32 )
     {

diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 122e3fa4caa745e56d53e9cfd3d4ee67d71f7c41..32ddcd06861e100c7465001b3363226e8d589f8b 100644 (file)
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -432,6 +432,9 @@ void mem_hole_populate_ram(xen_pfn_t mfn, uint32_t nr_mfns)
         if ( hypercall_memory_op(XENMEM_add_to_physmap, &xatp) != 0 )
             BUG();
     }
+
+    /* Sync memory map[]. */
+    adjust_memory_map();
 }
 
 static uint32_t alloc_up = RESERVED_MEMORY_DYNAMIC_START - 1;

diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index 1100a3bdab48e8b03b7e10beeb84b81218adab8b..132d915d879705c3e410624d10d93b7f84763d2c 100644 (file)
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -227,6 +227,9 @@ void pci_setup(void);
 /* Setup memory map  */
 void memory_map_setup(void);
 
+/* Sync memory map */
+void adjust_memory_map(void);
+
 /* Prepare the 32bit BIOS */
 uint32_t rombios_highbios_setup(void);