[v3,for-4.4,2/7] Drivers: hv: get rid of timeout in vmbus_open()

Message ID 1492673923-1352-3-git-send-email-sumit.semwal@linaro.org
State New
Headers show
  • hv patches for 4.4.y (resubmit)
Related show

Commit Message

Sumit Semwal April 20, 2017, 7:38 a.m.
From: Vitaly Kuznetsov <vkuznets@redhat.com>

[ Upstream commit 396e287fa2ff46e83ae016cdcb300c3faa3b02f6 ]

vmbus_teardown_gpadl() can result in infinite wait when it is called on 5
second timeout in vmbus_open(). The issue is caused by the fact that gpadl
teardown operation won't ever succeed for an opened channel and the timeout
isn't always enough. As a guest, we can always trust the host to respond to
our request (and there is nothing we can do if it doesn't).

Signed-off-by: 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: Sumit Semwal <sumit.semwal@linaro.org>

 drivers/hv/channel.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)



diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
index 49d2449..d037454 100644
--- a/drivers/hv/channel.c
+++ b/drivers/hv/channel.c
@@ -73,7 +73,6 @@  int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
 	void *in, *out;
 	unsigned long flags;
 	int ret, err = 0;
-	unsigned long t;
 	struct page *page;
 	spin_lock_irqsave(&newchannel->lock, flags);
@@ -183,11 +182,7 @@  int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size,
 		goto error1;
-	t = wait_for_completion_timeout(&open_info->waitevent, 5*HZ);
-	if (t == 0) {
-		err = -ETIMEDOUT;
-		goto error1;
-	}
+	wait_for_completion(&open_info->waitevent);
 	spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags);