[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 09/11] xen: add capability to load initrd outside of initial m
From: |
Juergen Gross |
Subject: |
[PATCH v4 09/11] xen: add capability to load initrd outside of initial mapping |
Date: |
Mon, 22 Feb 2016 07:03:17 +0100 |
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 <address@hidden>
Reviewed-by: Daniel Kiper <address@hidden>
---
V4: rename grub_xen_alloc_end() to grub_xen_alloc_final()
---
grub-core/loader/i386/xen.c | 61 ++++++++++++++++++++++++++++++--------
grub-core/loader/i386/xen_fileXX.c | 3 ++
include/grub/xen_file.h | 1 +
3 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index 2e12763..22a94ae 100644
--- a/grub-core/loader/i386/xen.c
+++ b/grub-core/loader/i386/xen.c
@@ -58,6 +58,7 @@ struct xen_loader_state {
grub_uint64_t modules_target_start;
grub_size_t n_modules;
int loaded;
+ int alloc_end_called;
};
static struct xen_loader_state xen_state;
@@ -320,6 +321,28 @@ grub_xen_pt_alloc (void)
}
static grub_err_t
+grub_xen_alloc_final (void)
+{
+ grub_err_t err;
+
+ if (xen_state.alloc_end_called)
+ return GRUB_ERR_NONE;
+ xen_state.alloc_end_called = 1;
+
+ 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)
{
grub_err_t err;
@@ -330,13 +353,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_final ();
if (err)
return err;
@@ -610,6 +627,13 @@ grub_cmd_initrd (grub_command_t cmd __attribute__
((unused)),
goto fail;
}
+ if (xen_state.xen_inf.unmapped_initrd)
+ {
+ err = grub_xen_alloc_final ();
+ if (err)
+ goto fail;
+ }
+
if (grub_initrd_init (argc, argv, &initrd_ctx))
goto fail;
@@ -627,14 +651,24 @@ 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;
+ xen_state.next_start.mod_len = size;
+ }
+ else
+ {
+ xen_state.next_start.mod_start =
+ xen_state.max_addr + xen_state.xen_inf.virt_base;
+ xen_state.next_start.mod_len = size;
+ }
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 +720,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 1f7f71d..d68634d 100644
--- a/grub-core/loader/i386/xen_fileXX.c
+++ b/grub-core/loader/i386/xen_fileXX.c
@@ -259,6 +259,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
[PATCH v4 01/11] xen: make xen loader callable multiple times, Juergen Gross, 2016/02/22
[PATCH v4 05/11] xen: synchronize xen header, Juergen Gross, 2016/02/22
[PATCH v4 11/11] xen: add capability to load p2m list outside of kernel mapping, Juergen Gross, 2016/02/22
[PATCH v4 06/11] xen: factor out p2m list allocation into separate function, Juergen Gross, 2016/02/22
[PATCH v4 04/11] xen: add elfnote.h to avoid using numbers instead of constants, Juergen Gross, 2016/02/22