All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefano Stabellini <sstabellini@kernel.org>
To: julien.grall@arm.com
Cc: Stefano Stabellini <stefanos@xilinx.com>,
	sstabellini@kernel.org, andrii_anisov@epam.com,
	xen-devel@lists.xen.org
Subject: [PATCH v3 17/25] xen/arm: introduce allocate_memory
Date: Tue, 31 Jul 2018 16:28:00 -0700	[thread overview]
Message-ID: <1533079688-9541-17-git-send-email-sstabellini@kernel.org> (raw)
In-Reply-To: <alpine.DEB.2.10.1807311623060.5781@sstabellini-ThinkPad-X260>

Introduce an allocate_memory function able to allocate memory for DomUs
and map it at the right guest addresses, according to the guest memory
map: GUEST_RAM0_BASE and GUEST_RAM1_BASE.

Signed-off-by: Stefano Stabellini <stefanos@xilinx.com>
---
Changes in v3:
- new patch
---
 xen/arch/arm/domain_build.c | 125 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 124 insertions(+), 1 deletion(-)

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index ab72c36..dfa74e4 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -369,6 +369,129 @@ static void __init allocate_memory_11(struct domain *d,
     }
 }
 
+static bool __init insert_bank(struct domain *d,
+                               struct kernel_info *kinfo,
+                               struct page_info *pg,
+                               unsigned int order)
+{
+    int res, i;
+    mfn_t smfn;
+    paddr_t gaddr, size;
+    struct membank *bank;
+
+    smfn = page_to_mfn(pg);
+    size = pfn_to_paddr(1UL << order);
+
+    /*
+     * DomU memory is provided in two banks:
+     *   GUEST_RAM0_BASE - GUEST_RAM0_BASE + GUEST_RAM0_SIZE
+     *   GUEST_RAM1_BASE - GUEST_RAM1_BASE + GUEST_RAM1_SIZE
+     *
+     * Find the right gaddr address for DomUs accordingly.
+     */
+    gaddr = GUEST_RAM0_BASE;
+    if ( kinfo->mem.nr_banks > 0 )
+    {
+        for( i = 0; i < kinfo->mem.nr_banks; i++ )
+        {
+            bank = &kinfo->mem.bank[i];
+            gaddr = bank->start + bank->size;
+        }
+        if ( bank->start == GUEST_RAM0_BASE &&
+             gaddr + size > (GUEST_RAM0_BASE + GUEST_RAM0_SIZE) )
+            gaddr = GUEST_RAM1_BASE;
+        if ( bank->start == GUEST_RAM1_BASE &&
+             gaddr + size > (GUEST_RAM1_BASE + GUEST_RAM1_SIZE) )
+            goto fail;
+    }
+
+    dprintk(XENLOG_INFO,
+            "Allocated %#"PRIpaddr"-%#"PRIpaddr":%#"PRIpaddr"-%#"PRIpaddr" (%ldMB/%ldMB, order %d)\n",
+            mfn_to_maddr(smfn), mfn_to_maddr(smfn) + size,
+            gaddr, gaddr + size,
+            1UL << (order + PAGE_SHIFT - 20),
+            /* Don't want format this as PRIpaddr (16 digit hex) */
+            (unsigned long)(kinfo->unassigned_mem >> 20),
+            order);
+
+    res = guest_physmap_add_page(d, gaddr_to_gfn(gaddr), smfn, order);
+    if ( res )
+    {
+        dprintk(XENLOG_ERR, "Failed map pages to DOMU: %d", res);
+        goto fail;
+    }
+
+    kinfo->unassigned_mem -= size;
+    bank = &kinfo->mem.bank[kinfo->mem.nr_banks];
+
+    bank->start = gaddr;
+    bank->size = size;
+    kinfo->mem.nr_banks++;
+    return true;
+
+fail:
+    free_domheap_pages(pg, order);
+    return false;
+}
+
+static void __init allocate_memory(struct domain *d, struct kernel_info *kinfo)
+{
+    const unsigned int min_order = get_order_from_bytes(MB(4));
+    struct page_info *pg;
+    unsigned int order = get_allocation_size(kinfo->unassigned_mem);
+    int i;
+
+    dprintk(XENLOG_INFO, "Allocating mappings totalling %ldMB for dom%d:\n",
+            /* Don't want format this as PRIpaddr (16 digit hex) */
+            (unsigned long)(kinfo->unassigned_mem >> 20), d->domain_id);
+
+    kinfo->mem.nr_banks = 0;
+
+    order = get_allocation_size(kinfo->unassigned_mem);
+    if ( order > GUEST_RAM0_SIZE )
+        order = GUEST_RAM0_SIZE;
+    while ( kinfo->unassigned_mem )
+    {
+        pg = alloc_domheap_pages(d, order, 0);
+        if ( !pg )
+        {
+            order --;
+
+            if ( order >= min_order )
+                continue;
+
+            /* No more we can do */
+            break;
+        }
+
+        if ( !insert_bank(d, kinfo, pg, order) )
+            break;
+
+        /*
+         * Success, next time around try again to get the largest order
+         * allocation possible.
+         */
+        order = get_allocation_size(kinfo->unassigned_mem);
+    }
+
+    if ( kinfo->unassigned_mem )
+        dprintk(XENLOG_WARNING, "Failed to allocate requested domain memory."
+               /* Don't want format this as PRIpaddr (16 digit hex) */
+               " %ldMB unallocated\n",
+               (unsigned long)kinfo->unassigned_mem >> 20);
+
+    for( i = 0; i < kinfo->mem.nr_banks; i++ )
+    {
+        dprintk(XENLOG_INFO, "Dom%d BANK[%d] %#"PRIpaddr"-%#"PRIpaddr" (%ldMB)\n",
+                d->domain_id,
+                i,
+                kinfo->mem.bank[i].start,
+                kinfo->mem.bank[i].start + kinfo->mem.bank[i].size,
+                /* Don't want format this as PRIpaddr (16 digit hex) */
+                (unsigned long)(kinfo->mem.bank[i].size >> 20));
+    }
+}
+
 static int __init write_properties(struct domain *d, struct kernel_info *kinfo,
                                    const struct dt_device_node *node)
 {
@@ -2241,7 +2364,7 @@ static int __init construct_domU(struct domain *d, struct dt_device_node *node)
     /* type must be set before allocate memory */
     d->arch.type = kinfo.type;
 #endif
-    allocate_memory_11(d, &kinfo);
+    allocate_memory(d, &kinfo);
 
     return __construct_domain(d, &kinfo);
 }
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

  parent reply	other threads:[~2018-07-31 23:28 UTC|newest]

