Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752571AbdCBSut (ORCPT ); Thu, 2 Mar 2017 13:50:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28822 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751256AbdCBSur (ORCPT ); Thu, 2 Mar 2017 13:50:47 -0500 From: Vitaly Kuznetsov To: xen-devel@lists.xenproject.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Boris Ostrovsky , Juergen Gross , Andrew Jones Subject: [PATCH v2 09/21] x86/xen: split xen_cpu_die() Date: Thu, 2 Mar 2017 18:53:45 +0100 Message-Id: <20170302175357.8222-10-vkuznets@redhat.com> In-Reply-To: <20170302175357.8222-1-vkuznets@redhat.com> References: <20170302175357.8222-1-vkuznets@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 02 Mar 2017 17:54:17 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2115 Lines: 76 Split xen_cpu_die() into xen_pv_cpu_die() and xen_hvm_cpu_die() to support further splitting of smp.c. Signed-off-by: Vitaly Kuznetsov --- arch/x86/xen/smp.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 6c8a3a5..6c4b415 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c @@ -513,10 +513,10 @@ static int xen_cpu_disable(void) return 0; } -static void xen_cpu_die(unsigned int cpu) +static void xen_pv_cpu_die(unsigned int cpu) { - while (xen_pv_domain() && HYPERVISOR_vcpu_op(VCPUOP_is_up, - xen_vcpu_nr(cpu), NULL)) { + while (HYPERVISOR_vcpu_op(VCPUOP_is_up, + xen_vcpu_nr(cpu), NULL)) { __set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(HZ/10); } @@ -529,6 +529,15 @@ static void xen_cpu_die(unsigned int cpu) } } +static void xen_hvm_cpu_die(unsigned int cpu) +{ + if (common_cpu_die(cpu) == 0) { + xen_smp_intr_free(cpu); + xen_uninit_lock_cpu(cpu); + xen_teardown_timer(cpu); + } +} + static void xen_play_dead(void) /* used only with HOTPLUG_CPU */ { play_dead_common(); @@ -551,7 +560,12 @@ static int xen_cpu_disable(void) return -ENOSYS; } -static void xen_cpu_die(unsigned int cpu) +static void xen_pv_cpu_die(unsigned int cpu) +{ + BUG(); +} + +static void xen_hvm_cpu_die(unsigned int cpu) { BUG(); } @@ -732,7 +746,7 @@ static const struct smp_ops xen_smp_ops __initconst = { .smp_cpus_done = xen_smp_cpus_done, .cpu_up = xen_cpu_up, - .cpu_die = xen_cpu_die, + .cpu_die = xen_pv_cpu_die, .cpu_disable = xen_cpu_disable, .play_dead = xen_play_dead, @@ -761,7 +775,7 @@ void __init xen_hvm_smp_init(void) { smp_ops.smp_prepare_cpus = xen_hvm_smp_prepare_cpus; smp_ops.smp_send_reschedule = xen_smp_send_reschedule; - smp_ops.cpu_die = xen_cpu_die; + smp_ops.cpu_die = xen_hvm_cpu_die; smp_ops.send_call_func_ipi = xen_smp_send_call_function_ipi; smp_ops.send_call_func_single_ipi = xen_smp_send_call_function_single_ipi; smp_ops.smp_prepare_boot_cpu = xen_hvm_smp_prepare_boot_cpu; -- 2.9.3