xen: add capability to load initrd outside of initial mapping

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>

diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
index 2e127637a3d4825aa6302f4c4cccea751772ab33..9639ca159cb465d88e7fbef0d1b5a9f284ae2593 100644 (file)
--- 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,16 +328,11 @@ 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_boot (void)
+grub_xen_alloc_boot_data (void)
 {
   grub_err_t err;
-  grub_uint64_t nr_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)
@@ -340,6 +344,24 @@ grub_xen_boot (void)
   if (err)
     return err;
 
+  return GRUB_ERR_NONE;
+}
+
+static grub_err_t
+grub_xen_boot (void)
+{
+  grub_err_t err;
+  grub_uint64_t nr_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_alloc_boot_data ();
+  if (err)
+    return err;
+
   err = set_mfns (xen_state.console_pfn);
   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 03215cab2c14eccdda6e2ed7da4128d998d14e3b..8751174cf578c58a985ec07955d94a4e9cccbfcc 100644 (file)
--- 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 4b2ccba78514b5a842ea9110f2b2dc1b4d91b05a..ed749fafeaca29698ecb9b7bc74cbc4d3d56b746 100644 (file)
--- 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,