evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drivers/hv: cleanup synic msrs if vmbus connect failed

Browse source 
[ Upstream commit 17efbee8ba02ef00d3b270998978f8a1a90f1d92 ]

Before vmbus_connect() synic is setup per vcpu - this means
hypervisor receives writes at synic msr's and probably allocate
hypervisor resources per synic setup.

If vmbus_connect() failed for some reason it's neccessary to cleanup
synic setup by call hv_synic_cleanup() at each vcpu to get a chance
to free allocated resources by hypervisor per synic.

This patch does appropriate cleanup in case of vmbus_connect() failure.

Signed-off-by: Andrey Smetanin <asmetanin@virtuozzo.com>
Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>
CC: "K. Y. Srinivasan" <kys@microsoft.com>
CC: Haiyang Zhang <haiyangz@microsoft.com>
CC: Vitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andrey Smetanin 2015-12-14 16:01:38 -08:00 • committed by Greg Kroah-Hartman
parent e35b50490e
commit c1d32939e9
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/hv/vmbus_drv.c
View file

@ -870,7 +870,7 @@ static int vmbus_bus_init(int irq)
on_each_cpu(hv_synic_init, NULL, 1); on_each_cpu(hv_synic_init, NULL, 1);
ret = vmbus_connect(); ret = vmbus_connect();
if (ret) if (ret)
goto err_alloc; goto err_connect;
if (vmbus_proto_version > VERSION_WIN7) if (vmbus_proto_version > VERSION_WIN7)
cpu_hotplug_disable(); cpu_hotplug_disable();
@ -888,6 +888,8 @@ static int vmbus_bus_init(int irq)
return 0; return 0;
err_connect:
on_each_cpu(hv_synic_cleanup, NULL, 1);
err_alloc: err_alloc:
hv_synic_free(); hv_synic_free();
hv_remove_vmbus_irq(); hv_remove_vmbus_irq();