Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2dfde964 authored by K. Y. Srinivasan's avatar K. Y. Srinivasan Committed by Greg Kroah-Hartman
Browse files

Staging: hv: vmbus: Increase the timeout value in the vmbus driver 



On some loaded windows hosts, we have discovered that the host may not
respond to guest requests within the specified time (one second)
as evidenced by the guest timing out. Fix this problem by increasing
the timeout to 5 seconds.

It may be useful to apply this patch to the 3.0 kernel as well.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarHaiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: default avatarHank Janssen <hjanssen@microsoft.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent df505677

drivers/staging/hv/channel.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ int vmbus_open(struct vmbus_channel *newchannel, u32 send_ringbuffer_size, 
	if (ret != 0)

		goto cleanup;



	t = wait_for_completion_timeout(&openInfo->waitevent, HZ);

	t = wait_for_completion_timeout(&openInfo->waitevent, 5*HZ);

	if (t == 0) {

		err = -ETIMEDOUT;

		goto errorout;

drivers/staging/hv/channel_mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ int vmbus_request_offers(void) 
		goto cleanup;

	}



	t = wait_for_completion_timeout(&msginfo->waitevent, HZ);

	t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ);

	if (t == 0) {

		ret = -ETIMEDOUT;

		goto cleanup;

drivers/staging/hv/connection.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int vmbus_connect(void) 
	}



	/* Wait for the connection response */

	t =  wait_for_completion_timeout(&msginfo->waitevent, HZ);

	t =  wait_for_completion_timeout(&msginfo->waitevent, 5*HZ);

	if (t == 0) {

		spin_lock_irqsave(&vmbus_connection.channelmsg_lock,

				flags);