xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: wei.liu2@citrix.com
Subject: [PATCH v2 45/62] xen/pvshim: modify Dom0 builder in order to build a DomU
Date: Fri, 12 Jan 2018 11:28:53 +0000	[thread overview]
Message-ID: <20180112112910.16762-46-wei.liu2@citrix.com> (raw)
In-Reply-To: <20180112112910.16762-1-wei.liu2@citrix.com>

From: Roger Pau Monne <roger.pau@citrix.com>

According to the PV ABI the initial virtual memory regions should
contain the xenstore and console pages after the start_info. Also set
the correct values in the start_info for DomU operation.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Changes since v1:
 - Modify the position of the __init attribute in dom0_update_physmap.
 - Move the addition of sizeof(struct dom0_vga_console_info) to
   vstartinfo_end with an existing if branch.
 - Add a TODO item for fill_console_start_info in the !CONFIG_VIDEO
   case.
 - s/replace_va/replace_va_mapping/.
 - Remove call to free_domheap_pages in replace_va_mapping.
   put_page_and_type should already take care of freeing the page.
 - Use PFN_DOWN in SET_AND_MAP_PARAM macro.
 - Parenthesize va in SET_AND_MAP_PARAM macro when required.
---
 xen/arch/x86/pv/dom0_build.c     | 48 +++++++++++++++++++++++-------
 xen/arch/x86/pv/shim.c           | 63 ++++++++++++++++++++++++++++++++++++++++
 xen/include/asm-x86/dom0_build.h |  4 +++
 xen/include/asm-x86/pv/shim.h    | 21 ++++++++++++++
 4 files changed, 126 insertions(+), 10 deletions(-)

diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c
index 6118970d44..52576795cc 100644
--- a/xen/arch/x86/pv/dom0_build.c
+++ b/xen/arch/x86/pv/dom0_build.c
@@ -31,9 +31,8 @@
 #define L3_PROT (BASE_PROT|_PAGE_DIRTY)
 #define L4_PROT (BASE_PROT|_PAGE_DIRTY)
 
