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 09/11] xen: add capability to load initrd outside of initial mapping
Date: Thu, 3 Mar 2016 10:38:14 +0100 [thread overview]
Message-ID: <1456997896-14063-10-git-send-email-jgross__22235.5769285516$1456997975$gmane$org@suse.com> (raw)
In-Reply-To: <1456997896-14063-1-git-send-email-jgross@suse.com>
Modern pvops linux kernels support an initrd not covered by the initial
mapping. This capability is flagged by an elf-note.
In case the elf-note is set by the kernel don't place the initrd into
the initial mapping. This will allow to load larger initrds and/or
support domains with larger memory, as the initial mapping is limited
to 2GB and it is containing the p2m list.
Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
---
V7: set initrd size once instead of in if and else clause as requested by
Daniel Kiper
V6: rename grub_xen_alloc_final() to grub_xen_alloc_boot_data()
V5: let call grub_xen_alloc_final() all subfunctions unconditionally
and let them decide whether they need to do anything
V4: rename grub_xen_alloc_end() to grub_xen_alloc_final()
---
grub-core/loader/i386/xen.c | 60 +++++++++++++++++++++++++++++++-------
grub-core/loader/i386/xen_fileXX.c | 3 ++
include/grub/xen_file.h | 1 +
3 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index 2e12763..9639ca1 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -228,6 +228,9 @@ grub_xen_p2m_alloc (void)
grub_size_t p2msize;
grub_err_t err;
+ if (xen_state.virt_mfn_list)
+ return GRUB_ERR_NONE;
+
xen_state.state.mfn_list = xen_state.max_addr;
xen_state.next_start.mfn_list =
xen_state.max_addr + xen_state.xen_inf.virt_base;
@@ -250,6 +253,9 @@ grub_xen_special_alloc (void)
grub_relocator_chunk_t ch;
grub_err_t err;
+ if (xen_state.virt_start_info)
+ return GRUB_ERR_NONE;
+
err = grub_relocator_alloc_chunk_addr (xen_state.relocator, &ch,
xen_state.max_addr,
sizeof (xen_state.next_start));
@@ -281,6 +287,9 @@ grub_xen_pt_alloc (void)
grub_uint64_t nr_info_pages;
grub_uint64_t nr_pages, nr_pt_pages, nr_need_pages;
+ if (xen_state.virt_pgtable)
+ return GRUB_ERR_NONE;
+
xen_state.next_start.pt_base =
xen_state.max_addr + xen_state.xen_inf.virt_base;
xen_state.state.paging_start = xen_state.max_addr >> PAGE_SHIFT;
@@ -319,6 +328,25 @@ grub_xen_pt_alloc (void)
return GRUB_ERR_NONE;
}
+/* Allocate all not yet allocated areas mapped by initial page tables. */
+static grub_err_t
+grub_xen_alloc_boot_data (void)
+{
+ grub_err_t err;
+
+ err = grub_xen_p2m_alloc ();
+ if (err)
+ return err;
+ err = grub_xen_special_alloc ();
+ if (err)
+ return err;
+ err = grub_xen_pt_alloc ();
+ if (err)
+ return err;
+
+ return GRUB_ERR_NONE;
+}
+
static grub_err_t
grub_xen_boot (void)
{
@@ -330,13 +358,7 @@ grub_xen_boot (void)
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;
- err = grub_xen_pt_alloc ();
+ err = grub_xen_alloc_boot_data ();
if (err)
return err;
@@ -610,6 +632,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail;
}
+ if (xen_state.xen_inf.unmapped_initrd)
+ {
+ err = grub_xen_alloc_boot_data ();
+ if (err)
+ goto fail;
+ }
+
if (grub_initrd_init (argc, argv, &initrd_ctx))
goto fail;
@@ -627,14 +656,22 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail;
}
- xen_state.next_start.mod_start =
- xen_state.max_addr + xen_state.xen_inf.virt_base;
xen_state.next_start.mod_len = size;
- xen_state.max_addr = ALIGN_UP (xen_state.max_addr + size, PAGE_SIZE);
+ if (xen_state.xen_inf.unmapped_initrd)
+ {
+ xen_state.next_start.flags |= SIF_MOD_START_PFN;
+ xen_state.next_start.mod_start = xen_state.max_addr >> PAGE_SHIFT;
+ }
+ else
+ xen_state.next_start.mod_start =
+ xen_state.max_addr + xen_state.xen_inf.virt_base;
grub_dprintf ("xen", "Initrd, addr=0x%x, size=0x%x\n",
- (unsigned) xen_state.next_start.mod_start, (unsigned) size);
+ (unsigned) (xen_state.max_addr + xen_state.xen_inf.virt_base),
+ (unsigned) size);
+
+ xen_state.max_addr = ALIGN_UP (xen_state.max_addr + size, PAGE_SIZE);
fail:
grub_initrd_close (&initrd_ctx);
@@ -686,6 +723,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
if (!xen_state.module_info_page)
{
+ xen_state.xen_inf.unmapped_initrd = 0;
xen_state.n_modules = 0;
xen_state.max_addr = ALIGN_UP (xen_state.max_addr, PAGE_SIZE);
xen_state.modules_target_start = xen_state.max_addr;
diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c
index 03215ca..8751174 100644
--- a/grub-core/loader/i386/xen_fileXX.c
+++ b/grub-core/loader/i386/xen_fileXX.c
@@ -261,6 +261,9 @@ parse_note (grub_elf_t elf, struct grub_xen_file_info *xi,
descsz == 2 ? 2 : 3) == 0)
xi->arch = GRUB_XEN_FILE_I386;
break;
+ case XEN_ELFNOTE_MOD_START_PFN:
+ xi->unmapped_initrd = !!grub_le_to_cpu32(*(grub_uint32_t *) desc);
+ break;
default:
grub_dprintf ("xen", "unknown note type %d\n", nh->n_type);
break;
diff --git a/include/grub/xen_file.h b/include/grub/xen_file.h
index 4b2ccba..ed749fa 100644
--- a/include/grub/xen_file.h
+++ b/include/grub/xen_file.h
@@ -36,6 +36,7 @@ struct grub_xen_file_info
int has_note;
int has_xen_guest;
int extended_cr3;
+ int unmapped_initrd;
enum
{
GRUB_XEN_FILE_I386 = 1,
--
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 ` [PATCH v7 07/11] xen: factor out allocation of special pages " Juergen Gross
2016-03-03 9:38 ` [PATCH v7 08/11] xen: factor out allocation of page tables " Juergen Gross
2016-03-03 9:38 ` Juergen Gross [this message]
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-10-git-send-email-jgross__22235.5769285516$1456997975$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).