mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
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,
	wei.liu2@citrix.com, ian.jackson@eu.citrix.com,
	xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org,
	boris.ostrovsky@oracle.com
Subject: [PATCH 4/6] xen/x86/pvh: Set up descriptors for 32-bit PVH guests
Date: Mon,  6 Jul 2015 23:34:23 -0400	[thread overview]
Message-ID: <1436240065-10813-5-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1436240065-10813-1-git-send-email-boris.ostrovsky@oracle.com>

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
 arch/x86/xen/enlighten.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 0b95c9b..7953e68 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;
 
-		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,16 @@ static void __ref xen_setup_gdt(int cpu)
 		loadsegment(ds, 0);
 		loadsegment(fs, 0);
 #else
-		/* PVH: TODO Implement. */
-		BUG();
+		asm volatile ("ljmp %1,$1f\n"
+			      "1:\n"
+			      "movl %2,%0\n"
+			      "movl %0,%%ss\n"
+			      "movl %3,%0\n"
+			      "movl %0,%%ds\n"
+			      "movl %0,%%es\n"
+			      : "=&r" (dummy)
+			      : "i" (__KERNEL_CS), "i" (__KERNEL_DS),
+				"i" (__USER_DS));
 #endif
 		return; /* PVH does not need any PV GDT ops. */
 	}
-- 
1.8.1.4


  parent reply	other threads:[~2015-07-07  3:35 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07  3:34 [PATCH 0/6] 32-bit PVH domU support Boris Ostrovsky
2015-07-07  3:34 ` [PATCH 1/6] xen/x86/pvh: Save %rbx in xen_pvh_early_cpu_init() Boris Ostrovsky
2015-07-07 20:16   ` Konrad Rzeszutek Wilk
2015-07-07 20:26     ` Konrad Rzeszutek Wilk
2015-07-07 20:51       ` Boris Ostrovsky
2015-07-07 20:49     ` Boris Ostrovsky
2015-07-07  3:34 ` [PATCH 2/6] xen/x86: Remove unnecessary memset() call Boris Ostrovsky
2015-07-07 19:27   ` Konrad Rzeszutek Wilk
2015-07-07  3:34 ` [PATCH 3/6] xen/x86/pvh: Properly set page tables for 32-bit PVH guests Boris Ostrovsky
2015-07-07 19:31   ` Konrad Rzeszutek Wilk
2015-07-07  3:34 ` Boris Ostrovsky [this message]
2015-07-07 19:54   ` [PATCH 4/6] xen/x86/pvh: Set up descriptors " Konrad Rzeszutek Wilk
2015-07-07 20:42     ` Boris Ostrovsky
2015-07-07  3:34 ` [PATCH 5/6] xen/x86/pvh: Add 32-bit PVH initialization code Boris Ostrovsky
2015-07-07 19:59   ` Konrad Rzeszutek Wilk
2015-07-07 20:33   ` Konrad Rzeszutek Wilk
2015-07-07  3:34 ` [PATCH 6/6] xen/x86/pvh: Allow building 32-bit PVH guests Boris Ostrovsky
2015-07-07 20:00   ` Konrad Rzeszutek Wilk
2015-07-08 12:50 ` [Xen-devel] [PATCH 0/6] 32-bit PVH domU support David Vrabel

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=1436240065-10813-5-git-send-email-boris.ostrovsky@oracle.com \
    --to=boris.ostrovsky@oracle.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=david.vrabel@citrix.com \
    --cc=elena.ufimtseva@oracle.com \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=jbeulich@suse.com \
    --cc=konrad.wilk@oracle.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=roger.pau@citrix.com \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=tim@xen.org \
    --cc=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

all inboxes | Powered by JetHome®