Thread overview: 88+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-31 23:27 [PATCH v3 00/25] dom0less step1: boot multiple domains from device tree Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 01/25] xen: allow console_io hypercalls from certain DomUs Stefano Stabellini
2018-08-17 19:33   ` Daniel De Graaf
2018-07-31 23:27 ` [PATCH v3 02/25] xen/arm: move a few DT related defines to public/device_tree_defs.h Stefano Stabellini
2018-08-01  9:31   ` Julien Grall
2018-08-22 15:25     ` Wei Liu
2018-07-31 23:27 ` [PATCH v3 03/25] xen/arm: extend device tree based multiboot protocol Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 04/25] xen/arm: document dom0less Stefano Stabellini
2018-08-01  9:46   ` Julien Grall
2018-10-03 16:47     ` Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 05/25] xen/arm: do not pass dt_host to make_memory_node and make_hypervisor_node Stefano Stabellini
2018-08-01  9:50   ` Julien Grall
2018-07-31 23:27 ` [PATCH v3 06/25] xen/arm: move evtchn_allocate call out of make_hypervisor_node Stefano Stabellini
2018-08-01  9:51   ` Julien Grall
2018-07-31 23:27 ` [PATCH v3 07/25] xen/arm: rename acpi_make_chosen_node to make_chosen_node Stefano Stabellini
2018-08-01  9:53   ` Julien Grall
2018-07-31 23:27 ` [PATCH v3 08/25] xen/arm: increase MAX_MODULES Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 09/25] xen/arm: introduce bootcmdlines Stefano Stabellini
2018-08-01 10:51   ` Julien Grall
2018-10-03 23:11     ` Stefano Stabellini
2018-10-04 17:23       ` Julien Grall
2018-10-04 21:08         ` Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 10/25] xen/arm: don't add duplicate boot modules Stefano Stabellini
2018-08-01 11:06   ` Julien Grall
2018-10-04 21:05     ` Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 11/25] xen/arm: probe domU kernels and initrds Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 12/25] xen/arm: refactor construct_dom0 Stefano Stabellini
2018-08-13 10:15   ` Julien Grall
2018-08-15 19:27     ` Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 13/25] xen/arm: introduce create_domUs Stefano Stabellini
2018-08-01  8:48   ` Jan Beulich
2018-08-13 10:23   ` Julien Grall
2018-08-15 19:37     ` Stefano Stabellini
2018-08-13 10:55   ` Julien Grall
2018-08-15 20:04     ` Stefano Stabellini
2018-08-16  9:03       ` Julien Grall
2018-08-16 18:20         ` Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 14/25] xen/arm: introduce construct_domU Stefano Stabellini
2018-08-13 10:55   ` Julien Grall
2018-08-15 20:21     ` Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 15/25] xen/arm: rename get_11_allocation_size to get_allocation_size Stefano Stabellini
2018-07-31 23:27 ` [PATCH v3 16/25] xen/arm: rename allocate_memory to allocate_memory_11 Stefano Stabellini
2018-08-13 10:57   ` Julien Grall
2018-08-15 20:26     ` Stefano Stabellini
2018-08-16  9:08       ` Julien Grall
2018-08-16 18:27         ` Stefano Stabellini
2018-07-31 23:28 ` Stefano Stabellini [this message]
2018-08-01 11:28   ` [PATCH v3 17/25] xen/arm: introduce allocate_memory Julien Grall
2018-10-03 17:46     ` Stefano Stabellini
2018-07-31 23:28 ` [PATCH v3 18/25] xen/arm: generate a simple device tree for domUs Stefano Stabellini
2018-08-13 11:07   ` Julien Grall
2018-08-15 20:47     ` Stefano Stabellini
2018-07-31 23:28 ` [PATCH v3 19/25] xen/arm: generate vpl011 node on device tree for domU Stefano Stabellini
2018-08-13 11:20   ` Julien Grall
2018-08-15 23:23     ` Stefano Stabellini
2018-07-31 23:28 ` [PATCH v3 20/25] xen/arm: introduce a union in vpl011 Stefano Stabellini
2018-08-13 11:24   ` Julien Grall
2018-08-15 23:36     ` Stefano Stabellini
2018-07-31 23:28 ` [PATCH v3 21/25] xen/arm: refactor vpl011_data_avail Stefano Stabellini
2018-08-13 13:23   ` Julien Grall
2018-07-31 23:28 ` [PATCH v3 22/25] xen/arm: Allow vpl011 to be used by DomU Stefano Stabellini
2018-08-13 13:42   ` Julien Grall
2018-08-15 23:41     ` Stefano Stabellini
2018-08-13 14:10   ` Julien Grall
2018-08-16 19:21     ` Stefano Stabellini
2018-08-22 10:19       ` Julien Grall
2018-10-03 21:21         ` Stefano Stabellini
2018-10-04 17:17           ` Julien Grall
2018-07-31 23:28 ` [PATCH v3 23/25] xen: support console_switching between Dom0 and DomUs on ARM Stefano Stabellini
2018-08-01  9:03   ` Jan Beulich
2018-10-04 21:52     ` Stefano Stabellini
2018-10-05  9:25       ` Julien Grall
2018-10-05  9:48         ` Julien Grall
2018-10-05 18:39           ` Stefano Stabellini
2018-10-05 18:39         ` Stefano Stabellini
2018-08-13 13:58   ` Julien Grall
2018-08-16 21:48     ` Stefano Stabellini
2018-07-31 23:28 ` [PATCH v3 24/25] xen/vpl011: buffer out chars when the backend is xen Stefano Stabellini
2018-08-13 14:21   ` Julien Grall
2018-08-16 19:41     ` Stefano Stabellini
2018-08-22 10:35       ` Julien Grall
2018-10-04 21:29         ` Stefano Stabellini
2018-07-31 23:28 ` [PATCH v3 25/25] xen/arm: split domain_build.c Stefano Stabellini
2018-08-13 14:29   ` Julien Grall
2018-08-16  0:25     ` Stefano Stabellini
2018-08-16  9:20       ` Julien Grall
2018-08-16 18:12         ` Stefano Stabellini
2018-08-22 15:44 ` [PATCH v3 00/25] dom0less step1: boot multiple domains from device tree Julien Grall

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1533079688-9541-17-git-send-email-sstabellini@kernel.org \
    --to=sstabellini@kernel.org \
    --cc=andrii_anisov@epam.com \
    --cc=julien.grall@arm.com \
    --cc=stefanos@xilinx.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.