From patchwork Fri Jan 22 21:35:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 8093391 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E2FCFBEEE5 for ; Fri, 22 Jan 2016 21:38:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 046E7205B1 for ; Fri, 22 Jan 2016 21:38:38 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 123C720595 for ; Fri, 22 Jan 2016 21:38:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aMjNk-0004Mn-3I; Fri, 22 Jan 2016 21:36:36 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aMjNh-0004EX-B3 for xen-devel@lists.xenproject.org; Fri, 22 Jan 2016 21:36:33 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 58/C4-09708-1E0A2A65; Fri, 22 Jan 2016 21:36:33 +0000 X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1453498591!11219532!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 16487 invoked from network); 22 Jan 2016 21:36:32 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-3.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Jan 2016 21:36:32 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u0MLaToP017401 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 22 Jan 2016 21:36:30 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u0MLaTxR007328 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Fri, 22 Jan 2016 21:36:29 GMT Received: from abhmp0002.oracle.com (abhmp0002.oracle.com [141.146.116.8]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u0MLaTic001158; Fri, 22 Jan 2016 21:36:29 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 22 Jan 2016 13:36:28 -0800 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Date: Fri, 22 Jan 2016 16:35:58 -0500 Message-Id: <1453498558-6028-13-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> References: <1453498558-6028-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: Boris Ostrovsky , xen-devel@lists.xenproject.org, mcgrof@suse.com, linux-kernel@vger.kernel.org, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v1 12/12] xen/hvmlite: Enable CPU on-/offlining X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When offlining, we should properly clean up interrupts and wait until hypervisor declares VCPU as down before cleaning up. After VCPU that was previously offlined is brought back to life we want to jump back to bare-metal entry points. It's a simple jump on 64-bit but requires minor tweaking for 32-bit case. Signed-off-by: Boris Ostrovsky --- arch/x86/xen/smp.c | 35 +++++++++++++++++++++++++---------- arch/x86/xen/xen-hvmlite.S | 8 ++++++++ 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index fbad829..7e96a23 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -143,7 +143,7 @@ static void xen_smp_intr_free(unsigned int cpu) kfree(per_cpu(xen_callfuncsingle_irq, cpu).name); per_cpu(xen_callfuncsingle_irq, cpu).name = NULL; } - if (xen_hvm_domain()) + if (xen_hvm_domain() && !xen_hvmlite) return; if (per_cpu(xen_irq_work, cpu).irq >= 0) { @@ -585,7 +585,8 @@ static int xen_cpu_disable(void) static void xen_cpu_die(unsigned int cpu) { - while (xen_pv_domain() && HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) { + while ((xen_pv_domain() || xen_hvmlite) && + HYPERVISOR_vcpu_op(VCPUOP_is_up, cpu, NULL)) { __set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ/10); } @@ -602,14 +603,28 @@ static void xen_play_dead(void) /* used only with HOTPLUG_CPU */ { play_dead_common(); HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL); - cpu_bringup(); - /* - * commit 4b0c0f294 (tick: Cleanup NOHZ per cpu data on cpu down) - * clears certain data that the cpu_idle loop (which called us - * and that we return from) expects. The only way to get that - * data back is to call: - */ - tick_nohz_idle_enter(); + + if (!xen_hvm_domain()) { + cpu_bringup(); + /* + * commit 4b0c0f294 (tick: Cleanup NOHZ per cpu data on cpu + * down) clears certain data that the cpu_idle loop (which + * called us and that we return from) expects. The only way to + * get that data back is to call: + */ + tick_nohz_idle_enter(); + } else { + /* + * For 64-bit we can jump directly to SMP entry point but for + * 32-bit we need to disable paging and load boot GDT (just + * like in cpu_initialize_context()). + */ +#ifdef CONFIG_X86_64 + asm("jmp secondary_startup_64"); +#else + asm("jmp hvmlite_smp_32_hp"); +#endif + } } #else /* !CONFIG_HOTPLUG_CPU */ diff --git a/arch/x86/xen/xen-hvmlite.S b/arch/x86/xen/xen-hvmlite.S index 8d6a642..4edd6ef 100644 --- a/arch/x86/xen/xen-hvmlite.S +++ b/arch/x86/xen/xen-hvmlite.S @@ -135,6 +135,14 @@ ENTRY(hvmlite_start_xen) #endif #ifdef CONFIG_X86_32 +ENTRY(hvmlite_smp_32_hp) + movl $_pa(initial_page_table), %eax + movl %eax, %cr3 + ljmp $__KERNEL_CS,$_pa(5f) +5: + movl $X86_CR0_PE, %eax + movl %eax, %cr0 + ENTRY(hvmlite_smp_32) mov $_pa(boot_gdt_descr), %eax lgdt (%eax)