Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759650AbcLAPej (ORCPT ); Thu, 1 Dec 2016 10:34:39 -0500 Received: from p3plsmtps2ded02.prod.phx3.secureserver.net ([208.109.80.59]:36298 "EHLO p3plsmtps2ded02.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759609AbcLAPeE (ORCPT ); Thu, 1 Dec 2016 10:34:04 -0500 x-originating-ip: 72.167.245.219 From: kys@exchange.microsoft.com To: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, devel@linuxdriverproject.org, olaf@aepfle.de, apw@canonical.com, vkuznets@redhat.com, jasowang@redhat.com, leann.ogasawara@canonical.com Cc: "K. Y. Srinivasan" Subject: [PATCH 10/15] hv: switch to cpuhp state machine for synic init/cleanup Date: Thu, 1 Dec 2016 09:28:47 -0800 Message-Id: <1480613332-7788-10-git-send-email-kys@exchange.microsoft.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1480613332-7788-1-git-send-email-kys@exchange.microsoft.com> References: <1480613287-7748-1-git-send-email-kys@exchange.microsoft.com> <1480613332-7788-1-git-send-email-kys@exchange.microsoft.com> Reply-To: kys@microsoft.com X-CMAE-Envelope: MS4wfJlQA39WECl7xP1HpNc6UJ3/cUksg30Txr2Uetvg95Is6oEX+CUB9GiPGwdnS6aNWeESOG1LVw6Fvg702MCvHI3+sg3fDJAWE9ickJEJTos0hIQ5ryJq RL9XY+V7hf1gOLrdNhZNAniG5O5Xqj/otPEA7DlHhBE+CM5L2M/x0jT63V7aiUl1JilJFR0rl1KgSGeIZ7kdV+jFbyMe5uv5nWMB0ixSpA64CUFbEAuJmwl4 V1JPGD9J5zpHxicFsvTk1TsQdQRHhA6Nu6eN58DG/Gk4LP99QicWFtz8hpHb5wr/oH+jnCoFIZguR+hXzG4oFOo3NqwH+5u2SfFFr2ZBEqQWIUPbJlETar7C LlfHlxmOtjpx6ABFUg0xiPRhEGdYNV6r3MWG0ARm8Tb9nazGgR29W0h1vl07/hSzjkKakURFZleW3Gh+SjavEKuRS5sDk2Iu+eWZwh+uy4Jw0z31RWA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4472 Lines: 159 From: Vitaly Kuznetsov To make it possible to online/offline CPUs switch to cpuhp infrastructure for doing hv_synic_init()/hv_synic_cleanup(). Signed-off-by: Vitaly Kuznetsov Signed-off-by: K. Y. Srinivasan --- drivers/hv/hv.c | 15 +++++++-------- drivers/hv/hyperv_vmbus.h | 4 ++-- drivers/hv/vmbus_drv.c | 19 +++++++++++-------- 3 files changed, 20 insertions(+), 18 deletions(-) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index c11393c..b3f6a1b 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -495,7 +495,7 @@ void hv_synic_free(void) * retrieve the initialized message and event pages. Otherwise, we create and * initialize the message and event pages. */ -void hv_synic_init(void *arg) +int hv_synic_init(unsigned int cpu) { u64 version; union hv_synic_simp simp; @@ -504,10 +504,8 @@ void hv_synic_init(void *arg) union hv_synic_scontrol sctrl; u64 vp_index; - int cpu = smp_processor_id(); - if (!hv_context.hypercall_page) - return; + return -EFAULT; /* Check the version */ rdmsrl(HV_X64_MSR_SVERSION, version); @@ -562,7 +560,7 @@ void hv_synic_init(void *arg) HV_TIMER_FREQUENCY, HV_MIN_DELTA_TICKS, HV_MAX_MAX_DELTA_TICKS); - return; + return 0; } /* @@ -582,16 +580,15 @@ void hv_synic_clockevents_cleanup(void) /* * hv_synic_cleanup - Cleanup routine for hv_synic_init(). */ -void hv_synic_cleanup(void *arg) +int hv_synic_cleanup(unsigned int cpu) { union hv_synic_sint shared_sint; union hv_synic_simp simp; union hv_synic_siefp siefp; union hv_synic_scontrol sctrl; - int cpu = smp_processor_id(); if (!hv_context.synic_initialized) - return; + return -EFAULT; /* Turn off clockevent device */ if (ms_hyperv.features & HV_X64_MSR_SYNTIMER_AVAILABLE) { @@ -623,4 +620,6 @@ void hv_synic_cleanup(void *arg) rdmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64); sctrl.enable = 0; wrmsrl(HV_X64_MSR_SCONTROL, sctrl.as_uint64); + + return 0; } diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 27982df..83beea7 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -505,9 +505,9 @@ extern int hv_post_message(union hv_connection_id connection_id, extern void hv_synic_free(void); -extern void hv_synic_init(void *irqarg); +extern int hv_synic_init(unsigned int cpu); -extern void hv_synic_cleanup(void *arg); +extern int hv_synic_cleanup(unsigned int cpu); extern void hv_synic_clockevents_cleanup(void); diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 1730ac0..cafd273 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -49,6 +49,7 @@ static struct completion probe_event; +static int hyperv_cpuhp_online; static void hyperv_report_panic(struct pt_regs *regs) { @@ -850,7 +851,12 @@ static int vmbus_bus_init(void) * Initialize the per-cpu interrupt state and * connect to the host. */ - on_each_cpu(hv_synic_init, NULL, 1); + ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/hyperv:online", + hv_synic_init, hv_synic_cleanup); + if (ret < 0) + goto err_alloc; + hyperv_cpuhp_online = ret; + ret = vmbus_connect(); if (ret) goto err_connect; @@ -872,7 +878,7 @@ static int vmbus_bus_init(void) return 0; err_connect: - on_each_cpu(hv_synic_cleanup, NULL, 1); + cpuhp_remove_state(hyperv_cpuhp_online); err_alloc: hv_synic_free(); hv_remove_vmbus_irq(); @@ -1326,12 +1332,9 @@ static int vmbus_acpi_add(struct acpi_device *device) static void hv_kexec_handler(void) { - int cpu; - hv_synic_clockevents_cleanup(); vmbus_initiate_unload(false); - for_each_online_cpu(cpu) - smp_call_function_single(cpu, hv_synic_cleanup, NULL, 1); + cpuhp_remove_state(hyperv_cpuhp_online); hv_cleanup(false); }; @@ -1343,7 +1346,7 @@ static void hv_crash_handler(struct pt_regs *regs) * doing the cleanup for current CPU only. This should be sufficient * for kdump. */ - hv_synic_cleanup(NULL); + hv_synic_cleanup(smp_processor_id()); hv_cleanup(true); }; @@ -1407,8 +1410,8 @@ static void __exit vmbus_exit(void) hv_cleanup(false); for_each_online_cpu(cpu) { tasklet_kill(hv_context.event_dpc[cpu]); - smp_call_function_single(cpu, hv_synic_cleanup, NULL, 1); } + cpuhp_remove_state(hyperv_cpuhp_online); hv_synic_free(); acpi_bus_unregister_driver(&vmbus_acpi_driver); if (vmbus_proto_version > VERSION_WIN7) -- 1.7.4.1