* [PATCH 0/2] Drivers: hv: vmbus: Make CPU offlining more fine grained @ 2016-12-07 22:52 kys 2016-12-07 22:53 ` [PATCH 1/2] hv: switch to cpuhp state machine for synic init/cleanup kys 0 siblings, 1 reply; 3+ messages in thread From: kys @ 2016-12-07 22:52 UTC (permalink / raw) To: gregkh, linux-kernel, devel, olaf, apw, vkuznets, jasowang, leann.ogasawara Cc: K. Y. Srinivasan From: K. Y. Srinivasan <kys@microsoft.com> Enhance CPU online/offline management. Vitaly Kuznetsov (2): hv: switch to cpuhp state machine for synic init/cleanup hv: make CPU offlining prevention fine-grained drivers/hv/hv.c | 46 +++++++++++++++++++++++++++++++++++++------- drivers/hv/hyperv_vmbus.h | 4 +- drivers/hv/vmbus_drv.c | 28 ++++++++++++++------------ 3 files changed, 55 insertions(+), 23 deletions(-) -- 1.7.4.1 ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] hv: switch to cpuhp state machine for synic init/cleanup 2016-12-07 22:52 [PATCH 0/2] Drivers: hv: vmbus: Make CPU offlining more fine grained kys @ 2016-12-07 22:53 ` kys 2016-12-07 22:53 ` [PATCH 2/2] hv: make CPU offlining prevention fine-grained kys 0 siblings, 1 reply; 3+ messages in thread From: kys @ 2016-12-07 22:53 UTC (permalink / raw) To: gregkh, linux-kernel, devel, olaf, apw, vkuznets, jasowang, leann.ogasawara Cc: K. Y. Srinivasan From: Vitaly Kuznetsov <vkuznets@redhat.com> 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 <vkuznets@redhat.com> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> --- 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 60f14c4..b871fcc 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -496,7 +496,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; @@ -505,10 +505,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); @@ -563,7 +561,7 @@ void hv_synic_init(void *arg) HV_TIMER_FREQUENCY, HV_MIN_DELTA_TICKS, HV_MAX_MAX_DELTA_TICKS); - return; + return 0; } /* @@ -583,16 +581,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) { @@ -624,4 +621,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 230c62e..a16d519 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -54,6 +54,7 @@ struct vmbus_dynid { static struct completion probe_event; +static int hyperv_cpuhp_online; static void hyperv_report_panic(struct pt_regs *regs) { @@ -997,7 +998,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; @@ -1019,7 +1025,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(); @@ -1478,12 +1484,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); }; @@ -1495,7 +1498,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); }; @@ -1559,8 +1562,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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] hv: make CPU offlining prevention fine-grained 2016-12-07 22:53 ` [PATCH 1/2] hv: switch to cpuhp state machine for synic init/cleanup kys @ 2016-12-07 22:53 ` kys 0 siblings, 0 replies; 3+ messages in thread From: kys @ 2016-12-07 22:53 UTC (permalink / raw) To: gregkh, linux-kernel, devel, olaf, apw, vkuznets, jasowang, leann.ogasawara Cc: K. Y. Srinivasan From: Vitaly Kuznetsov <vkuznets@redhat.com> Since commit e513229b4c38 ("Drivers: hv: vmbus: prevent cpu offlining on newer hypervisors") cpu offlining was disabled. It is still true that we can't offline CPUs which have VMBus channels bound to them but we may have 'free' CPUs (e.v. we booted with maxcpus= parameter and onlined CPUs after VMBus was initialized), these CPUs may be disabled without issues. In future, we may even allow closing CPUs which have only sub-channels assinged to them by closing these sub-channels. All devices will continue to work. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> --- drivers/hv/hv.c | 31 +++++++++++++++++++++++++++++++ drivers/hv/vmbus_drv.c | 9 ++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index b871fcc..04a0fd8 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c @@ -587,10 +587,41 @@ int hv_synic_cleanup(unsigned int cpu) union hv_synic_simp simp; union hv_synic_siefp siefp; union hv_synic_scontrol sctrl; + struct vmbus_channel *channel, *sc; + bool channel_found = false; + unsigned long flags; if (!hv_context.synic_initialized) return -EFAULT; + /* + * Search for channels which are bound to the CPU we're about to + * cleanup. In case we find one and vmbus is still connected we need to + * fail, this will effectively prevent CPU offlining. There is no way + * we can re-bind channels to different CPUs for now. + */ + mutex_lock(&vmbus_connection.channel_mutex); + list_for_each_entry(channel, &vmbus_connection.chn_list, listentry) { + if (channel->target_cpu == cpu) { + channel_found = true; + break; + } + spin_lock_irqsave(&channel->lock, flags); + list_for_each_entry(sc, &channel->sc_list, sc_list) { + if (sc->target_cpu == cpu) { + channel_found = true; + break; + } + } + spin_unlock_irqrestore(&channel->lock, flags); + if (channel_found) + break; + } + mutex_unlock(&vmbus_connection.channel_mutex); + + if (channel_found && vmbus_connection.conn_state == CONNECTED) + return -EBUSY; + /* Turn off clockevent device */ if (ms_hyperv.features & HV_X64_MSR_SYNTIMER_AVAILABLE) { clockevents_unbind_device(hv_context.clk_evt[cpu], cpu); diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index a16d519..565bdd1 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c @@ -1008,9 +1008,6 @@ static int vmbus_bus_init(void) if (ret) goto err_connect; - if (vmbus_proto_version > VERSION_WIN7) - cpu_hotplug_disable(); - /* * Only register if the crash MSRs are available */ @@ -1486,6 +1483,9 @@ static void hv_kexec_handler(void) { hv_synic_clockevents_cleanup(); vmbus_initiate_unload(false); + vmbus_connection.conn_state = DISCONNECTED; + /* Make sure conn_state is set as hv_synic_cleanup checks for it */ + mb(); cpuhp_remove_state(hyperv_cpuhp_online); hv_cleanup(false); }; @@ -1498,6 +1498,7 @@ static void hv_crash_handler(struct pt_regs *regs) * doing the cleanup for current CPU only. This should be sufficient * for kdump. */ + vmbus_connection.conn_state = DISCONNECTED; hv_synic_cleanup(smp_processor_id()); hv_cleanup(true); }; @@ -1566,8 +1567,6 @@ static void __exit vmbus_exit(void) cpuhp_remove_state(hyperv_cpuhp_online); hv_synic_free(); acpi_bus_unregister_driver(&vmbus_acpi_driver); - if (vmbus_proto_version > VERSION_WIN7) - cpu_hotplug_enable(); } -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-07 21:09 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-12-07 22:52 [PATCH 0/2] Drivers: hv: vmbus: Make CPU offlining more fine grained kys 2016-12-07 22:53 ` [PATCH 1/2] hv: switch to cpuhp state machine for synic init/cleanup kys 2016-12-07 22:53 ` [PATCH 2/2] hv: make CPU offlining prevention fine-grained kys
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).