From: Juergen Gross <jgross@suse.com>
To: grub-devel@gnu.org
Cc: xen-devel@lists.xen.org, phcoder@gmail.com,
daniel.kiper@oracle.com, hans@knorrie.org,
Juergen Gross <jgross@suse.com>
Subject: [PATCH v2 11/18] xen: get memory map from hypervisor for PVH
Date: Tue, 9 Oct 2018 13:03:10 +0200 [thread overview]
Message-ID: <20181009110317.6022-12-jgross@suse.com> (raw)
In-Reply-To: <20181009110317.6022-1-jgross@suse.com>
Retrieve the memory map from the hypervisor and normalize it to contain
no overlapping entries and to be sorted by address.
Signed-off-by: Juergen Gross <jgross@suse.com>
---
grub-core/kern/i386/xen/pvh.c | 98 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 98 insertions(+)
diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c
index c1b1cf8db..b4933b454 100644
--- a/grub-core/kern/i386/xen/pvh.c
+++ b/grub-core/kern/i386/xen/pvh.c
@@ -22,7 +22,16 @@
#include <grub/mm.h>
#include <grub/i386/cpuid.h>
#include <grub/xen.h>
+#include <grub/i386/linux.h>
#include <grub/machine/kernel.h>
+#include <xen/memory.h>
+
+struct xen_machine_mmap_entry
+{
+ grub_uint64_t addr;
+ grub_uint64_t len;
+ grub_uint32_t type;
+} GRUB_PACKED;
grub_uint64_t grub_rsdp_addr;
@@ -30,6 +39,8 @@ static struct { char _entry[32]; } hypercall_page[128]
__attribute__ ((aligned (GRUB_XEN_PAGE_SIZE)));
static grub_uint32_t xen_cpuid_base;
+static struct xen_machine_mmap_entry map[128];
+static unsigned int nr_map_entries;
static void
grub_xen_early_halt (void)
@@ -93,11 +104,98 @@ grub_xen_hypercall (grub_uint32_t callno, grub_uint32_t a0,
return __res;
}
+static void
+grub_xen_sort_mmap (void)
+{
+ grub_uint64_t from, to;
+ unsigned int i;
+ struct xen_machine_mmap_entry tmp;
+
+ /* Align map entries to page boundaries. */
+ for (i = 0; i < nr_map_entries; i++)
+ {
+ from = map[i].addr;
+ to = from + map[i].len;
+ if (map[i].type == GRUB_MEMORY_AVAILABLE)
+ {
+ from = ALIGN_UP(from, GRUB_XEN_PAGE_SIZE);
+ to = ALIGN_DOWN(to, GRUB_XEN_PAGE_SIZE);
+ }
+ else
+ {
+ from = ALIGN_DOWN(from, GRUB_XEN_PAGE_SIZE);
+ to = ALIGN_UP(to, GRUB_XEN_PAGE_SIZE);
+ }
+ map[i].addr = from;
+ map[i].len = to - from;
+ }
+
+ again:
+ /* Sort entries by start address. */
+ for (i = 1; i < nr_map_entries; i++)
+ {
+ if (map[i].addr >= map[i - 1].addr)
+ continue;
+ tmp = map[i];
+ map[i] = map[i - 1];
+ map[i - 1] = tmp;
+ i = 0;
+ }
+
+ /* Detect overlapping areas. */
+ for (i = 1; i < nr_map_entries; i++)
+ {
+ if (map[i].addr >= map[i - 1].addr + map[i - 1].len)
+ continue;
+ tmp = map[i - 1];
+ map[i - 1].len = map[i].addr - map[i - 1].addr;
+ if (map[i].addr + map[i].len >= tmp.addr + tmp.len)
+ continue;
+ if (nr_map_entries < ARRAY_SIZE(map))
+ {
+ map[nr_map_entries].addr = map[i].addr + map[i].len;
+ map[nr_map_entries].len = tmp.addr + tmp.len - map[nr_map_entries].addr;
+ map[nr_map_entries].type = tmp.type;
+ nr_map_entries++;
+ goto again;
+ }
+ }
+
+ /* Merge adjacent entries. */
+ for (i = 1; i < nr_map_entries; i++)
+ {
+ if (map[i].type == map[i - 1].type &&
+ map[i].addr == map[i - 1].addr + map[i - 1].len)
+ {
+ map[i - 1].len += map[i].len;
+ map[i] = map[nr_map_entries - 1];
+ nr_map_entries--;
+ goto again;
+ }
+ }
+}
+
+static void
+grub_xen_get_mmap (void)
+{
+ struct xen_memory_map memmap;
+
+ memmap.nr_entries = ARRAY_SIZE(map);
+ set_xen_guest_handle (memmap.buffer, map);
+ if (grub_xen_hypercall (__HYPERVISOR_memory_op, XENMEM_memory_map,
+ (grub_uint32_t) (&memmap), 0, 0, 0, 0))
+ grub_xen_early_halt ();
+ nr_map_entries = memmap.nr_entries;
+
+ grub_xen_sort_mmap ();
+}
+
void
grub_xen_setup_pvh (void)
{
grub_xen_cpuid_base ();
grub_xen_setup_hypercall_page ();
+ grub_xen_get_mmap ();
}
grub_err_t
--
2.16.4
next prev parent reply other threads:[~2018-10-09 11:03 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 11:02 [PATCH v2 00/18] xen: add pvh guest support Juergen Gross
2018-10-09 11:03 ` [PATCH v2 01/18] xen: add some xen headers Juergen Gross
2018-10-18 13:45 ` Daniel Kiper
2018-10-18 14:04 ` Juergen Gross
2018-10-18 14:14 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 02/18] loader/linux: support passing rsdp address via boot params Juergen Gross
2018-10-18 14:13 ` Daniel Kiper
2018-10-18 14:18 ` Juergen Gross
2018-10-18 14:30 ` Daniel Kiper
2018-10-18 14:36 ` Juergen Gross
2018-10-18 14:48 ` Daniel Kiper
2018-10-18 14:53 ` Juergen Gross
2018-10-18 15:01 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 03/18] xen: carve out grant tab initialization into dedicated function Juergen Gross
2018-10-18 14:35 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 04/18] xen: prepare common code for Xen PVH support Juergen Gross
2018-10-18 14:59 ` Daniel Kiper
2018-10-18 15:39 ` Juergen Gross
2018-10-19 6:36 ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 05/18] xen: add some dummy headers for PVH mode Juergen Gross
2018-10-18 15:19 ` Daniel Kiper
2018-10-18 15:40 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 06/18] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross
2018-10-18 17:55 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 07/18] xen: add PVH specific defines to offset.h Juergen Gross
2018-10-19 11:54 ` Daniel Kiper
2018-10-19 14:39 ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 08/18] xen: add basic hooks for PVH in current code Juergen Gross
2018-10-19 12:05 ` Daniel Kiper
2018-10-19 14:40 ` [Xen-devel] " Juergen Gross
2018-10-19 15:33 ` Roger Pau Monné
2018-10-19 15:52 ` Juergen Gross
2018-10-22 11:16 ` Daniel Kiper
2018-10-22 11:18 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 09/18] xen: add PVH boot entry code Juergen Gross
2018-10-19 12:17 ` Daniel Kiper
2018-10-19 14:50 ` [Xen-devel] " Juergen Gross
2018-10-22 11:18 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 10/18] xen: setup hypercall page for PVH Juergen Gross
2018-10-19 12:30 ` Daniel Kiper
2018-10-19 12:48 ` [Xen-devel] " Andrew Cooper
2018-10-19 15:01 ` Juergen Gross
2018-10-19 15:40 ` Roger Pau Monné
2018-10-19 15:59 ` Juergen Gross
2018-10-09 11:03 ` Juergen Gross [this message]
2018-10-19 12:40 ` [PATCH v2 11/18] xen: get memory map from hypervisor " Daniel Kiper
2018-10-19 15:06 ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 12/18] xen: setup Xen specific data " Juergen Gross
2018-10-19 12:48 ` Daniel Kiper
2018-10-19 15:10 ` [Xen-devel] " Juergen Gross
2018-10-24 14:01 ` Juergen Gross
2018-10-19 15:46 ` Roger Pau Monné
2018-10-19 16:10 ` Roger Pau Monné
2018-10-19 16:39 ` Juergen Gross
2018-10-29 12:57 ` Roger Pau Monné
2018-10-29 14:19 ` Juergen Gross
2018-10-30 11:23 ` Roger Pau Monné
2018-10-30 12:12 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 13/18] xen: init memory regions " Juergen Gross
2018-10-22 11:31 ` Daniel Kiper
2018-10-22 11:43 ` Juergen Gross
2018-10-22 12:08 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 14/18] xenpvh: add build runes for grub-core Juergen Gross
2018-10-22 11:41 ` Daniel Kiper
2018-10-22 11:45 ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 15/18] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross
2018-10-22 11:45 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 16/18] xenpvh: support building a standalone image Juergen Gross
2018-10-22 11:56 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 17/18] xenpvh: support grub-install for xenpvh Juergen Gross
2018-10-22 12:01 ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 18/18] xenpvh: add support to configure Juergen Gross
2018-10-22 12:04 ` Daniel Kiper
2018-10-10 15:59 ` [Xen-devel] [PATCH v2 00/18] xen: add pvh guest support Juergen Gross
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=20181009110317.6022-12-jgross@suse.com \
--to=jgross@suse.com \
--cc=daniel.kiper@oracle.com \
--cc=grub-devel@gnu.org \
--cc=hans@knorrie.org \
--cc=phcoder@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).