Drivers: hv: vmbus: Cleanup vmbus_close_internal()

commit 98d731bb064a9d1817a6ca9bf8b97051334a7cfe upstream.

Eliminate calls to BUG_ON() in vmbus_close_internal().
We have chosen to potentially leak memory, than crash the guest
in case of failures.

In this version of the patch I have addressed comments from
Dan Carpenter (dan.carpenter@oracle.com).

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Tested-by: Sitsofe Wheeler <sitsofe@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[lizf: Backported to 3.4: s/return ret/return/g]
Signed-off-by: Zefan Li <lizefan@huawei.com>

diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 7bbbb95d87650e2249bfab5f2b8d90b84496e6c2..3c8b2c473b816be5e565f847c93dea5184ff95e4 100644 (file)
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -531,11 +531,28 @@ void vmbus_close(struct vmbus_channel *channel)
 
        ret = vmbus_post_msg(msg, sizeof(struct vmbus_channel_close_channel));
 
-       BUG_ON(ret != 0);
+       if (ret) {
+               pr_err("Close failed: close post msg return is %d\n", ret);
+               /*
+                * If we failed to post the close msg,
+                * it is perhaps better to leak memory.
+                */
+               return;
+       }
+
        /* Tear down the gpadl for the channel's ring buffer */
-       if (channel->ringbuffer_gpadlhandle)
-               vmbus_teardown_gpadl(channel,
-                                         channel->ringbuffer_gpadlhandle);
+       if (channel->ringbuffer_gpadlhandle) {
+               ret = vmbus_teardown_gpadl(channel,
+                                          channel->ringbuffer_gpadlhandle);
+               if (ret) {
+                       pr_err("Close failed: teardown gpadl return %d\n", ret);
+                       /*
+                        * If we failed to teardown gpadl,
+                        * it is perhaps better to leak memory.
+                        */
+                       return;
+               }
+       }
 
        /* Cleanup the ring buffers for this channel */
        hv_ringbuffer_cleanup(&channel->outbound);
@@ -543,8 +560,6 @@ void vmbus_close(struct vmbus_channel *channel)
 
        free_pages((unsigned long)channel->ringbuffer_pages,
                get_order(channel->ringbuffer_pagecount * PAGE_SIZE));
-
-
 }
 EXPORT_SYMBOL_GPL(vmbus_close);