Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1323243 > unrolled thread

[PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

Started byBoris Ostrovsky <boris.ostrovsky@oracle.com>
First post2016-02-01 16:50 +0100
Last post2016-02-04 20:10 +0100
Articles 6 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-02-01 16:50 +0100
    Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for  secondary VCPUs David Vrabel <david.vrabel@citrix.com> - 2016-02-02 17:30 +0100
      Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for  secondary VCPUs Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-02-02 18:00 +0100
        Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for  secondary VCPUs David Vrabel <david.vrabel@citrix.com> - 2016-02-04 11:10 +0100
        Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for  secondary VCPUs Doug Goldstein <cardoe@cardoe.com> - 2016-02-04 14:00 +0100
          Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for  secondary VCPUs Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-02-04 20:10 +0100

#1323243 — [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

FromBoris Ostrovsky <boris.ostrovsky@oracle.com>
Date2016-02-01 16:50 +0100
Subject[PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs
Message-ID<qXoTM-4WL-5@gated-at.bofh.it>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
 arch/x86/xen/smp.c         |   57 ++++++++++++++++++++++++++++++++++++++++----
 arch/x86/xen/smp.h         |    4 +++
 arch/x86/xen/xen-hvmlite.S |    7 +++++
 3 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 5fc4afb..b265c4f 100644
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -27,6 +27,7 @@
 #include <xen/interface/xen.h>
 #include <xen/interface/vcpu.h>
 #include <xen/interface/xenpmu.h>
+#include <xen/interface/hvm/hvm_vcpu.h>
 
 #include <asm/xen/interface.h>
 #include <asm/xen/hypercall.h>
@@ -384,6 +385,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
 	struct vcpu_guest_context *ctxt;
 	struct desc_struct *gdt;
 	unsigned long gdt_mfn;
+	void *ctxt_arg;
 
 	/* used to tell cpu_init() that it can proceed with initialization */
 	cpumask_set_cpu(cpu, cpu_callout_mask);
@@ -392,7 +394,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
 
 	if (!xen_hvmlite) {
 
-		ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
+		ctxt_arg = ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);
 		if (ctxt == NULL)
 			return -ENOMEM;
 
@@ -460,14 +462,59 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
 		ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);
 		ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_gfn(swapper_pg_dir));
 	} else {
-		ctxt = NULL; /* To quiet down compiler */
-		BUG();
+#ifdef CONFIG_XEN_PVHVM
+		struct vcpu_hvm_context *hctxt;
+
+		ctxt_arg = hctxt = kzalloc(sizeof(*hctxt), GFP_KERNEL);
+		if (hctxt == NULL)
+			return -ENOMEM;
+
+#ifdef CONFIG_X86_64
+		hctxt->mode = VCPU_HVM_MODE_64B;
+		hctxt->cpu_regs.x86_64.rip =
+			(unsigned long)secondary_startup_64;
+		hctxt->cpu_regs.x86_64.rsp = stack_start;
+
+		hctxt->cpu_regs.x86_64.cr0 =
+			X86_CR0_PG | X86_CR0_WP | X86_CR0_PE;
+		hctxt->cpu_regs.x86_64.cr4 = X86_CR4_PAE;
+		hctxt->cpu_regs.x86_64.cr3 =
+			xen_pfn_to_cr3(virt_to_mfn(init_level4_pgt));
+		hctxt->cpu_regs.x86_64.efer = EFER_LME | EFER_NX;
+#else
+		hctxt->mode = VCPU_HVM_MODE_32B;
+		/*
+		 * startup_32_smp expects GDT loaded so we can't jump
+		 * there directly.
+		 */
+		hctxt->cpu_regs.x86_32.eip =
+			(unsigned long)hvmlite_smp_32 - __START_KERNEL_map;
+
+		hctxt->cpu_regs.x86_32.cr0 = X86_CR0_PE;
+
+		hctxt->cpu_regs.x86_32.cs_base = 0;
+		hctxt->cpu_regs.x86_32.cs_limit = ~0u;
+		hctxt->cpu_regs.x86_32.cs_ar = 0xc9b;
+		hctxt->cpu_regs.x86_32.ds_base = 0;
+		hctxt->cpu_regs.x86_32.ds_limit = ~0u;
+		hctxt->cpu_regs.x86_32.ds_ar = 0xc93;
+		hctxt->cpu_regs.x86_32.es_base = 0;
+		hctxt->cpu_regs.x86_32.es_limit = ~0u;
+		hctxt->cpu_regs.x86_32.es_ar = 0xc93;
+		hctxt->cpu_regs.x86_32.ss_base = 0;
+		hctxt->cpu_regs.x86_32.ss_limit = ~0u;
+		hctxt->cpu_regs.x86_32.ss_ar = 0xc93;
+		hctxt->cpu_regs.x86_32.tr_base = 0;
+		hctxt->cpu_regs.x86_32.tr_limit = 0xff;
+		hctxt->cpu_regs.x86_32.tr_ar = 0x8b;
+#endif
+#endif
 	}
 
-	if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt))
+	if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt_arg))
 		BUG();
 
-	kfree(ctxt);
+	kfree(ctxt_arg);
 	return 0;
 }
 
diff --git a/arch/x86/xen/smp.h b/arch/x86/xen/smp.h
index 963d62a..b4a833c 100644
--- a/arch/x86/xen/smp.h
+++ b/arch/x86/xen/smp.h
@@ -8,6 +8,10 @@ extern void xen_send_IPI_allbutself(int vector);
 extern void xen_send_IPI_all(int vector);
 extern void xen_send_IPI_self(int vector);
 
+#ifdef CONFIG_X86_32
+extern void hvmlite_smp_32(void);
+#endif
+
 #ifdef CONFIG_XEN_PVH
 extern void xen_pvh_early_cpu_init(int cpu, bool entry);
 #else
diff --git a/arch/x86/xen/xen-hvmlite.S b/arch/x86/xen/xen-hvmlite.S
index fc7c08c..805e6a0 100644
--- a/arch/x86/xen/xen-hvmlite.S
+++ b/arch/x86/xen/xen-hvmlite.S
@@ -144,6 +144,13 @@ ENTRY(hvmlite_start_xen)
 	ljmp    $0x10, $_pa(startup_32)
 #endif
 
+#ifdef CONFIG_X86_32
+ENTRY(hvmlite_smp_32)
+        mov $_pa(boot_gdt_descr), %eax
+        lgdt (%eax)
+        jmp startup_32_smp
+#endif
+
 	.data
 gdt:
 	.word	gdt_end - gdt
-- 
1.7.1

[toc] | [next] | [standalone]

#1324246 — Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

FromDavid Vrabel <david.vrabel@citrix.com>
Date2016-02-02 17:30 +0100
SubjectRe: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs
Message-ID<qXM01-5FW-5@gated-at.bofh.it>
In reply to#1323243
This needs some more description in the commit message.

> --- a/arch/x86/xen/smp.c
> +++ b/arch/x86/xen/smp.c
[...]
> +		hctxt->cpu_regs.x86_32.cs_base = 0;
> +		hctxt->cpu_regs.x86_32.cs_limit = ~0u;
> +		hctxt->cpu_regs.x86_32.cs_ar = 0xc9b;
> +		hctxt->cpu_regs.x86_32.ds_base = 0;
> +		hctxt->cpu_regs.x86_32.ds_limit = ~0u;
> +		hctxt->cpu_regs.x86_32.ds_ar = 0xc93;
> +		hctxt->cpu_regs.x86_32.es_base = 0;
> +		hctxt->cpu_regs.x86_32.es_limit = ~0u;
> +		hctxt->cpu_regs.x86_32.es_ar = 0xc93;
> +		hctxt->cpu_regs.x86_32.ss_base = 0;
> +		hctxt->cpu_regs.x86_32.ss_limit = ~0u;
> +		hctxt->cpu_regs.x86_32.ss_ar = 0xc93;
> +		hctxt->cpu_regs.x86_32.tr_base = 0;
> +		hctxt->cpu_regs.x86_32.tr_limit = 0xff;
> +		hctxt->cpu_regs.x86_32.tr_ar = 0x8b;

Lots of hard-coded values here.  Should this be #defined somewhere?

David

[toc] | [prev] | [next] | [standalone]

#1324277 — Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

FromBoris Ostrovsky <boris.ostrovsky@oracle.com>
Date2016-02-02 18:00 +0100
SubjectRe: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs
Message-ID<qXMt5-5Rl-7@gated-at.bofh.it>
In reply to#1324246
On 02/02/2016 11:21 AM, David Vrabel wrote:
> This needs some more description in the commit message.
>
>> --- a/arch/x86/xen/smp.c
>> +++ b/arch/x86/xen/smp.c
> [...]
>> +		hctxt->cpu_regs.x86_32.cs_base = 0;
>> +		hctxt->cpu_regs.x86_32.cs_limit = ~0u;
>> +		hctxt->cpu_regs.x86_32.cs_ar = 0xc9b;
>> +		hctxt->cpu_regs.x86_32.ds_base = 0;
>> +		hctxt->cpu_regs.x86_32.ds_limit = ~0u;
>> +		hctxt->cpu_regs.x86_32.ds_ar = 0xc93;
>> +		hctxt->cpu_regs.x86_32.es_base = 0;
>> +		hctxt->cpu_regs.x86_32.es_limit = ~0u;
>> +		hctxt->cpu_regs.x86_32.es_ar = 0xc93;
>> +		hctxt->cpu_regs.x86_32.ss_base = 0;
>> +		hctxt->cpu_regs.x86_32.ss_limit = ~0u;
>> +		hctxt->cpu_regs.x86_32.ss_ar = 0xc93;
>> +		hctxt->cpu_regs.x86_32.tr_base = 0;
>> +		hctxt->cpu_regs.x86_32.tr_limit = 0xff;
>> +		hctxt->cpu_regs.x86_32.tr_ar = 0x8b;
> Lots of hard-coded values here.  Should this be #defined somewhere?

We also don't need to set bases to zero since hctxt is kzalloc'd. I'll 
remove that and add a comment.

As for macros --- I couldn't find the bits defined symbolically anywhere 
and since this is the only place this is used the macros would be local 
here.

-boris

[toc] | [prev] | [next] | [standalone]

#1326550 — Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

FromDavid Vrabel <david.vrabel@citrix.com>
Date2016-02-04 11:10 +0100
SubjectRe: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs
Message-ID<qYp1o-7ay-23@gated-at.bofh.it>
In reply to#1324277
On 02/02/16 16:58, Boris Ostrovsky wrote:
> On 02/02/2016 11:21 AM, David Vrabel wrote:
>> This needs some more description in the commit message.
>>
>>> --- a/arch/x86/xen/smp.c
>>> +++ b/arch/x86/xen/smp.c
>> [...]
>>> +        hctxt->cpu_regs.x86_32.cs_base = 0;
>>> +        hctxt->cpu_regs.x86_32.cs_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.cs_ar = 0xc9b;
>>> +        hctxt->cpu_regs.x86_32.ds_base = 0;
>>> +        hctxt->cpu_regs.x86_32.ds_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.ds_ar = 0xc93;
>>> +        hctxt->cpu_regs.x86_32.es_base = 0;
>>> +        hctxt->cpu_regs.x86_32.es_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.es_ar = 0xc93;
>>> +        hctxt->cpu_regs.x86_32.ss_base = 0;
>>> +        hctxt->cpu_regs.x86_32.ss_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.ss_ar = 0xc93;
>>> +        hctxt->cpu_regs.x86_32.tr_base = 0;
>>> +        hctxt->cpu_regs.x86_32.tr_limit = 0xff;
>>> +        hctxt->cpu_regs.x86_32.tr_ar = 0x8b;
>> Lots of hard-coded values here.  Should this be #defined somewhere?
> 
> We also don't need to set bases to zero since hctxt is kzalloc'd. I'll
> remove that and add a comment.
> 
> As for macros --- I couldn't find the bits defined symbolically anywhere
> and since this is the only place this is used the macros would be local
> here.

Ok.

David

[toc] | [prev] | [next] | [standalone]

#1326761 — Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

FromDoug Goldstein <cardoe@cardoe.com>
Date2016-02-04 14:00 +0100
SubjectRe: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs
Message-ID<qYrFU-jS-3@gated-at.bofh.it>
In reply to#1324277

[Multipart message — attachments visible in raw view] — view raw

