From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky 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> References: <1437083021-24488-1-git-send-email-boris.ostrovsky@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZFqwm-0002N0-1Z for xen-devel@lists.xenproject.org; Thu, 16 Jul 2015 21:44:04 +0000 In-Reply-To: <1437083021-24488-1-git-send-email-boris.ostrovsky@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: elena.ufimtseva@oracle.com, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, andrew.cooper3@citrix.com, tim@xen.org, linux-kernel@vger.kernel.org, jbeulich@suse.com, xen-devel@lists.xenproject.org, boris.ostrovsky@oracle.com, ian.jackson@eu.citrix.com, roger.pau@citrix.com List-Id: xen-devel@lists.xenproject.org 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