Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756579AbbGPVpr (ORCPT ); Thu, 16 Jul 2015 17:45:47 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:36466 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751769AbbGPVoF (ORCPT ); Thu, 16 Jul 2015 17:44:05 -0400 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: roger.pau@citrix.com, elena.ufimtseva@oracle.com, stefano.stabellini@eu.citrix.com, tim@xen.org, jbeulich@suse.com, andrew.cooper3@citrix.com, ian.campbell@citrix.com, ian.jackson@eu.citrix.com, xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com Subject: [PATCH v2 4/6] xen/x86/pvh: Set up descriptors for 32-bit PVH guests Date: Thu, 16 Jul 2015 17:43:39 -0400 Message-Id: <1437083021-24488-5-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1437083021-24488-1-git-send-email-boris.ostrovsky@oracle.com> References: <1437083021-24488-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1656 Lines: 52 Signed-off-by: Boris Ostrovsky --- Changes in v2: * Set segment selectors using loadsegment() instead of assembly arch/x86/xen/enlighten.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index f8dc398..d665b1d 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -1362,12 +1362,12 @@ static void __init xen_boot_params_init_edd(void) static void __ref xen_setup_gdt(int cpu) { if (xen_feature(XENFEAT_auto_translated_physmap)) { -#ifdef CONFIG_X86_64 - unsigned long dummy; + unsigned long __attribute__((unused)) dummy; - load_percpu_segment(cpu); /* We need to access per-cpu area */ + setup_stack_canary_segment(cpu); switch_to_new_gdt(cpu); /* GDT and GS set */ +#ifdef CONFIG_X86_64 /* We are switching of the Xen provided GDT to our HVM mode * GDT. The new GDT has __KERNEL_CS with CS.L = 1 * and we are jumping to reload it. @@ -1392,8 +1392,13 @@ static void __ref xen_setup_gdt(int cpu) loadsegment(ds, 0); loadsegment(fs, 0); #else - /* PVH: TODO Implement. */ - BUG(); + asm volatile ("ljmp %0,$1f\n" + "1:\n" + :: "i" (__KERNEL_CS)); + + loadsegment(ss, __KERNEL_DS); + loadsegment(ds, __USER_DS); + loadsegment(es, __USER_DS); #endif return; /* PVH does not need any PV GDT ops. */ } -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/