From: Boris Ostrovsky <boris.ostrovsky@oracle.com> To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, roger.pau@citrix.com, mcgrof@suse.com, Boris Ostrovsky <boris.ostrovsky@oracle.com> Subject: [PATCH v1 07/12] xen/hvmlite: Prepare cpu_initialize_context() routine for HVMlite SMP Date: Fri, 22 Jan 2016 16:35:53 -0500 [thread overview] Message-ID: <1453498558-6028-8-git-send-email-boris.ostrovsky@oracle.com> (raw) In-Reply-To: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> Subsequent patch will add support for starting secondary VCPUs in HVMlite guest. This patch exists to make review easier. No functional changes (except for introduction of 'if (!xen_hvmlite)'). Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- arch/x86/xen/smp.c | 104 ++++++++++++++++++++++++++++----------------------- 1 files changed, 57 insertions(+), 47 deletions(-) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 3f4ebf0..5fc4afb 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -390,70 +390,80 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) if (cpumask_test_and_set_cpu(cpu, xen_cpu_initialized_map)) return 0; - ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); - if (ctxt == NULL) - return -ENOMEM; + if (!xen_hvmlite) { - gdt = get_cpu_gdt_table(cpu); + ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); + if (ctxt == NULL) + return -ENOMEM; + + 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; + /* Note: PVH is not yet supported on x86_32. */ + ctxt->user_regs.fs = __KERNEL_PERCPU; + ctxt->user_regs.gs = __KERNEL_STACK_CANARY; #endif - memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt)); + memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt)); - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle; - ctxt->flags = VGCF_IN_KERNEL; - ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ - ctxt->user_regs.ds = __USER_DS; - ctxt->user_regs.es = __USER_DS; - ctxt->user_regs.ss = __KERNEL_DS; + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + ctxt->user_regs.eip = + (unsigned long)cpu_bringup_and_idle; + ctxt->flags = VGCF_IN_KERNEL; + ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ + ctxt->user_regs.ds = __USER_DS; + ctxt->user_regs.es = __USER_DS; + ctxt->user_regs.ss = __KERNEL_DS; - xen_copy_trap_info(ctxt->trap_ctxt); + xen_copy_trap_info(ctxt->trap_ctxt); - ctxt->ldt_ents = 0; + ctxt->ldt_ents = 0; - BUG_ON((unsigned long)gdt & ~PAGE_MASK); + BUG_ON((unsigned long)gdt & ~PAGE_MASK); - gdt_mfn = arbitrary_virt_to_mfn(gdt); - make_lowmem_page_readonly(gdt); - make_lowmem_page_readonly(mfn_to_virt(gdt_mfn)); + gdt_mfn = arbitrary_virt_to_mfn(gdt); + make_lowmem_page_readonly(gdt); + make_lowmem_page_readonly(mfn_to_virt(gdt_mfn)); - ctxt->gdt_frames[0] = gdt_mfn; - ctxt->gdt_ents = GDT_ENTRIES; + ctxt->gdt_frames[0] = gdt_mfn; + ctxt->gdt_ents = GDT_ENTRIES; - ctxt->kernel_ss = __KERNEL_DS; - ctxt->kernel_sp = idle->thread.sp0; + ctxt->kernel_ss = __KERNEL_DS; + ctxt->kernel_sp = idle->thread.sp0; #ifdef CONFIG_X86_32 - ctxt->event_callback_cs = __KERNEL_CS; - ctxt->failsafe_callback_cs = __KERNEL_CS; + ctxt->event_callback_cs = __KERNEL_CS; + ctxt->failsafe_callback_cs = __KERNEL_CS; #else - ctxt->gs_base_kernel = per_cpu_offset(cpu); + ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif - ctxt->event_callback_eip = - (unsigned long)xen_hypervisor_callback; - ctxt->failsafe_callback_eip = - (unsigned long)xen_failsafe_callback; - ctxt->user_regs.cs = __KERNEL_CS; - per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir); - } + ctxt->event_callback_eip = + (unsigned long)xen_hypervisor_callback; + ctxt->failsafe_callback_eip = + (unsigned long)xen_failsafe_callback; + ctxt->user_regs.cs = __KERNEL_CS; + per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir); + } #ifdef CONFIG_XEN_PVH - else { - /* - * The vcpu comes on kernel page tables which have the NX pte - * bit set. This means before DS/SS is touched, NX in - * EFER must be set. Hence the following assembly glue code. - */ - ctxt->user_regs.eip = (unsigned long)xen_pvh_early_cpu_init; - ctxt->user_regs.rdi = cpu; - ctxt->user_regs.rsi = true; /* entry == true */ - } + else { + /* + * The vcpu comes on kernel page tables which have the + * NX pte bit set. This means before DS/SS is touched, + * NX in EFER must be set. Hence the following assembly + * glue code. + */ + ctxt->user_regs.eip = + (unsigned long)xen_pvh_early_cpu_init; + ctxt->user_regs.rdi = cpu; + ctxt->user_regs.rsi = true; /* entry == true */ + } #endif - ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs); - ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_gfn(swapper_pg_dir)); + 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(); + } + if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt)) BUG(); -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Boris Ostrovsky <boris.ostrovsky@oracle.com> To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>, xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com Subject: [PATCH v1 07/12] xen/hvmlite: Prepare cpu_initialize_context() routine for HVMlite SMP Date: Fri, 22 Jan 2016 16:35:53 -0500 [thread overview] Message-ID: <1453498558-6028-8-git-send-email-boris.ostrovsky@oracle.com> (raw) In-Reply-To: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> Subsequent patch will add support for starting secondary VCPUs in HVMlite guest. This patch exists to make review easier. No functional changes (except for introduction of 'if (!xen_hvmlite)'). Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> --- arch/x86/xen/smp.c | 104 ++++++++++++++++++++++++++++----------------------- 1 files changed, 57 insertions(+), 47 deletions(-) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 3f4ebf0..5fc4afb 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -390,70 +390,80 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) if (cpumask_test_and_set_cpu(cpu, xen_cpu_initialized_map)) return 0; - ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); - if (ctxt == NULL) - return -ENOMEM; + if (!xen_hvmlite) { - gdt = get_cpu_gdt_table(cpu); + ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); + if (ctxt == NULL) + return -ENOMEM; + + 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; + /* Note: PVH is not yet supported on x86_32. */ + ctxt->user_regs.fs = __KERNEL_PERCPU; + ctxt->user_regs.gs = __KERNEL_STACK_CANARY; #endif - memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt)); + memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt)); - if (!xen_feature(XENFEAT_auto_translated_physmap)) { - ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle; - ctxt->flags = VGCF_IN_KERNEL; - ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ - ctxt->user_regs.ds = __USER_DS; - ctxt->user_regs.es = __USER_DS; - ctxt->user_regs.ss = __KERNEL_DS; + if (!xen_feature(XENFEAT_auto_translated_physmap)) { + ctxt->user_regs.eip = + (unsigned long)cpu_bringup_and_idle; + ctxt->flags = VGCF_IN_KERNEL; + ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ + ctxt->user_regs.ds = __USER_DS; + ctxt->user_regs.es = __USER_DS; + ctxt->user_regs.ss = __KERNEL_DS; - xen_copy_trap_info(ctxt->trap_ctxt); + xen_copy_trap_info(ctxt->trap_ctxt); - ctxt->ldt_ents = 0; + ctxt->ldt_ents = 0; - BUG_ON((unsigned long)gdt & ~PAGE_MASK); + BUG_ON((unsigned long)gdt & ~PAGE_MASK); - gdt_mfn = arbitrary_virt_to_mfn(gdt); - make_lowmem_page_readonly(gdt); - make_lowmem_page_readonly(mfn_to_virt(gdt_mfn)); + gdt_mfn = arbitrary_virt_to_mfn(gdt); + make_lowmem_page_readonly(gdt); + make_lowmem_page_readonly(mfn_to_virt(gdt_mfn)); - ctxt->gdt_frames[0] = gdt_mfn; - ctxt->gdt_ents = GDT_ENTRIES; + ctxt->gdt_frames[0] = gdt_mfn; + ctxt->gdt_ents = GDT_ENTRIES; - ctxt->kernel_ss = __KERNEL_DS; - ctxt->kernel_sp = idle->thread.sp0; + ctxt->kernel_ss = __KERNEL_DS; + ctxt->kernel_sp = idle->thread.sp0; #ifdef CONFIG_X86_32 - ctxt->event_callback_cs = __KERNEL_CS; - ctxt->failsafe_callback_cs = __KERNEL_CS; + ctxt->event_callback_cs = __KERNEL_CS; + ctxt->failsafe_callback_cs = __KERNEL_CS; #else - ctxt->gs_base_kernel = per_cpu_offset(cpu); + ctxt->gs_base_kernel = per_cpu_offset(cpu); #endif - ctxt->event_callback_eip = - (unsigned long)xen_hypervisor_callback; - ctxt->failsafe_callback_eip = - (unsigned long)xen_failsafe_callback; - ctxt->user_regs.cs = __KERNEL_CS; - per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir); - } + ctxt->event_callback_eip = + (unsigned long)xen_hypervisor_callback; + ctxt->failsafe_callback_eip = + (unsigned long)xen_failsafe_callback; + ctxt->user_regs.cs = __KERNEL_CS; + per_cpu(xen_cr3, cpu) = __pa(swapper_pg_dir); + } #ifdef CONFIG_XEN_PVH - else { - /* - * The vcpu comes on kernel page tables which have the NX pte - * bit set. This means before DS/SS is touched, NX in - * EFER must be set. Hence the following assembly glue code. - */ - ctxt->user_regs.eip = (unsigned long)xen_pvh_early_cpu_init; - ctxt->user_regs.rdi = cpu; - ctxt->user_regs.rsi = true; /* entry == true */ - } + else { + /* + * The vcpu comes on kernel page tables which have the + * NX pte bit set. This means before DS/SS is touched, + * NX in EFER must be set. Hence the following assembly + * glue code. + */ + ctxt->user_regs.eip = + (unsigned long)xen_pvh_early_cpu_init; + ctxt->user_regs.rdi = cpu; + ctxt->user_regs.rsi = true; /* entry == true */ + } #endif - ctxt->user_regs.esp = idle->thread.sp0 - sizeof(struct pt_regs); - ctxt->ctrlreg[3] = xen_pfn_to_cr3(virt_to_gfn(swapper_pg_dir)); + 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(); + } + if (HYPERVISOR_vcpu_op(VCPUOP_initialise, cpu, ctxt)) BUG(); -- 1.7.1
next prev parent reply other threads:[~2016-01-22 21:38 UTC|newest] Thread overview: 121+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-22 21:35 [PATCH v1 00/12] HVMlite domU support Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 01/12] x86/smp: Make start_secondary() and initial_pg_pmd visible globally Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-25 10:53 ` David Vrabel 2016-01-25 10:53 ` David Vrabel 2016-01-25 15:30 ` Boris Ostrovsky 2016-01-25 15:30 ` Boris Ostrovsky 2016-01-26 21:58 ` Borislav Petkov 2016-01-26 21:58 ` Borislav Petkov 2016-01-22 21:35 ` [PATCH v1 02/12] xen/hvmlite: Factor out common kernel init code Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 23:01 ` Luis R. Rodriguez 2016-01-22 23:01 ` Luis R. Rodriguez 2016-01-22 23:12 ` Boris Ostrovsky 2016-01-22 23:27 ` Boris Ostrovsky 2016-01-22 23:27 ` Boris Ostrovsky 2016-01-22 23:41 ` Luis R. Rodriguez 2016-01-22 23:41 ` Luis R. Rodriguez 2016-01-22 23:12 ` Boris Ostrovsky 2016-01-25 11:04 ` David Vrabel 2016-01-25 11:04 ` [Xen-devel] " David Vrabel 2016-01-25 15:42 ` Boris Ostrovsky 2016-01-25 15:42 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 03/12] xen/hvmlite: Import hvmlite-related Xen public interfaces Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 04/12] xen/hvmlite: Bootstrap HVMlite guest Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 23:32 ` Luis R. Rodriguez 2016-01-22 23:32 ` Luis R. Rodriguez 2016-01-23 0:30 ` [Xen-devel] " Andrew Cooper 2016-01-23 0:30 ` Andrew Cooper 2016-01-23 0:45 ` [Xen-devel] " Luis R. Rodriguez 2016-01-23 0:45 ` Luis R. Rodriguez 2016-01-23 0:55 ` Luis R. Rodriguez 2016-01-23 0:55 ` [Xen-devel] " Luis R. Rodriguez 2016-01-23 14:49 ` Andrew Cooper 2016-01-23 14:49 ` [Xen-devel] " Andrew Cooper 2016-01-23 15:34 ` Konrad Rzeszutek Wilk 2016-01-23 15:34 ` Konrad Rzeszutek Wilk 2016-01-23 16:01 ` [Xen-devel] " H. Peter Anvin 2016-01-23 16:12 ` Konrad Rzeszutek Wilk 2016-01-23 16:12 ` Konrad Rzeszutek Wilk 2016-01-23 18:28 ` H. Peter Anvin 2016-01-23 18:28 ` [Xen-devel] " H. Peter Anvin 2016-01-25 10:30 ` Roger Pau Monné 2016-01-25 10:30 ` [Xen-devel] " Roger Pau Monné 2016-01-23 16:01 ` H. Peter Anvin 2016-01-25 22:19 ` Luis R. Rodriguez 2016-01-25 22:19 ` [Xen-devel] " Luis R. Rodriguez 2016-01-25 22:55 ` Boris Ostrovsky 2016-01-26 20:30 ` Luis R. Rodriguez 2016-01-26 20:30 ` [Xen-devel] " Luis R. Rodriguez 2016-01-26 21:51 ` Boris Ostrovsky 2016-01-26 21:51 ` [Xen-devel] " Boris Ostrovsky 2016-01-27 0:04 ` Luis R. Rodriguez 2016-01-27 0:04 ` [Xen-devel] " Luis R. Rodriguez 2016-01-27 2:16 ` Luis R. Rodriguez 2016-01-27 4:54 ` Luis R. Rodriguez 2016-01-27 14:42 ` Konrad Rzeszutek Wilk 2016-01-27 14:50 ` [Xen-devel] " David Vrabel 2016-01-27 15:06 ` Boris Ostrovsky 2016-01-27 15:09 ` David Vrabel 2016-01-27 15:09 ` [Xen-devel] " David Vrabel 2016-01-27 15:17 ` Boris Ostrovsky 2016-01-27 15:29 ` Konrad Rzeszutek Wilk 2016-01-27 16:15 ` Boris Ostrovsky 2016-01-27 16:15 ` [Xen-devel] " Boris Ostrovsky 2016-01-27 18:48 ` Luis R. Rodriguez 2016-01-27 18:48 ` [Xen-devel] " Luis R. Rodriguez 2016-01-27 19:00 ` Luis R. Rodriguez 2016-01-27 19:00 ` [Xen-devel] " Luis R. Rodriguez 2016-01-27 23:58 ` Boris Ostrovsky 2016-01-27 23:58 ` Boris Ostrovsky 2016-01-27 15:17 ` Boris Ostrovsky 2016-01-27 15:06 ` Boris Ostrovsky 2016-01-27 16:14 ` [Xen-devel] " Borislav Petkov 2016-01-27 16:14 ` Borislav Petkov 2016-01-27 14:50 ` David Vrabel 2016-01-27 2:16 ` Luis R. Rodriguez 2016-01-25 22:55 ` Boris Ostrovsky 2016-01-25 15:08 ` [Xen-devel] " Boris Ostrovsky 2016-01-25 15:08 ` Boris Ostrovsky 2016-01-25 16:08 ` Boris Ostrovsky 2016-01-25 21:12 ` Luis R. Rodriguez 2016-01-25 21:12 ` Luis R. Rodriguez 2016-01-25 21:21 ` H. Peter Anvin 2016-01-25 21:21 ` H. Peter Anvin 2016-01-25 22:28 ` Boris Ostrovsky 2016-01-26 18:34 ` Luis R. Rodriguez 2016-01-26 18:46 ` Andy Lutomirski 2016-01-26 19:00 ` Boris Ostrovsky 2016-01-26 19:00 ` Boris Ostrovsky 2016-01-26 19:14 ` [Xen-devel] " Luis R. Rodriguez 2016-01-26 19:14 ` Luis R. Rodriguez 2016-01-26 18:46 ` Andy Lutomirski 2016-01-26 18:34 ` Luis R. Rodriguez 2016-01-25 22:28 ` Boris Ostrovsky 2016-01-25 16:08 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 05/12] xen/hvmlite: Allow HVMlite guests delay initializing grant table Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 06/12] xen/hvmlite: Initialize PCI Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-25 10:21 ` Roger Pau Monné 2016-01-25 10:21 ` Roger Pau Monné 2016-01-22 21:35 ` Boris Ostrovsky [this message] 2016-01-22 21:35 ` [PATCH v1 07/12] xen/hvmlite: Prepare cpu_initialize_context() routine for HVMlite SMP Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 08/12] xen/hvmlite: Initialize context for secondary VCPUs Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 09/12] xen/hvmlite: Extend APIC operations for HVMlite guests Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 10/12] xen/hvmlite: Use x86's default timer init " Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 11/12] xen/hvmlite: Boot secondary CPUs Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-22 21:35 ` [PATCH v1 12/12] xen/hvmlite: Enable CPU on-/offlining Boris Ostrovsky 2016-01-22 21:35 ` Boris Ostrovsky 2016-01-25 10:51 ` [PATCH v1 00/12] HVMlite domU support David Vrabel 2016-01-25 15:25 ` Boris Ostrovsky 2016-01-25 15:25 ` Boris Ostrovsky 2016-01-25 10:51 ` 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=1453498558-6028-8-git-send-email-boris.ostrovsky@oracle.com \ --to=boris.ostrovsky@oracle.com \ --cc=david.vrabel@citrix.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mcgrof@suse.com \ --cc=roger.pau@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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.