xen/arm: allocate colored memory for dom0

Allocate colored memory for dom0 by requesting one page at a time to the
colored allocator. Map all pages starting from a fixed virtual address.

Signed-off-by: Luca Miccio <206497@studenti.unimore.it>
Signed-off-by: Marco Solieri <marco.solieri@unimore.it>

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index f54f2385be5439fde5f37a4c4e23d65ef539c0d5..f41de26d8c8b8ffb30c3fd01662561285c946727 100644 (file)
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -25,6 +25,7 @@
 #include <asm/setup.h>
 #include <asm/cpufeature.h>
 #include <asm/domain_build.h>
+#include <asm/coloring.h>
 
 #include <xen/irq.h>
 #include <xen/grant_table.h>
@@ -472,7 +473,41 @@ fail:
           " %ldKB unallocated. Fix the VMs configurations.\n",
           (unsigned long)kinfo->unassigned_mem >> 10);
 }
+#ifdef CONFIG_COLORING
+static void __init allocate_colored_memory(
+    struct domain *d, struct kernel_info *kinfo)
+{
+    int res;
+    struct page_info *pg;
+    struct membank *bank;
+    gfn_t sgfn = gaddr_to_gfn(GUEST_RAM0_BASE);
+
+    bank = &kinfo->mem.bank[kinfo->mem.nr_banks];
+    bank->size = kinfo->unassigned_mem;
+    bank->start = GUEST_RAM0_BASE;
+    printk("Allocating colored mappings totalling %ldMB for DOM %d:\n",
+           (unsigned long)(kinfo->unassigned_mem >> 20), d->domain_id);
+
+    while ( kinfo->unassigned_mem > 0 )
+    {
+        pg = alloc_col_domheap_page(d, 0);
+        if ( !pg )
+            panic("ERROR: Failed alloc pages to DOM: %d\n", d->domain_id);
+
+        res = guest_physmap_add_page(d, sgfn, page_to_mfn(pg), 0);
 
+        if ( res )
+        {
+            printk("ERROR: Failed map pages to DOM: %d", d->domain_id);
+            BUG();
+        }
+        sgfn = gfn_add(sgfn,1);
+        kinfo->unassigned_mem -= PAGE_SIZE;
+    }
+
+    kinfo->mem.nr_banks++;
+}
+#endif
 static int __init write_properties(struct domain *d, struct kernel_info *kinfo,
                                    const struct dt_device_node *node)
 {
@@ -2528,7 +2563,12 @@ int __init construct_dom0(struct domain *d)
     /* type must be set before allocate_memory */
     d->arch.type = kinfo.type;
 #endif
-    allocate_memory_11(d, &kinfo);
+#ifdef CONFIG_COLORING
+    if ( d->max_colors )
+        allocate_colored_memory(d, &kinfo);
+    else
+#endif
+        allocate_memory_11(d, &kinfo);
     find_gnttab_region(d, &kinfo);
 
     /* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */