From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Boris Ostrovsky <boris.ostrovsky@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,
david.vrabel@citrix.com, jbeulich@suse.com,
xen-devel@lists.xenproject.org, ian.jackson@eu.citrix.com,
roger.pau@citrix.com
Subject: Re: [PATCH v2 5/6] xen/x86/pvh: Add 32-bit PVH initialization code
Date: Fri, 17 Jul 2015 11:21:36 -0400 [thread overview]
Message-ID: <20150717152136.GC18085__12345.4632507221$1437146576$gmane$org@l.oracle.com> (raw)
In-Reply-To: <1437083021-24488-6-git-send-email-boris.ostrovsky@oracle.com>
On Thu, Jul 16, 2015 at 05:43:40PM -0400, Boris Ostrovsky wrote:
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> ---
> Changes in v2:
> * Some code reshuffling due to changes in patch 1.
>
> arch/x86/xen/enlighten.c | 4 ----
> arch/x86/xen/smp.c | 16 +++++++++-------
> arch/x86/xen/xen-head.S | 13 ++++++++++++-
> 3 files changed, 21 insertions(+), 12 deletions(-)
>
> diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
> index d665b1d..9eb395f 100644
> --- a/arch/x86/xen/enlighten.c
> +++ b/arch/x86/xen/enlighten.c
> @@ -1461,10 +1461,6 @@ static void __init xen_pvh_early_guest_init(void)
>
> xen_pvh_early_cpu_init(0);
> xen_pvh_set_cr_flags(0);
> -
> -#ifdef CONFIG_X86_32
> - BUG(); /* PVH: Implement proper support. */
> -#endif
> }
> #endif /* CONFIG_XEN_PVH */
>
> diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
> index 33a4529..f8c5d23 100644
> --- a/arch/x86/xen/smp.c
> +++ b/arch/x86/xen/smp.c
> @@ -372,11 +372,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
>
> gdt = get_cpu_gdt_table(cpu);
>
> -#ifdef CONFIG_X86_32
> - /* Note: PVH is not yet supported on x86_32. */
> - ctxt->user_regs.fs = __KERNEL_PERCPU;
> - ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
> -#endif
> + ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);
> + ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(swapper_pg_dir));
>
> if (!xen_feature(XENFEAT_auto_translated_physmap)) {
> ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
> @@ -403,6 +400,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
> ctxt->kernel_sp = idle->thread.sp0;
>
> #ifdef CONFIG_X86_32
> + ctxt->user_regs.fs = __KERNEL_PERCPU;
> + ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
> ctxt->event_callback_cs = __KERNEL_CS;
> ctxt->failsafe_callback_cs = __KERNEL_CS;
> #else
> @@ -424,11 +423,14 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
> */
> ctxt->user_regs.eip =
> (unsigned long)xen_pvh_early_cpu_init_secondary;
> +#ifdef CONFIG_X86_64
> ctxt->user_regs.rdi = cpu;
> +#else
> + *((uint32_t *)ctxt->user_regs.esp + 1) = cpu;
> +#endif
> }
> #endif
> - ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs);
> - ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_mfn(swapper_pg_dir));
> +
> if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt))
> BUG();
>
> diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
> index 944b08b..eada11b 100644
> --- a/arch/x86/xen/xen-head.S
> +++ b/arch/x86/xen/xen-head.S
> @@ -55,7 +55,11 @@ ENTRY(startup_xen)
> * @cpu: this cpu number (%rdi)
> */
> ENTRY(xen_pvh_early_cpu_init)
> +#ifdef CONFIG_X86_64
> mov %rbx, -8(%rsp)
> +#else
> + mov %ebx, -4(%esp)
> +#endif
> xor %esi, %esi
> jmp 1f
>
> @@ -70,13 +74,20 @@ ENTRY(xen_pvh_early_cpu_init_secondary)
>
> mov $MSR_EFER, %ecx
> rdmsr
> +#ifdef CONFIG_X86_64
> bts $_EFER_SCE, %eax
> -
> +#endif
> bt $20, %ebx
> jnc 2f /* No NX, skip setting it */
> bts $_EFER_NX, %eax
> 2: wrmsr
> +
> +#ifdef CONFIG_X86_64
> mov -8(%rsp), %rbx
> +#else
> + mov -4(%esp), %ebx
> +#endif
> +
> #ifdef CONFIG_SMP
> cmp $0, %esi
> jne cpu_bringup_and_idle
> --
> 1.8.1.4
>
prev parent reply other threads:[~2015-07-17 15:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-16 21:43 [PATCH v2 0/6] 32-bit PVH domU support Boris Ostrovsky
2015-07-16 21:43 ` [PATCH v2 1/6] xen/x86/pvh: Save %rbx in xen_pvh_early_cpu_init() Boris Ostrovsky
2015-07-16 21:43 ` [PATCH v2 2/6] xen/x86: Remove unnecessary memset() call Boris Ostrovsky
2015-07-16 21:43 ` [PATCH v2 3/6] xen/x86/pvh: Properly set page tables for 32-bit PVH guests Boris Ostrovsky
2015-07-16 21:43 ` [PATCH v2 4/6] xen/x86/pvh: Set up descriptors " Boris Ostrovsky
2015-07-17 15:21 ` Konrad Rzeszutek Wilk
[not found] ` <20150717152113.GB18085@l.oracle.com>
2015-07-17 15:36 ` Boris Ostrovsky
[not found] ` <55A920FD.6050101@oracle.com>
2015-07-17 16:43 ` Konrad Rzeszutek Wilk
[not found] ` <20150717164331.GA19827@l.oracle.com>
2015-07-17 17:52 ` Boris Ostrovsky
[not found] ` <55A940CC.6090509@oracle.com>
2015-07-21 15:32 ` Boris Ostrovsky
2015-07-16 21:43 ` [PATCH v2 5/6] xen/x86/pvh: Add 32-bit PVH initialization code Boris Ostrovsky
2015-07-16 21:43 ` [PATCH v2 6/6] xen/x86/pvh: Allow building 32-bit PVH guests Boris Ostrovsky
[not found] ` <1437083021-24488-2-git-send-email-boris.ostrovsky@oracle.com>
2015-07-17 15:09 ` [PATCH v2 1/6] xen/x86/pvh: Save %rbx in xen_pvh_early_cpu_init() Konrad Rzeszutek Wilk
[not found] ` <1437083021-24488-6-git-send-email-boris.ostrovsky@oracle.com>
2015-07-17 15:21 ` Konrad Rzeszutek Wilk [this message]
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='20150717152136.GC18085__12345.4632507221$1437146576$gmane$org@l.oracle.com' \
--to=konrad.wilk@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.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=linux-kernel@vger.kernel.org \
--cc=roger.pau@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--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;
as well as URLs for NNTP newsgroup(s).