grub-devel.gnu.org archive mirror
 help / color / mirror / Atom feed
From: Juergen Gross <jgross@suse.com>
To: grub-devel@gnu.org
Cc: xen-devel@lists.xen.org, phcoder@gmail.com,
	daniel.kiper@oracle.com, hans@knorrie.org,
	Juergen Gross <jgross@suse.com>
Subject: [PATCH v2 12/18] xen: setup Xen specific data for PVH
Date: Tue,  9 Oct 2018 13:03:11 +0200	[thread overview]
Message-ID: <20181009110317.6022-13-jgross@suse.com> (raw)
In-Reply-To: <20181009110317.6022-1-jgross@suse.com>

Initialize the needed Xen specific data. This is:

- the Xen start of day page containing the console and Xenstore ring
  page PFN and event channel
- the grant table
- the shared info page

Set the RSDP address for the guest from the start_info page passed
as boot parameter.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 grub-core/kern/i386/xen/pvh.c | 107 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/grub-core/kern/i386/xen/pvh.c b/grub-core/kern/i386/xen/pvh.c
index b4933b454..93ed68245 100644
--- a/grub-core/kern/i386/xen/pvh.c
+++ b/grub-core/kern/i386/xen/pvh.c
@@ -24,6 +24,7 @@
 #include <grub/xen.h>
 #include <grub/i386/linux.h>
 #include <grub/machine/kernel.h>
+#include <xen/hvm/params.h>
 #include <xen/memory.h>
 
 struct xen_machine_mmap_entry
@@ -39,6 +40,7 @@ static struct { char _entry[32]; } hypercall_page[128]
   __attribute__ ((aligned (GRUB_XEN_PAGE_SIZE)));
 
 static grub_uint32_t xen_cpuid_base;
+static struct start_info grub_xen_start_page;
 static struct xen_machine_mmap_entry map[128];
 static unsigned int nr_map_entries;
 
@@ -104,6 +106,36 @@ grub_xen_hypercall (grub_uint32_t callno, grub_uint32_t a0,
   return __res;
 }
 
+static grub_uint32_t
+grub_xen_get_param (int idx)
+{
+  struct xen_hvm_param xhv;
+  int r;
+
+  xhv.domid = DOMID_SELF;
+  xhv.index = idx;
+  r = grub_xen_hypercall (__HYPERVISOR_hvm_op, HVMOP_get_param,
+			  (grub_uint32_t) (&xhv), 0, 0, 0, 0);
+  if (r < 0)
+    grub_xen_early_halt ();
+  return xhv.value;
+}
+
+static void *
+grub_xen_add_physmap (unsigned int space, void *addr)
+{
+  struct xen_add_to_physmap xatp;
+
+  xatp.domid = DOMID_SELF;
+  xatp.idx = 0;
+  xatp.space = space;
+  xatp.gpfn = (grub_addr_t) addr >> GRUB_XEN_LOG_PAGE_SIZE;
+  if (grub_xen_hypercall (__HYPERVISOR_memory_op, XENMEM_add_to_physmap,
+			  (grub_uint32_t) (&xatp), 0, 0, 0, 0))
+    grub_xen_early_halt ();
+  return addr;
+}
+
 static void
 grub_xen_sort_mmap (void)
 {
@@ -190,12 +222,87 @@ grub_xen_get_mmap (void)
   grub_xen_sort_mmap ();
 }
 
+static grub_uint64_t
+grub_xen_find_page (grub_uint64_t start)
+{
+  unsigned int i, j;
+  grub_uint64_t last = start;
+
+  /* Try to find a e820 map hole below 4G. */
+  for (i = 0; i < nr_map_entries; i++)
+    {
+      if (last > map[i].addr + map[i].len)
+	continue;
+      if (last < map[i].addr)
+	return last;
+      if ((map[i].addr >> 32) || ((map[i].addr + map[i].len) >> 32))
+	break;
+      last = map[i].addr + map[i].len;
+    }
+    if (i == nr_map_entries)
+      return last;
+
+  /* No hole found, use the highest RAM page below 4G and reserve it. */
+  if (nr_map_entries == ARRAY_SIZE(map))
+    grub_xen_early_halt ();
+  j = 0;
+  for (i = 0; i < nr_map_entries; i++)
+    {
+      if (map[i].type != GRUB_MEMORY_AVAILABLE)
+	continue;
+      if (map[i].addr >> 32)
+	break;
+      j = i;
+      if ((map[i].addr + map[i].len) >> 32)
+	break;
+    }
+  if (map[j].type != GRUB_MEMORY_AVAILABLE)
+    grub_xen_early_halt ();
+  if ((map[i].addr + map[i].len) >> 32)
+    last = (1ULL << 32) - GRUB_XEN_PAGE_SIZE;
+  else
+    last = map[i].addr + map[i].len - GRUB_XEN_PAGE_SIZE;
+  map[nr_map_entries].addr = last;
+  map[nr_map_entries].len = GRUB_XEN_PAGE_SIZE;
+  map[nr_map_entries].type = GRUB_MEMORY_RESERVED;
+  nr_map_entries++;
+  grub_xen_sort_mmap ();
+
+  return last;
+}
+
 void
 grub_xen_setup_pvh (void)
 {
+  grub_addr_t par;
+
   grub_xen_cpuid_base ();
   grub_xen_setup_hypercall_page ();
   grub_xen_get_mmap ();
+
+  /* Setup Xen data. */
+  grub_xen_start_page_addr = &grub_xen_start_page;
+
+  par = grub_xen_get_param (HVM_PARAM_CONSOLE_PFN);
+  grub_xen_start_page_addr->console.domU.mfn = par;
+  grub_xen_xcons = (void *) (grub_addr_t) (par << GRUB_XEN_LOG_PAGE_SIZE);
+  par = grub_xen_get_param (HVM_PARAM_CONSOLE_EVTCHN);
+  grub_xen_start_page_addr->console.domU.evtchn = par;
+
+  par = grub_xen_get_param (HVM_PARAM_STORE_PFN);
+  grub_xen_start_page_addr->store_mfn = par;
+  grub_xen_xenstore = (void *) (grub_addr_t) (par << GRUB_XEN_LOG_PAGE_SIZE);
+  par = grub_xen_get_param (HVM_PARAM_STORE_EVTCHN);
+  grub_xen_start_page_addr->store_evtchn = par;
+
+  par = grub_xen_find_page (0);
+  grub_xen_grant_table = grub_xen_add_physmap (XENMAPSPACE_grant_table,
+					       (void *) par);
+  par = grub_xen_find_page (par + GRUB_XEN_PAGE_SIZE);
+  grub_xen_shared_info = grub_xen_add_physmap (XENMAPSPACE_shared_info,
+					       (void *) par);
+
+  grub_rsdp_addr = pvh_start_info->rsdp_paddr;
 }
 
 grub_err_t