On 2/2/16 10:58 AM, Boris Ostrovsky wrote:
> On 02/02/2016 11:21 AM, David Vrabel wrote:
>> This needs some more description in the commit message.
>>
>>> --- a/arch/x86/xen/smp.c
>>> +++ b/arch/x86/xen/smp.c
>> [...]
>>> +        hctxt->cpu_regs.x86_32.cs_base = 0;
>>> +        hctxt->cpu_regs.x86_32.cs_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.cs_ar = 0xc9b;
>>> +        hctxt->cpu_regs.x86_32.ds_base = 0;
>>> +        hctxt->cpu_regs.x86_32.ds_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.ds_ar = 0xc93;
>>> +        hctxt->cpu_regs.x86_32.es_base = 0;
>>> +        hctxt->cpu_regs.x86_32.es_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.es_ar = 0xc93;
>>> +        hctxt->cpu_regs.x86_32.ss_base = 0;
>>> +        hctxt->cpu_regs.x86_32.ss_limit = ~0u;
>>> +        hctxt->cpu_regs.x86_32.ss_ar = 0xc93;
>>> +        hctxt->cpu_regs.x86_32.tr_base = 0;
>>> +        hctxt->cpu_regs.x86_32.tr_limit = 0xff;
>>> +        hctxt->cpu_regs.x86_32.tr_ar = 0x8b;
>> Lots of hard-coded values here.  Should this be #defined somewhere?
> 
> We also don't need to set bases to zero since hctxt is kzalloc'd. I'll
> remove that and add a comment.
> 
> As for macros --- I couldn't find the bits defined symbolically anywhere
> and since this is the only place this is used the macros would be local
> here.
> 
> -boris
> 

It could be useful to have them defined locally if only to give them
some more meaning by having a name rather than 0x8b. Just a thought.

-- 
Doug Goldstein

[toc] | [prev] | [next] | [standalone]

#1327113 — Re: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs

FromBoris Ostrovsky <boris.ostrovsky@oracle.com>
Date2016-02-04 20:10 +0100
SubjectRe: [Xen-devel] [PATCH v2 07/11] xen/hvmlite: Initialize context for secondary VCPUs
Message-ID<qYxrX-69y-1@gated-at.bofh.it>
In reply to#1326761
On 02/04/2016 07:58 AM, Doug Goldstein wrote:
> On 2/2/16 10:58 AM, Boris Ostrovsky wrote:
>> On 02/02/2016 11:21 AM, David Vrabel wrote:
>>> This needs some more description in the commit message.
>>>
>>>> --- a/arch/x86/xen/smp.c
>>>> +++ b/arch/x86/xen/smp.c
>>> [...]
>>>> +        hctxt->cpu_regs.x86_32.cs_base = 0;
>>>> +        hctxt->cpu_regs.x86_32.cs_limit = ~0u;
>>>> +        hctxt->cpu_regs.x86_32.cs_ar = 0xc9b;
>>>> +        hctxt->cpu_regs.x86_32.ds_base = 0;
>>>> +        hctxt->cpu_regs.x86_32.ds_limit = ~0u;
>>>> +        hctxt->cpu_regs.x86_32.ds_ar = 0xc93;
>>>> +        hctxt->cpu_regs.x86_32.es_base = 0;
>>>> +        hctxt->cpu_regs.x86_32.es_limit = ~0u;
>>>> +        hctxt->cpu_regs.x86_32.es_ar = 0xc93;
>>>> +        hctxt->cpu_regs.x86_32.ss_base = 0;
>>>> +        hctxt->cpu_regs.x86_32.ss_limit = ~0u;
>>>> +        hctxt->cpu_regs.x86_32.ss_ar = 0xc93;
>>>> +        hctxt->cpu_regs.x86_32.tr_base = 0;
>>>> +        hctxt->cpu_regs.x86_32.tr_limit = 0xff;
>>>> +        hctxt->cpu_regs.x86_32.tr_ar = 0x8b;
>>> Lots of hard-coded values here.  Should this be #defined somewhere?
>> We also don't need to set bases to zero since hctxt is kzalloc'd. I'll
>> remove that and add a comment.
>>
>> As for macros --- I couldn't find the bits defined symbolically anywhere
>> and since this is the only place this is used the macros would be local
>> here.
>>
>> -boris
>>
> It could be useful to have them defined locally if only to give them
> some more meaning by having a name rather than 0x8b. Just a thought.

Yes, I'll do that (or at least have a comment explaining the bits).

Looks like this we should wait with this series though until we figure 
out APIC emulation status.

-boris

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web