Browse Source

drivers/hv: cleanup synic msrs if vmbus connect failed

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>
Andrey Smetanin 9 years ago
parent
commit
17efbee8ba
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/hv/vmbus_drv.c

+ 3 - 1
drivers/hv/vmbus_drv.c

@@ -867,7 +867,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();
@@ -885,6 +885,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();