-- 
2.16.4



  parent reply	other threads:[~2018-10-09 11:03 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-09 11:02 [PATCH v2 00/18] xen: add pvh guest support Juergen Gross
2018-10-09 11:03 ` [PATCH v2 01/18] xen: add some xen headers Juergen Gross
2018-10-18 13:45   ` Daniel Kiper
2018-10-18 14:04     ` Juergen Gross
2018-10-18 14:14       ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 02/18] loader/linux: support passing rsdp address via boot params Juergen Gross
2018-10-18 14:13   ` Daniel Kiper
2018-10-18 14:18     ` Juergen Gross
2018-10-18 14:30       ` Daniel Kiper
2018-10-18 14:36         ` Juergen Gross
2018-10-18 14:48           ` Daniel Kiper
2018-10-18 14:53             ` Juergen Gross
2018-10-18 15:01               ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 03/18] xen: carve out grant tab initialization into dedicated function Juergen Gross
2018-10-18 14:35   ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 04/18] xen: prepare common code for Xen PVH support Juergen Gross
2018-10-18 14:59   ` Daniel Kiper
2018-10-18 15:39     ` Juergen Gross
2018-10-19  6:36       ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 05/18] xen: add some dummy headers for PVH mode Juergen Gross
2018-10-18 15:19   ` Daniel Kiper
2018-10-18 15:40     ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 06/18] xen: rearrange xen/init.c to prepare it for Xen " Juergen Gross
2018-10-18 17:55   ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 07/18] xen: add PVH specific defines to offset.h Juergen Gross
2018-10-19 11:54   ` Daniel Kiper
2018-10-19 14:39     ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` [PATCH v2 08/18] xen: add basic hooks for PVH in current code Juergen Gross
2018-10-19 12:05   ` Daniel Kiper
2018-10-19 14:40     ` [Xen-devel] " Juergen Gross
2018-10-19 15:33   ` Roger Pau Monné
2018-10-19 15:52     ` Juergen Gross
2018-10-22 11:16       ` Daniel Kiper
2018-10-22 11:18         ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 09/18] xen: add PVH boot entry code Juergen Gross
2018-10-19 12:17   ` Daniel Kiper
2018-10-19 14:50     ` [Xen-devel] " Juergen Gross
2018-10-22 11:18       ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 10/18] xen: setup hypercall page for PVH Juergen Gross
2018-10-19 12:30   ` Daniel Kiper
2018-10-19 12:48     ` [Xen-devel] " Andrew Cooper
2018-10-19 15:01     ` Juergen Gross
2018-10-19 15:40   ` Roger Pau Monné
2018-10-19 15:59     ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 11/18] xen: get memory map from hypervisor " Juergen Gross
2018-10-19 12:40   ` Daniel Kiper
2018-10-19 15:06     ` [Xen-devel] " Juergen Gross
2018-10-09 11:03 ` Juergen Gross [this message]
2018-10-19 12:48   ` [PATCH v2 12/18] xen: setup Xen specific data " Daniel Kiper
2018-10-19 15:10     ` [Xen-devel] " Juergen Gross
2018-10-24 14:01       ` Juergen Gross
2018-10-19 15:46   ` Roger Pau Monné
2018-10-19 16:10   ` Roger Pau Monné
2018-10-19 16:39     ` Juergen Gross
2018-10-29 12:57       ` Roger Pau Monné
2018-10-29 14:19         ` Juergen Gross
2018-10-30 11:23           ` Roger Pau Monné
2018-10-30 12:12             ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 13/18] xen: init memory regions " Juergen Gross
2018-10-22 11:31   ` Daniel Kiper
2018-10-22 11:43     ` Juergen Gross
2018-10-22 12:08       ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 14/18] xenpvh: add build runes for grub-core Juergen Gross
2018-10-22 11:41   ` Daniel Kiper
2018-10-22 11:45     ` Juergen Gross
2018-10-09 11:03 ` [PATCH v2 15/18] grub-module-verifier: Ignore all_video for xenpvh Juergen Gross
2018-10-22 11:45   ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 16/18] xenpvh: support building a standalone image Juergen Gross
2018-10-22 11:56   ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 17/18] xenpvh: support grub-install for xenpvh Juergen Gross
2018-10-22 12:01   ` Daniel Kiper
2018-10-09 11:03 ` [PATCH v2 18/18] xenpvh: add support to configure Juergen Gross
2018-10-22 12:04   ` Daniel Kiper
2018-10-10 15:59 ` [Xen-devel] [PATCH v2 00/18] xen: add pvh guest support 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=20181009110317.6022-13-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=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).