From: Juergen Gross <jgross@suse.com> To: grub-devel@gnu.org Cc: hans@knorrie.org, phcoder@gmail.com, daniel.kiper@oracle.com, Juergen Gross <jgross@suse.com>, xen-devel@lists.xen.org Subject: [PATCH v4 11/19] xen: get memory map from hypervisor for PVH Date: Fri, 2 Nov 2018 13:37:30 +0100 [thread overview] Message-ID: <20181102123738.16395-12-jgross@suse.com> (raw) In-Reply-To: <20181102123738.16395-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> --- V3: use grub_e820_mmap_entry instead of own struct (Daniel Kiper) --- grub-core/kern/i386/xen/pvh.c | 96 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c index 7e90a4538..58e6fefd5 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -23,9 +23,14 @@ #include <grub/i386/cpuid.h> #include <grub/i386/io.h> #include <grub/xen.h> +#include <grub/i386/linux.h> #include <grub/machine/kernel.h> +#include <grub/machine/memory.h> +#include <xen/memory.h> -#define XEN_CONSOLE_PORT 0xe9 +#define XEN_CONSOLE_PORT 0xe9 + +#define XEN_MEMORY_MAP_SIZE 128 grub_uint64_t grub_rsdp_addr; @@ -33,6 +38,8 @@ static char hypercall_page[GRUB_XEN_PAGE_SIZE] __attribute__ ((aligned (GRUB_XEN_PAGE_SIZE))); static grub_uint32_t xen_cpuid_base; +static struct grub_e820_mmap_entry map[XEN_MEMORY_MAP_SIZE]; +static unsigned int nr_map_entries; static void grub_xen_panic (const char *msg) @@ -92,11 +99,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 grub_e820_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_panic ("Could not get memory map from Xen.\n"); + 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 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
WARNING: multiple messages have this Message-ID (diff)
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 v4 11/19] xen: get memory map from hypervisor for PVH Date: Fri, 2 Nov 2018 13:37:30 +0100 [thread overview] Message-ID: <20181102123738.16395-12-jgross@suse.com> (raw) In-Reply-To: <20181102123738.16395-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> --- V3: use grub_e820_mmap_entry instead of own struct (Daniel Kiper) --- grub-core/kern/i386/xen/pvh.c | 96 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 95 insertions(+), 1 deletion(-) diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c index 7e90a4538..58e6fefd5 100644 --- a/grub-core/kern/i386/xen/pvh.c +++ b/grub-core/kern/i386/xen/pvh.c @@ -23,9 +23,14 @@ #include <grub/i386/cpuid.h> #include <grub/i386/io.h> #include <grub/xen.h> +#include <grub/i386/linux.h> #include <grub/machine/kernel.h> +#include <grub/machine/memory.h> +#include <xen/memory.h> -#define XEN_CONSOLE_PORT 0xe9 +#define XEN_CONSOLE_PORT 0xe9 + +#define XEN_MEMORY_MAP_SIZE 128 grub_uint64_t grub_rsdp_addr; @@ -33,6 +38,8 @@ static char hypercall_page[GRUB_XEN_PAGE_SIZE] __attribute__ ((aligned (GRUB_XEN_PAGE_SIZE))); static grub_uint32_t xen_cpuid_base; +static struct grub_e820_mmap_entry map[XEN_MEMORY_MAP_SIZE]; +static unsigned int nr_map_entries; static void grub_xen_panic (const char *msg) @@ -92,11 +99,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 grub_e820_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_panic ("Could not get memory map from Xen.\n"); + 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-11-02 12:37 UTC|newest] Thread overview: 100+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-11-02 12:37 [PATCH v4 00/19] xen: add pvh guest support Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 01/19] xen: add some xen headers Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 02/19] loader/linux: support passing rsdp address via boot params Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 11:36 ` Daniel Kiper 2018-11-07 11:36 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 03/19] xen: carve out grant tab initialization into dedicated function Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 04/19] xen: prepare common code for Xen PVH support Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 12:10 ` Daniel Kiper 2018-11-07 12:10 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 05/19] xen: add some dummy headers for PVH mode Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 12:21 ` Daniel Kiper 2018-11-07 12:21 ` Daniel Kiper 2018-11-07 14:49 ` Juergen Gross 2018-11-08 15:36 ` Daniel Kiper 2018-11-08 15:36 ` Daniel Kiper 2018-11-08 15:40 ` Juergen Gross 2018-11-08 15:40 ` Juergen Gross 2018-11-07 14:49 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 06/19] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 07/19] xen: add PVH specific defines to offset.h Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-07 12:27 ` Daniel Kiper 2018-11-07 12:27 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 08/19] xen: add basic hooks for PVH in current code Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-08 15:45 ` Daniel Kiper 2018-11-08 19:23 ` [Xen-devel] " Juergen Gross 2018-11-09 17:55 ` Daniel Kiper 2018-11-09 17:55 ` Daniel Kiper 2018-11-08 19:23 ` Juergen Gross 2018-11-08 15:45 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 09/19] xen: add PVH boot entry code Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-08 15:53 ` Daniel Kiper 2018-11-08 15:53 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 10/19] xen: setup hypercall page for PVH Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 18:12 ` Daniel Kiper 2018-11-09 18:12 ` Daniel Kiper 2018-11-20 9:27 ` Juergen Gross 2018-11-20 9:27 ` Juergen Gross 2018-11-21 13:58 ` Juergen Gross 2018-11-21 13:58 ` [Xen-devel] " Juergen Gross 2018-11-15 8:33 ` Roger Pau Monné 2018-11-20 9:16 ` Juergen Gross 2018-11-20 9:16 ` Juergen Gross 2018-11-15 8:33 ` Roger Pau Monné 2018-11-02 12:37 ` Juergen Gross [this message] 2018-11-02 12:37 ` [PATCH v4 11/19] xen: get memory map from hypervisor " Juergen Gross 2018-11-09 18:35 ` Daniel Kiper 2018-11-09 18:35 ` Daniel Kiper 2018-11-15 9:36 ` [Xen-devel] " Roger Pau Monné 2018-11-21 8:52 ` Juergen Gross 2018-11-21 8:52 ` Juergen Gross 2018-11-15 9:36 ` Roger Pau Monné 2018-11-02 12:37 ` [PATCH v4 12/19] xen: add PCI MMIO areas to memory map Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 19:14 ` Daniel Kiper 2018-11-14 12:49 ` Roger Pau Monné 2018-11-14 12:49 ` [Xen-devel] " Roger Pau Monné 2018-11-14 15:30 ` Daniel Kiper 2018-11-14 15:30 ` Daniel Kiper 2018-11-09 19:14 ` Daniel Kiper 2018-11-14 12:48 ` Roger Pau Monné 2018-11-14 12:48 ` [Xen-devel] " Roger Pau Monné 2018-11-21 9:02 ` Juergen Gross 2018-11-21 9:02 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 13/19] xen: setup Xen specific data for PVH Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 19:47 ` Daniel Kiper 2018-11-09 19:47 ` Daniel Kiper 2018-11-15 10:03 ` [Xen-devel] " Roger Pau Monné 2018-11-21 9:07 ` Juergen Gross 2018-11-21 9:07 ` Juergen Gross 2018-11-15 10:03 ` Roger Pau Monné 2018-11-02 12:37 ` [PATCH v4 14/19] xen: init memory regions " Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 19:56 ` Daniel Kiper 2018-11-09 19:56 ` Daniel Kiper 2018-11-15 10:07 ` Roger Pau Monné 2018-11-15 10:07 ` [Xen-devel] " Roger Pau Monné 2018-11-02 12:37 ` [PATCH v4 15/19] xen_pvh: add build runes for grub-core Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 16/19] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 17/19] xen_pvh: support building a standalone image Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-09 20:06 ` Daniel Kiper 2018-11-09 20:06 ` Daniel Kiper 2018-11-02 12:37 ` [PATCH v4 18/19] xen_pvh: support grub-install for xen_pvh Juergen Gross 2018-11-02 12:37 ` Juergen Gross 2018-11-02 12:37 ` [PATCH v4 19/19] xen_pvh: add support to configure Juergen Gross 2018-11-02 12:37 ` 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=20181102123738.16395-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: linkBe 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.