Skip to contentSkip to conversation

drivers/hv: cleanup synic msrs if vmbus connect failed

PATCH In review Denis V. Lunev 2 participants 2 messages Oct 7, 2015 Hyper-V/Azure core and drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/hv: cleanup synic msrs if vmbus connect failed

From: Andrey Smetanin <[email protected]>

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.

CC "K. Y. Srinivasan" <[email protected]>
CC Haiyang Zhang <[email protected]>
CC Vitaly Kuznetsov <[email protected]>
---
 drivers/hv/vmbus_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hv/vmbus_drv.c +3 -1
index f19b6f7..3297731 100644
@@ -867,7 +867,7 @@ static int vmbus_bus_init(int irq)
 	on_each_cpu(hv_synic_init, NULL, 1);
 	ret = vmbus_connect();
 	if (ret)
-		goto err_alloc;
+		goto err_connect;
 
 	if (vmbus_proto_version > VERSION_WIN7)
 		cpu_hotplug_disable();
@@ -885,6 +885,8 @@ static int vmbus_bus_init(int irq)
 
 	return 0;
 
+err_connect:
+	on_each_cpu(hv_synic_cleanup, NULL, 1);
 err_alloc:
 	hv_synic_free();
 	hv_remove_vmbus_irq();
Signature · 1 line
2.1.4
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Denis V. Lunev

From: Andrey Smetanin <[email protected]>

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.

"to make sure it is safe to free previously allocated resources" (as we can free them anyway)?

Quoted 8 lines

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

CC "K. Y. Srinivasan" <[email protected]>
CC Haiyang Zhang <[email protected]>
CC Vitaly Kuznetsov <[email protected]>
Quoted 26 lines
---
 drivers/hv/vmbus_drv.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/hv/vmbus_drv.c +3 -1
index f19b6f7..3297731 100644
@@ -867,7 +867,7 @@ static int vmbus_bus_init(int irq)
 	on_each_cpu(hv_synic_init, NULL, 1);
 	ret = vmbus_connect();
 	if (ret)
-		goto err_alloc;
+		goto err_connect;
 
 	if (vmbus_proto_version > VERSION_WIN7)
 		cpu_hotplug_disable();
@@ -885,6 +885,8 @@ static int vmbus_bus_init(int irq)
 
 	return 0;
 
+err_connect:
+	on_each_cpu(hv_synic_cleanup, NULL, 1);
 err_alloc:
 	hv_synic_free();
 	hv_remove_vmbus_irq();
Signature · 1 line
  Vitaly