@@ -18,6 +18,7 @@
* Copyright (c) 2011, Citrix Systems
*/
#include <inttypes.h>
+#include <assert.h>
#include <xen/xen.h>
#include <xen/io/protocols.h>
@@ -279,17 +280,20 @@ static int populate_guest_memory(struct xc_dom_image *dom,
int arch_setup_meminit(struct xc_dom_image *dom)
{
- int rc;
+ int i, rc;
xen_pfn_t pfn;
uint64_t modbase;
- /* Convenient */
- const uint64_t rambase = dom->rambase_pfn << XC_PAGE_SHIFT;
- const uint64_t ramsize = dom->total_pages << XC_PAGE_SHIFT;
- const uint64_t ramend = rambase + ramsize;
+ uint64_t ramsize = (uint64_t)dom->total_pages << XC_PAGE_SHIFT;
- const xen_pfn_t p2m_size = dom->total_pages;
+ const uint64_t bankbase[GUEST_RAM_BANKS] = {
+ GUEST_RAM0_BASE
+ };
+ const uint64_t bankmax[GUEST_RAM_BANKS] = {
+ GUEST_RAM0_SIZE
+ };
+ /* Convenient */
const uint64_t kernbase = dom->kernel_seg.vstart;
const uint64_t kernend = ROUNDUP(dom->kernel_seg.vend, 21/*2MB*/);
const uint64_t kernsize = kernend - kernbase;
@@ -298,20 +302,32 @@ int arch_setup_meminit(struct xc_dom_image *dom)
const uint64_t ramdisk_size = dom->ramdisk_blob ?
ROUNDUP(dom->ramdisk_size, XC_PAGE_SHIFT) : 0;
const uint64_t modsize = dtb_size + ramdisk_size;
- const uint64_t ram128mb = rambase + (128<<20);
+ const uint64_t ram128mb = GUEST_RAM0_BASE + (128<<20);
+
+ xen_pfn_t p2m_size;
+ xen_pfn_t rambank_size[GUEST_RAM_BANKS];
+ uint64_t bank0end;
- if ( modsize + kernsize > ramsize )
+ assert(dom->rambase_pfn << XC_PAGE_SHIFT == GUEST_RAM0_BASE);
+
+ if ( modsize + kernsize > bankmax[0] )
{
DOMPRINTF("%s: Not enough memory for the kernel+dtb+initrd",
__FUNCTION__);
return -1;
}
- if ( ramsize > GUEST_RAM_SIZE )
+ if ( ramsize == 0 )
+ {
+ DOMPRINTF("%s: ram size is 0", __FUNCTION__);
+ return -1;
+ }
+
+ if ( ramsize > GUEST_RAM_MAX )
{
DOMPRINTF("%s: ram size is too large for guest address space: "
"%"PRIx64" > %"PRIx64,
- __FUNCTION__, ramsize, GUEST_RAM_SIZE);
+ __FUNCTION__, ramsize, GUEST_RAM_MAX);
return -1;
}
@@ -321,6 +337,20 @@ int arch_setup_meminit(struct xc_dom_image *dom)
dom->shadow_enabled = 1;
+ for (i = 0; ramsize && i < GUEST_RAM_BANKS; i++)
+ {
+ uint64_t banksize = ramsize > bankmax[i] ? bankmax[i] : ramsize;
+
+ ramsize -= banksize;
+
+ p2m_size = ( bankbase[i] + banksize - bankbase[0] ) >> XC_PAGE_SHIFT;
+
+ rambank_size[i] = banksize >> XC_PAGE_SHIFT;
+ }
+
+ assert(rambank_size[0] != 0);
+ assert(ramsize == 0); /* Too much RAM is rejected above */
+
dom->p2m_host = xc_dom_malloc(dom, sizeof(xen_pfn_t) * p2m_size);
if ( dom->p2m_host == NULL )
return -EINVAL;
@@ -328,10 +358,13 @@ int arch_setup_meminit(struct xc_dom_image *dom)
dom->p2m_host[pfn] = INVALID_MFN;
/* setup initial p2m and allocate guest memory */
- if ((rc = populate_guest_memory(dom,
- GUEST_RAM_BASE >> XC_PAGE_SHIFT,
- ramsize >> XC_PAGE_SHIFT)))
- return rc;
+ for (i = 0; rambank_size[i] && i < GUEST_RAM_BANKS; i++)
+ {
+ if ((rc = populate_guest_memory(dom,
+ bankbase[i] >> XC_PAGE_SHIFT,
+ rambank_size[i])))
+ return rc;
+ }
/*
* We try to place dtb+initrd at 128MB or if we have less RAM
@@ -341,11 +374,13 @@ int arch_setup_meminit(struct xc_dom_image *dom)
* If changing this then consider
* xen/arch/arm/kernel.c:place_modules as well.
*/
- if ( ramend >= ram128mb + modsize && kernend < ram128mb )
+ bank0end = bankbase[0] + ((uint64_t)rambank_size[0] << XC_PAGE_SHIFT);
+
+ if ( bank0end >= ram128mb + modsize && kernend < ram128mb )
modbase = ram128mb;
- else if ( ramend - modsize > kernend )
- modbase = ramend - modsize;
- else if (kernbase - rambase > modsize )
+ else if ( bank0end - modsize > kernend )
+ modbase = bank0end - modsize;
+ else if (kernbase - GUEST_RAM0_BASE > modsize )
modbase = kernbase - modsize;
else
return -1;
@@ -375,8 +375,14 @@ typedef uint64_t xen_callback_t;
#define GUEST_MAGIC_BASE 0x39000000ULL
#define GUEST_MAGIC_SIZE 0x01000000ULL
-#define GUEST_RAM_BASE 0x40000000ULL /* 3GB of RAM @ 1GB */
-#define GUEST_RAM_SIZE 0xc0000000ULL
+#define GUEST_RAM_BANKS 1
+
+#define GUEST_RAM0_BASE 0x40000000ULL /* 3GB of RAM @ 1GB */
+#define GUEST_RAM0_SIZE 0xc0000000ULL
+
+#define GUEST_RAM_BASE GUEST_RAM0_BASE /* Lowest RAM address */
+/* Largest amount of actual RAM, not including holes */
+#define GUEST_RAM_MAX (GUEST_RAM0_SIZE)
/* Interrupts */
#define GUEST_TIMER_VIRT_PPI 27
Prepare for adding more banks of guest RAM by renaming a bunch of defines as RAM0 and replacing variables with arrays and introducing loops. Also in preparation switch to using GUEST_RAM0_BASE explicitly instead of implicitly via dom->rambase_pfn (while asserting that they must be the same). This makes the multiple bank case cleaner (although it looks a bit odd for now). GUEST_RAM_BASE is defined as the address of the lowest RAM bank, it is used in tools/libxl/libxl_dom.c to call xc_dom_rambase_init(). Lastly for now ramsize (total size) and rambank_size[0] (size of first bank) are the same, but use the appropriate one for each context. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> --- v4: Substantial rework, hence dropped existing acks Switched to using arrays instead of ram{0,1}* variables. v3: Mention why GUEST_RAM_BASE is still defined. v2: New patch --- tools/libxc/xc_dom_arm.c | 71 ++++++++++++++++++++++++++++++----------- xen/include/public/arch-arm.h | 10 ++++-- 2 files changed, 61 insertions(+), 20 deletions(-)