[Xen-devel] [PATCH] PVH: vcpu info placement, load selectors, and remove debug printk.

[Mukesh Rathor <mukesh.rathor@xxxxxxxxxx>]

This patch addresses 3 things:
   - Resolve vcpu info placement fixme.
   - Load DS/SS/CS selectors for PVH after switching to new gdt.
   - Remove printk in case of failure to map pnfs in p2m. This because qemu
     has lot of benign failures when mapping HVM pages.

Signed-off-by: Mukesh Rathor <mukesh.rathor@xxxxxxxxxx>
---
 arch/x86/xen/enlighten.c |   22 ++++++++++++++++++----
 arch/x86/xen/mmu.c       |    3 ---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index a7ee39f..6ff30d8 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1083,14 +1083,12 @@ void xen_setup_shared_info(void)
                HYPERVISOR_shared_info =
                        (struct shared_info *)__va(xen_start_info->shared_info);
 
-       /* PVH TBD/FIXME: vcpu info placement in phase 2 */
-       if (xen_pvh_domain())
-               return;
-
 #ifndef CONFIG_SMP
        /* In UP this is as good a place as any to set up shared info */
        xen_setup_vcpu_info_placement();
 #endif
+       if (xen_pvh_domain())
+               return;
 
        xen_setup_mfn_list_list();
 }
@@ -1103,6 +1101,10 @@ void xen_setup_vcpu_info_placement(void)
        for_each_possible_cpu(cpu)
                xen_vcpu_setup(cpu);
 
+       /* PVH always uses native IRQ ops */
+       if (xen_pvh_domain())
+               return;
+
        /* xen_vcpu_setup managed to place the vcpu_info within the
           percpu area for all cpus, so make use of it */
        if (have_vcpu_info_placement) {
@@ -1327,6 +1329,18 @@ static void __init xen_setup_stackprotector(void)
        /* PVH TBD/FIXME: investigate setup_stack_canary_segment */
        if (xen_feature(XENFEAT_auto_translated_physmap)) {
                switch_to_new_gdt(0);
+
+               /* xen started us with null selectors. load them now */
+               __asm__ __volatile__ (
+                       "movl %0,%%ds\n"
+                       "movl %0,%%ss\n"
+                       "pushq %%rax\n"
+                       "leaq 1f(%%rip),%%rax\n"
+                       "pushq %%rax\n"
+                       "retfq\n"
+                       "1:\n"
+                       : : "r" (__KERNEL_DS), "a" (__KERNEL_CS) : "memory");
+
                return;
        }
        pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
index 31cc1ef..c104895 100644
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
@@ -2527,9 +2527,6 @@ static int pvh_add_to_xen_p2m(unsigned long lpfn, 
unsigned long fgmfn,
        set_xen_guest_handle(xatp.errs, &err);
 
        rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap_range, &xatp);
-       if (rc || err)
-               pr_warn("d0: Failed to map pfn (0x%lx) to mfn (0x%lx) 
rc:%d:%d\n",
-                       lpfn, fgmfn, rc, err);
        return rc;
 }
 
-- 
1.7.2.3


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel