From: Juergen Gross <jgross@suse.com>
To: grub-devel@gnu.org
Cc: xen-devel@lists.xen.org, phcoder@gmail.com,
daniel.kiper@oracle.com, roger.pau@citrix.com, hans@knorrie.org,
Juergen Gross <jgross@suse.com>
Subject: [PATCH v5 06/20] xen: rearrange xen/init.c to prepare it for Xen PVH mode
Date: Wed, 21 Nov 2018 15:28:41 +0100 [thread overview]
Message-ID: <20181121142855.13537-7-jgross@suse.com> (raw)
In-Reply-To: <20181121142855.13537-1-jgross@suse.com>
Rearrange grub-core/kern/xen/init.c to prepare adding PVH mode support
to it. This includes putting some code under #ifdef GRUB_MACHINE_XEN
as it will not be used when running as PVH.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
grub-core/kern/xen/init.c | 60 +++++++++++++++++++++++++++--------------------
1 file changed, 34 insertions(+), 26 deletions(-)
diff --git a/grub-core/kern/xen/init.c b/grub-core/kern/xen/init.c
index 29f5bc23d..10007b411 100644
--- a/grub-core/kern/xen/init.c
+++ b/grub-core/kern/xen/init.c
@@ -41,9 +41,11 @@ grub_size_t grub_xen_n_allocated_shared_pages;
static grub_xen_mfn_t
grub_xen_ptr2mfn (void *ptr)
{
+#ifdef GRUB_MACHINE_XEN
grub_xen_mfn_t *mfn_list =
(grub_xen_mfn_t *) grub_xen_start_page_addr->mfn_list;
return mfn_list[(grub_addr_t) ptr >> GRUB_XEN_LOG_PAGE_SIZE];
+#endif
}
void *
@@ -104,18 +106,6 @@ grub_machine_get_bootlocation (char **device __attribute__ ((unused)),
{
}
-static grub_uint8_t window[GRUB_XEN_PAGE_SIZE]
- __attribute__ ((aligned (GRUB_XEN_PAGE_SIZE)));
-
-#ifdef __x86_64__
-#define NUMBER_OF_LEVELS 4
-#else
-#define NUMBER_OF_LEVELS 3
-#endif
-
-#define LOG_POINTERS_PER_PAGE 9
-#define POINTERS_PER_PAGE (1 << LOG_POINTERS_PER_PAGE)
-
void
grub_xen_store_send (const void *buf_, grub_size_t len)
{
@@ -337,6 +327,19 @@ grub_xen_setup_gnttab (void)
grub_xen_grant_table_op (GNTTABOP_setup_table, &gnttab_setup, 1);
}
+#ifdef GRUB_MACHINE_XEN
+static grub_uint8_t window[GRUB_XEN_PAGE_SIZE]
+ __attribute__ ((aligned (GRUB_XEN_PAGE_SIZE)));
+
+#ifdef __x86_64__
+#define NUMBER_OF_LEVELS 4
+#else
+#define NUMBER_OF_LEVELS 3
+#endif
+
+#define LOG_POINTERS_PER_PAGE 9
+#define POINTERS_PER_PAGE (1 << LOG_POINTERS_PER_PAGE)
+
#define MAX_N_UNUSABLE_PAGES 4
static int
@@ -529,13 +532,30 @@ map_all_pages (void)
grub_mm_init_region ((void *) heap_start, heap_end - heap_start);
}
+grub_err_t
+grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
+{
+ grub_uint64_t total_pages = grub_xen_start_page_addr->nr_pages;
+ grub_uint64_t usable_pages = grub_xen_start_page_addr->pt_base >> 12;
+ if (hook (0, page2offset (usable_pages), GRUB_MEMORY_AVAILABLE, hook_data))
+ return GRUB_ERR_NONE;
+
+ hook (page2offset (usable_pages), page2offset (total_pages - usable_pages),
+ GRUB_MEMORY_RESERVED, hook_data);
+
+ return GRUB_ERR_NONE;
+}
+#endif
+
extern char _end[];
void
grub_machine_init (void)
{
+#ifdef GRUB_MACHINE_XEN
#ifdef __i386__
grub_xen_vm_assist (VMASST_CMD_enable, VMASST_TYPE_pae_extended_cr3);
+#endif
#endif
grub_modbase = ALIGN_UP ((grub_addr_t) _end
@@ -544,7 +564,9 @@ grub_machine_init (void)
grub_xen_setup_gnttab ();
+#ifdef GRUB_MACHINE_XEN
map_all_pages ();
+#endif
grub_console_init ();
@@ -571,17 +593,3 @@ grub_machine_fini (int flags __attribute__ ((unused)))
grub_xendisk_fini ();
grub_boot_fini ();
}
-
-grub_err_t
-grub_machine_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
-{
- grub_uint64_t total_pages = grub_xen_start_page_addr->nr_pages;
- grub_uint64_t usable_pages = grub_xen_start_page_addr->pt_base >> 12;
- if (hook (0, page2offset (usable_pages), GRUB_MEMORY_AVAILABLE, hook_data))
- return GRUB_ERR_NONE;
-
- hook (page2offset (usable_pages), page2offset (total_pages - usable_pages),
- GRUB_MEMORY_RESERVED, hook_data);
-
- return GRUB_ERR_NONE;
-}
--
2.16.4
next prev parent reply other threads:[~2018-11-21 14:29 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-21 14:28 [PATCH v5 00/20] xen: add pvh guest support Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 01/20] xen: add some xen headers Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-28 11:31 ` Daniel Kiper
2018-11-28 11:31 ` Daniel Kiper
2018-11-28 11:46 ` Juergen Gross
2018-11-28 11:46 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 02/20] loader/linux: support passing rsdp address via boot params Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-27 19:52 ` Daniel Kiper
2018-11-27 19:52 ` Daniel Kiper
2018-11-21 14:28 ` [PATCH v5 03/20] xen: carve out grant tab initialization into dedicated function Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 04/20] xen: prepare common code for Xen PVH support Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 05/20] xen: add some dummy headers for PVH mode Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-27 19:59 ` Daniel Kiper
2018-11-27 19:59 ` Daniel Kiper
2018-11-21 14:28 ` [PATCH v5 06/20] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross
2018-11-21 14:28 ` Juergen Gross [this message]
2018-11-21 14:28 ` [PATCH v5 07/20] xen: modify grub_xen_ptr2mfn() for xen-pvh Juergen Gross
2018-11-27 20:02 ` Daniel Kiper
2018-11-27 20:02 ` Daniel Kiper
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 08/20] xen: add PVH specific defines to offset.h Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 09/20] xen: add basic hooks for PVH in current code Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-27 20:10 ` Daniel Kiper
2018-11-27 20:10 ` Daniel Kiper
2018-11-21 14:28 ` [PATCH v5 10/20] xen: add PVH boot entry code Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 11/20] xen: setup hypercall page for PVH Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-23 15:14 ` Roger Pau Monné
2018-11-23 15:14 ` Roger Pau Monné
2018-11-27 20:31 ` Daniel Kiper
2018-11-27 20:31 ` Daniel Kiper
2018-11-28 11:28 ` Daniel Kiper
2018-11-28 11:28 ` Daniel Kiper
2018-11-28 11:44 ` Juergen Gross
2018-11-28 11:44 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 12/20] xen: get memory map from hypervisor " Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 13/20] xen: setup Xen specific data " Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-23 15:04 ` Roger Pau Monné
2018-11-23 15:04 ` Roger Pau Monné
2018-11-27 21:10 ` Daniel Kiper
2018-11-27 21:10 ` Daniel Kiper
2018-11-21 14:28 ` [PATCH v5 14/20] xen: init memory regions " Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 15/20] xen_pvh: add build runes for grub-core Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-27 21:17 ` Daniel Kiper
2018-11-27 21:17 ` Daniel Kiper
2018-11-28 11:52 ` Juergen Gross
2018-11-28 11:52 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 16/20] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 17/20] xen: use elfnote defines instead of plain numbers Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 18/20] xen_pvh: support building a standalone image Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 19/20] xen_pvh: support grub-install for xen_pvh Juergen Gross
2018-11-21 14:28 ` Juergen Gross
2018-11-21 14:28 ` [PATCH v5 20/20] xen_pvh: add support to configure Juergen Gross
2018-11-21 14:28 ` 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=20181121142855.13537-7-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=roger.pau@citrix.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.