From: Juergen Gross <jgross@suse.com>
To: grub-devel@gnu.org
Cc: Juergen Gross <jgross@suse.com>,
phcoder@gmail.com, daniel.kiper@oracle.com, mchang@suse.com,
xen-devel@lists.xen.org
Subject: [PATCH v7 07/11] xen: factor out allocation of special pages into separate function
Date: Thu, 3 Mar 2016 10:38:12 +0100 [thread overview]
Message-ID: <1456997896-14063-8-git-send-email-jgross__8670.23480027473$1456997988$gmane$org@suse.com> (raw)
In-Reply-To: <1456997896-14063-1-git-send-email-jgross@suse.com>
Do the allocation of special pages (start info, console and xenbus
ring buffers) in a separate function. This will allow to do the
allocation at different times of the boot preparations depending on
the features the kernel is supporting.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
grub-core/loader/i386/xen.c | 48 +++++++++++++++++++++++++++++----------------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index a2fd1f6..a80c0f8 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -48,6 +48,8 @@ struct xen_loader_state {
struct start_info next_start;
struct grub_xen_file_info xen_inf;
grub_xen_mfn_t *virt_mfn_list;
+ struct start_info *virt_start_info;
+ grub_xen_mfn_t console_pfn;
grub_uint64_t max_addr;
struct xen_multiboot_mod_list *module_info_page;
grub_uint64_t modules_target_start;
@@ -240,22 +242,10 @@ grub_xen_p2m_alloc (void)
}
static grub_err_t
-grub_xen_boot (void)
+grub_xen_special_alloc (void)
{
grub_relocator_chunk_t ch;
grub_err_t err;
- struct start_info *nst;
- grub_uint64_t nr_info_pages;
- grub_uint64_t nr_pages, nr_pt_pages, nr_need_pages;
- struct gnttab_set_version gnttab_setver;
- grub_size_t i;
-
- if (grub_xen_n_allocated_shared_pages)
- return grub_error (GRUB_ERR_BUG, "active grants");
-
- err = grub_xen_p2m_alloc ();
- if (err)
- return err;
err = grub_relocator_alloc_chunk_addr (xen_state.relocator, &ch,
xen_state.max_addr,
@@ -263,9 +253,11 @@ grub_xen_boot (void)
if (err)
return err;
xen_state.state.start_info = xen_state.max_addr + xen_state.xen_inf.virt_base;
- nst = get_virtual_current_address (ch);
+ xen_state.virt_start_info = get_virtual_current_address (ch);
xen_state.max_addr =
ALIGN_UP (xen_state.max_addr + sizeof (xen_state.next_start), PAGE_SIZE);
+ xen_state.console_pfn = xen_state.max_addr >> PAGE_SHIFT;
+ xen_state.max_addr += 2 * PAGE_SIZE;
xen_state.next_start.nr_pages = grub_xen_start_page_addr->nr_pages;
grub_memcpy (xen_state.next_start.magic, grub_xen_start_page_addr->magic,
@@ -275,10 +267,28 @@ grub_xen_boot (void)
xen_state.next_start.console.domU = grub_xen_start_page_addr->console.domU;
xen_state.next_start.shared_info = grub_xen_start_page_addr->shared_info;
- err = set_mfns (xen_state.max_addr >> PAGE_SHIFT);
+ return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_xen_boot (void)
+{
+ grub_relocator_chunk_t ch;
+ grub_err_t err;
+ grub_uint64_t nr_info_pages;
+ grub_uint64_t nr_pages, nr_pt_pages, nr_need_pages;
+ struct gnttab_set_version gnttab_setver;
+ grub_size_t i;
+
+ if (grub_xen_n_allocated_shared_pages)
+ return grub_error (GRUB_ERR_BUG, "active grants");
+
+ err = grub_xen_p2m_alloc ();
+ if (err)
+ return err;
+ err = grub_xen_special_alloc ();
if (err)
return err;
- xen_state.max_addr += 2 * PAGE_SIZE;
xen_state.next_start.pt_base =
xen_state.max_addr + xen_state.xen_inf.virt_base;
@@ -309,6 +319,10 @@ grub_xen_boot (void)
if (err)
return err;
+ err = set_mfns (xen_state.console_pfn);
+ if (err)
+ return err;
+
generate_page_table (get_virtual_current_address (ch),
xen_state.max_addr >> PAGE_SHIFT, nr_pages,
xen_state.xen_inf.virt_base, xen_state.virt_mfn_list);
@@ -321,7 +335,7 @@ grub_xen_boot (void)
xen_state.next_start.nr_pt_frames = nr_pt_pages;
xen_state.state.paging_size = nr_pt_pages;
- *nst = xen_state.next_start;
+ *xen_state.virt_start_info = xen_state.next_start;
grub_memset (&gnttab_setver, 0, sizeof (gnttab_setver));
--
2.6.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-03 9:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-03 9:38 [PATCH v7 00/11] grub-xen: support booting huge pv-domains Juergen Gross
2016-03-03 9:38 ` [PATCH v7 01/11] xen: make xen loader callable multiple times Juergen Gross
2016-03-03 9:38 ` [PATCH v7 02/11] xen: avoid memleaks on error Juergen Gross
2016-03-03 9:38 ` [PATCH v7 03/11] xen: reduce number of global variables in xen loader Juergen Gross
2016-03-03 9:38 ` [PATCH v7 04/11] xen: add elfnote.h to avoid using numbers instead of constants Juergen Gross
2016-03-03 9:38 ` [PATCH v7 05/11] xen: synchronize xen header Juergen Gross
2016-03-03 9:38 ` [PATCH v7 06/11] xen: factor out p2m list allocation into separate function Juergen Gross
2016-03-03 9:38 ` Juergen Gross [this message]
2016-03-03 9:38 ` [PATCH v7 08/11] xen: factor out allocation of page tables " Juergen Gross
2016-03-03 9:38 ` [PATCH v7 09/11] xen: add capability to load initrd outside of initial mapping Juergen Gross
2016-03-03 9:38 ` [PATCH v7 10/11] xen: modify page table construction Juergen Gross
2016-03-03 9:38 ` [PATCH v7 11/11] xen: add capability to load p2m list outside of kernel mapping Juergen Gross
2016-03-03 14:05 ` [PATCH v7 00/11] grub-xen: support booting huge pv-domains Daniel Kiper
2016-03-29 9:52 ` Juergen Gross
[not found] ` <56FA5074.90305@suse.com>
2016-03-29 10:04 ` Daniel Kiper
2016-05-12 5:35 ` Juergen Gross
2016-07-04 10:33 ` Juergen Gross
[not found] ` <577A3B6D.7060509@suse.com>
2016-07-04 10:53 ` Daniel Kiper
[not found] ` <20160704105339.GU24249@olila.local.net-space.pl>
2016-10-11 14:00 ` Juergen Gross
2016-10-17 6:52 ` Daniel Kiper
[not found] ` <20161017065258.GA23035@router-fw-old.local.net-space.pl>
2016-10-27 14:38 ` Daniel Kiper
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='1456997896-14063-8-git-send-email-jgross__8670.23480027473$1456997988$gmane$org@suse.com' \
--to=jgross@suse.com \
--cc=daniel.kiper@oracle.com \
--cc=grub-devel@gnu.org \
--cc=mchang@suse.com \
--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).