-static __init void dom0_update_physmap(struct domain *d, unsigned long pfn,
-                                       unsigned long mfn,
-                                       unsigned long vphysmap_s)
+void __init dom0_update_physmap(struct domain *d, unsigned long pfn,
+                                unsigned long mfn, unsigned long vphysmap_s)
 {
     if ( !is_pv_32bit_domain(d) )
         ((unsigned long *)vphysmap_s)[pfn] = mfn;
@@ -315,6 +314,10 @@ int __init dom0_construct_pv(struct domain *d,
     unsigned long vphysmap_end;
     unsigned long vstartinfo_start;
     unsigned long vstartinfo_end;
+    unsigned long vxenstore_start = 0;
+    unsigned long vxenstore_end = 0;
+    unsigned long vconsole_start = 0;
+    unsigned long vconsole_end = 0;
     unsigned long vstack_start;
     unsigned long vstack_end;
     unsigned long vpt_start;
@@ -440,11 +443,22 @@ int __init dom0_construct_pv(struct domain *d,
     if ( parms.p2m_base != UNSET_ADDR )
         vphysmap_end = vphysmap_start;
     vstartinfo_start = round_pgup(vphysmap_end);
-    vstartinfo_end   = (vstartinfo_start +
-                        sizeof(struct start_info) +
-                        sizeof(struct dom0_vga_console_info));
+    vstartinfo_end   = vstartinfo_start + sizeof(struct start_info);
+
+    if ( pv_shim )
+    {
+        vxenstore_start  = round_pgup(vstartinfo_end);
+        vxenstore_end    = vxenstore_start + PAGE_SIZE;
+        vconsole_start   = vxenstore_end;
+        vconsole_end     = vconsole_start + PAGE_SIZE;
+        vpt_start        = vconsole_end;
+    }
+    else
+    {
+        vpt_start        = round_pgup(vstartinfo_end);
+        vstartinfo_end  += sizeof(struct dom0_vga_console_info);
+    }
 
-    vpt_start        = round_pgup(vstartinfo_end);
     for ( nr_pt_pages = 2; ; nr_pt_pages++ )
     {
         vpt_end          = vpt_start + (nr_pt_pages * PAGE_SIZE);
@@ -537,6 +551,8 @@ int __init dom0_construct_pv(struct domain *d,
            " Init. ramdisk: %p->%p\n"
            " Phys-Mach map: %p->%p\n"
            " Start info:    %p->%p\n"
+           " Xenstore ring: %p->%p\n"
+           " Console ring:  %p->%p\n"
            " Page tables:   %p->%p\n"
            " Boot stack:    %p->%p\n"
            " TOTAL:         %p->%p\n",
@@ -544,6 +560,8 @@ int __init dom0_construct_pv(struct domain *d,
            _p(vinitrd_start), _p(vinitrd_end),
            _p(vphysmap_start), _p(vphysmap_end),
            _p(vstartinfo_start), _p(vstartinfo_end),
+           _p(vxenstore_start), _p(vxenstore_end),
+           _p(vconsole_start), _p(vconsole_end),
            _p(vpt_start), _p(vpt_end),
            _p(vstack_start), _p(vstack_end),
            _p(v_start), _p(v_end));
@@ -737,7 +755,8 @@ int __init dom0_construct_pv(struct domain *d,
 
     si->shared_info = virt_to_maddr(d->shared_info);
 
-    si->flags        = SIF_PRIVILEGED | SIF_INITDOMAIN;
+    if ( !pv_shim )
+        si->flags    = SIF_PRIVILEGED | SIF_INITDOMAIN;
     if ( !vinitrd_start && initrd_len )
         si->flags   |= SIF_MOD_START_PFN;
     si->flags       |= (xen_processor_pmbits << 8) & SIF_PM_MASK;
@@ -829,15 +848,24 @@ int __init dom0_construct_pv(struct domain *d,
         strlcpy((char *)si->cmd_line, cmdline, sizeof(si->cmd_line));
 
 #ifdef CONFIG_VIDEO
-    if ( fill_console_start_info((void *)(si + 1)) )
+    if ( !pv_shim && fill_console_start_info((void *)(si + 1)) )
     {
         si->console.dom0.info_off  = sizeof(struct start_info);
         si->console.dom0.info_size = sizeof(struct dom0_vga_console_info);
     }
 #endif
 
+    /*
+     * TODO: provide an empty stub for fill_console_start_info in the
+     * !CONFIG_VIDEO case so the logic here can be simplified.
+     */
+    if ( pv_shim )
+        pv_shim_setup_dom(d, l4start, v_start, vxenstore_start, vconsole_start,
+                          vphysmap_start, si);
+
     if ( is_pv_32bit_domain(d) )
-        xlat_start_info(si, XLAT_start_info_console_dom0);
+        xlat_start_info(si, pv_shim ? XLAT_start_info_console_domU
+                                    : XLAT_start_info_console_dom0);
 
     /* Return to idle domain's page tables. */
     mapcache_override_current(NULL);
diff --git a/xen/arch/x86/pv/shim.c b/xen/arch/x86/pv/shim.c
index 4d037355db..75365b0697 100644
--- a/xen/arch/x86/pv/shim.c
+++ b/xen/arch/x86/pv/shim.c
@@ -18,16 +18,79 @@
  *
  * Copyright (c) 2017 Citrix Systems Ltd.
  */
+#include <xen/hypercall.h>
 #include <xen/init.h>
 #include <xen/types.h>
 
 #include <asm/apic.h>
+#include <asm/dom0_build.h>
+#include <asm/guest.h>
+#include <asm/pv/mm.h>
 
 #ifndef CONFIG_PV_SHIM_EXCLUSIVE
 bool pv_shim;
 boolean_param("pv-shim", pv_shim);
 #endif
 
+#define L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED|_PAGE_USER| \
+                 _PAGE_GUEST_KERNEL)
+#define COMPAT_L1_PROT (_PAGE_PRESENT|_PAGE_RW|_PAGE_ACCESSED)
+
+static void __init replace_va_mapping(struct domain *d, l4_pgentry_t *l4start,
+                                      unsigned long va, unsigned long mfn)
+{
+    struct page_info *page;
+    l4_pgentry_t *pl4e;
+    l3_pgentry_t *pl3e;
+    l2_pgentry_t *pl2e;
+    l1_pgentry_t *pl1e;
+
+    pl4e = l4start + l4_table_offset(va);
+    pl3e = l4e_to_l3e(*pl4e);
+    pl3e += l3_table_offset(va);
+    pl2e = l3e_to_l2e(*pl3e);
+    pl2e += l2_table_offset(va);
+    pl1e = l2e_to_l1e(*pl2e);
+    pl1e += l1_table_offset(va);
+
+    page = mfn_to_page(l1e_get_pfn(*pl1e));
+    put_page_and_type(page);
+
+    *pl1e = l1e_from_pfn(mfn, (!is_pv_32bit_domain(d) ? L1_PROT
+                                                      : COMPAT_L1_PROT));
+}
+
+void __init pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4start,
+                              unsigned long va_start, unsigned long store_va,
+                              unsigned long console_va, unsigned long vphysmap,
+                              start_info_t *si)
+{
+    uint64_t param = 0;
+    long rc;
+
+#define SET_AND_MAP_PARAM(p, si, va) ({                                        \
+    rc = xen_hypercall_hvm_get_param(p, &param);                               \
+    if ( rc )                                                                  \
+        panic("Unable to get " #p "\n");                                       \
+    (si) = param;                                                              \
+    if ( va )                                                                  \
+    {                                                                          \
+        share_xen_page_with_guest(mfn_to_page(param), d, XENSHARE_writable);   \
+        replace_va_mapping(d, l4start, va, param);                             \
+        dom0_update_physmap(d, PFN_DOWN((va) - va_start), param, vphysmap);    \
+    }                                                                          \
+})
+    SET_AND_MAP_PARAM(HVM_PARAM_STORE_PFN, si->store_mfn, store_va);
+    SET_AND_MAP_PARAM(HVM_PARAM_STORE_EVTCHN, si->store_evtchn, 0);
+    if ( !pv_console )
+    {
+        SET_AND_MAP_PARAM(HVM_PARAM_CONSOLE_PFN, si->console.domU.mfn,
+                          console_va);
+        SET_AND_MAP_PARAM(HVM_PARAM_CONSOLE_EVTCHN, si->console.domU.evtchn, 0);
+    }
+#undef SET_AND_MAP_PARAM
+}
+
 /*
  * Local variables:
  * mode: C
diff --git a/xen/include/asm-x86/dom0_build.h b/xen/include/asm-x86/dom0_build.h
index 25d124f8d4..33a5483739 100644
--- a/xen/include/asm-x86/dom0_build.h
+++ b/xen/include/asm-x86/dom0_build.h
@@ -1,6 +1,7 @@
 #ifndef _DOM0_BUILD_H_
 #define _DOM0_BUILD_H_
 
+#include <xen/libelf.h>
 #include <xen/sched.h>
 
 #include <asm/setup.h>
@@ -27,6 +28,9 @@ int dom0_construct_pvh(struct domain *d, const module_t *image,
 unsigned long dom0_paging_pages(const struct domain *d,
                                 unsigned long nr_pages);
 
+void dom0_update_physmap(struct domain *d, unsigned long pfn,
+                         unsigned long mfn, unsigned long vphysmap_s);
+
 #endif	/* _DOM0_BUILD_H_ */
 
 /*
diff --git a/xen/include/asm-x86/pv/shim.h b/xen/include/asm-x86/pv/shim.h
index 1468cfd498..b0c361cba1 100644
--- a/xen/include/asm-x86/pv/shim.h
+++ b/xen/include/asm-x86/pv/shim.h
@@ -29,6 +29,27 @@ extern bool pv_shim;
 # define pv_shim 0
 #endif /* CONFIG_PV_SHIM{,_EXCLUSIVE} */
 
+#ifdef CONFIG_PV_SHIM
+
+void pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4start,
+                       unsigned long va_start, unsigned long store_va,
+                       unsigned long console_va, unsigned long vphysmap,
+                       start_info_t *si);
+
+#else
+
+static inline void pv_shim_setup_dom(struct domain *d, l4_pgentry_t *l4start,
+                                     unsigned long va_start,
+                                     unsigned long store_va,
+                                     unsigned long console_va,
+                                     unsigned long vphysmap,
+                                     start_info_t *si)
+{
+    ASSERT_UNREACHABLE();
+}
+
+#endif
+
 #endif /* __X86_PV_SHIM_H__ */
 
 /*
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

  parent reply	other threads:[~2018-01-12 11:58 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-12 11:28 [PATCH v2 00/62] Comet: Run PV in PVH container Wei Liu
2018-01-12 11:28 ` [PATCH v2 01/62] x86/svm: Offer CPUID Faulting to AMD HVM guests as well Wei Liu
2018-01-12 11:28 ` [PATCH v2 02/62] xen/x86: report domain id on cpuid Wei Liu
2018-01-12 11:28 ` [PATCH v2 03/62] tools/libxc: remove extraneous newline in xc_dom_load_acpi Wei Liu
2018-01-12 11:28 ` [PATCH v2 04/62] tools/libelf: fix elf notes check for PVH guest Wei Liu
2018-01-12 11:28 ` [PATCH v2 05/62] tools/libxc: Multi modules support Wei Liu
2018-01-12 11:28 ` [PATCH v2 06/62] xen/common: Widen the guest logging buffer slightly Wei Liu
2018-01-12 11:28 ` [PATCH v2 07/62] x86/time: Print a more helpful error when a platform timer can't be found Wei Liu
2018-01-12 11:28 ` [PATCH v2 08/62] x86/link: Introduce and use SECTION_ALIGN Wei Liu
2018-01-12 11:28 ` [PATCH v2 09/62] ACPICA: Make ACPI Power Management Timer (PM Timer) optional Wei Liu
2018-01-12 11:28 ` [PATCH v2 10/62] xen/domctl: Return arch_config via getdomaininfo Wei Liu
2018-01-12 11:28 ` [PATCH v2 11/62] tools/ocaml: Expose arch_config in domaininfo Wei Liu
2018-01-12 11:28 ` [PATCH v2 12/62] tools/ocaml: Extend domain_create() to take arch_domainconfig Wei Liu
2018-01-12 11:28 ` [PATCH v2 13/62] x86/fixmap: Modify fix_to_virt() to return a void pointer Wei Liu
2018-01-12 11:28 ` [PATCH v2 14/62] x86: Common cpuid faulting support Wei Liu
2018-01-12 11:28 ` [PATCH v2 15/62] x86/Kconfig: Options for Xen and PVH support Wei Liu
2018-01-12 11:28 ` [PATCH v2 16/62] x86/link: Relocate program headers Wei Liu
2018-01-12 11:28 ` [PATCH v2 17/62] x86: introduce ELFNOTE macro Wei Liu
2018-01-12 11:28 ` [PATCH v2 18/62] x86: produce a binary that can be booted as PVH Wei Liu
2018-01-12 11:28 ` [PATCH v2 19/62] x86/entry: Early PVH boot code Wei Liu
2018-01-12 11:28 ` [PATCH v2 20/62] x86/boot: Map more than the first 16MB Wei Liu
2018-01-12 11:28 ` [PATCH v2 21/62] x86/entry: Probe for Xen early during boot Wei Liu
2018-01-12 11:28 ` [PATCH v2 22/62] x86/guest: Hypercall support Wei Liu
2018-01-12 11:28 ` [PATCH v2 23/62] x86/shutdown: Support for using SCHEDOP_{shutdown, reboot} Wei Liu
2018-01-12 11:28 ` [PATCH v2 24/62] x86/pvh: Retrieve memory map from Xen Wei Liu
2018-01-12 11:28 ` [PATCH v2 25/62] xen/console: Introduce console=xen Wei Liu
2018-01-12 11:28 ` [PATCH v2 26/62] xen: introduce rangeset_claim_range Wei Liu
2018-01-12 11:28 ` [PATCH v2 27/62] xen/pvshim: keep track of used PFN ranges Wei Liu
2018-01-12 11:28 ` [PATCH v2 28/62] x86/guest: map shared_info page Wei Liu
2018-01-12 11:28 ` [PATCH v2 29/62] xen/guest: fetch vCPU ID from Xen Wei Liu
2018-01-12 11:28 ` [PATCH v2 30/62] x86/guest: map per-cpu vcpu_info area Wei Liu
2018-01-12 11:28 ` [PATCH v2 31/62] x86: xen pv clock time source Wei Liu
2018-01-12 20:45   ` Joao Martins
2018-01-16 12:22     ` Wei Liu
2018-01-12 11:28 ` [PATCH v2 32/62] x86: APIC timer calibration when running as a guest Wei Liu
2018-01-12 11:28 ` [PATCH v2 33/62] x86: read wallclock from Xen when running in pvh mode Wei Liu
2018-01-12 11:28 ` [PATCH v2 34/62] x86: don't swallow the first command line item in guest mode Wei Liu
2018-01-12 11:28 ` [PATCH v2 35/62] x86/guest: setup event channel upcall vector Wei Liu
2018-01-12 11:28 ` [PATCH v2 36/62] x86/guest: add PV console code Wei Liu
2018-01-12 11:28 ` [PATCH v2 37/62] x86/guest: use PV console for Xen/Dom0 I/O Wei Liu
2018-01-12 11:28 ` [PATCH v2 38/62] x86/shim: Kconfig and command line options Wei Liu
2018-01-12 11:28 ` [PATCH v2 39/62] tools/firmware: Build and install xen-shim Wei Liu
2018-01-12 11:28 ` [PATCH v2 40/62] xen/x86: make VGA support selectable Wei Liu
2018-01-12 11:28 ` [PATCH v2 41/62] xen/pvh: do not mark the low 1MB as IO mem Wei Liu
2018-01-12 11:28 ` [PATCH v2 42/62] sched/null: skip vCPUs on the waitqueue that are blocked Wei Liu
2018-01-12 11:28 ` [PATCH v2 43/62] xen/pvshim: skip Dom0-only domain builder parts Wei Liu
2018-01-12 11:28 ` [PATCH v2 44/62] xen: mark xenstore/console pages as RAM Wei Liu
2018-01-12 11:28 ` Wei Liu [this message]
2018-01-12 11:28 ` [PATCH v2 46/62] xen/pvshim: set correct domid value Wei Liu
2018-01-12 11:28 ` [PATCH v2 47/62] xen/pvshim: forward evtchn ops between L0 Xen and L2 DomU Wei Liu
2018-01-12 11:28 ` [PATCH v2 48/62] xen/pvshim: add grant table operations Wei Liu
2018-01-12 11:28 ` [PATCH v2 49/62] x86/pv-shim: shadow PV console's page for L2 DomU Wei Liu
2018-01-12 11:28 ` [PATCH v2 50/62] xen/pvshim: add migration support Wei Liu
2018-01-12 11:28 ` [PATCH v2 51/62] xen/pvshim: add shim_mem cmdline parameter Wei Liu
2018-01-12 11:29 ` [PATCH v2 52/62] xen/pvshim: set max_pages to the value of tot_pages Wei Liu
2018-01-12 11:29 ` [PATCH v2 53/62] xen/pvshim: support vCPU hotplug Wei Liu
2018-01-12 11:29 ` [PATCH v2 54/62] xen/pvshim: memory hotplug Wei Liu
2018-01-12 11:29 ` [PATCH v2 55/62] xen/shim: modify shim_mem parameter behaviour Wei Liu
2018-01-12 11:29 ` [PATCH v2 56/62] xen/pvshim: use default position for the m2p mappings Wei Liu
2018-01-12 11:29 ` [PATCH v2 57/62] xen/shim: crash instead of reboot in shim mode Wei Liu
2018-01-12 11:29 ` [PATCH v2 58/62] xen/shim: allow DomU to have as many vcpus as available Wei Liu
2018-01-12 11:29 ` [PATCH v2 59/62] libxl: pvshim: Provide first-class config settings to enable shim mode Wei Liu
2018-01-12 14:45   ` [PATCH] fixup! " Ian Jackson
2018-01-12 11:29 ` [PATCH v2 60/62] libxl: pvshim: Introduce pvshim_extra Wei Liu
2018-01-12 11:29 ` [PATCH v2 61/62] xl: pvshim: Provide and document xl config Wei Liu
2018-01-12 11:29 ` [PATCH v2 62/62] xl: Default guest mode changed from PV to PVH with PV shim Wei Liu

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=20180112112910.16762-46-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=xen-devel@lists.xenproject.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).