projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| e2cab6c9 GKH |
1 | From 2dfde9644fe8c4a77f9c73f95b25d6300ca23b5d Mon Sep 17 00:00:00 2001 |
| 2 | From: "K. Y. Srinivasan" <kys@microsoft.com> | |
| 3 | Date: Thu, 16 Jun 2011 13:16:34 -0700 | |
| 4 | Subject: Staging: hv: vmbus: Increase the timeout value in the vmbus | |
| 5 | driver | |
| 6 | ||
| 7 | From: "K. Y. Srinivasan" <kys@microsoft.com> | |
| 8 | ||
| 9 | commit 2dfde9644fe8c4a77f9c73f95b25d6300ca23b5d upstream. | |
| 10 | ||
| 11 | On some loaded windows hosts, we have discovered that the host may not | |
| 12 | respond to guest requests within the specified time (one second) | |
| 13 | as evidenced by the guest timing out. Fix this problem by increasing | |
| 14 | the timeout to 5 seconds. | |
| 15 | ||
| 16 | It may be useful to apply this patch to the 3.0 kernel as well. | |
| 17 | ||
| 18 | Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> | |
| 19 | Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> | |
| 20 | Signed-off-by: Hank Janssen <hjanssen@microsoft.com> | |
| 21 | Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |
| 22 | ||
| 23 | --- | |
| 24 | drivers/staging/hv/channel.c | 2 +- | |
| 25 | drivers/staging/hv/channel_mgmt.c | 2 +- | |
| 26 | drivers/staging/hv/connection.c | 2 +- | |
| 27 | 3 files changed, 3 insertions(+), 3 deletions(-) | |
| 28 | ||
| 29 | --- a/drivers/staging/hv/channel.c | |
| 30 | +++ b/drivers/staging/hv/channel.c | |
| 31 | @@ -212,7 +212,7 @@ int vmbus_open(struct vmbus_channel *new | |
| 32 | if (ret != 0) | |
| 33 | goto Cleanup; | |
| 34 | ||
| 35 | - t = wait_for_completion_timeout(&openInfo->waitevent, HZ); | |
| 36 | + t = wait_for_completion_timeout(&openInfo->waitevent, 5*HZ); | |
| 37 | if (t == 0) { | |
| 38 | err = -ETIMEDOUT; | |
| 39 | goto errorout; | |
| 40 | --- a/drivers/staging/hv/channel_mgmt.c | |
| 41 | +++ b/drivers/staging/hv/channel_mgmt.c | |
| 42 | @@ -773,7 +773,7 @@ int vmbus_request_offers(void) | |
| 43 | goto cleanup; | |
| 44 | } | |
| 45 | ||
| 46 | - t = wait_for_completion_timeout(&msginfo->waitevent, HZ); | |
| 47 | + t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ); | |
| 48 | if (t == 0) { | |
| 49 | ret = -ETIMEDOUT; | |
| 50 | goto cleanup; | |
| 51 | --- a/drivers/staging/hv/connection.c | |
| 52 | +++ b/drivers/staging/hv/connection.c | |
| 53 | @@ -135,7 +135,7 @@ int vmbus_connect(void) | |
| 54 | } | |
| 55 | ||
| 56 | /* Wait for the connection response */ | |
| 57 | - t = wait_for_completion_timeout(&msginfo->waitevent, HZ); | |
| 58 | + t = wait_for_completion_timeout(&msginfo->waitevent, 5*HZ); | |
| 59 | if (t == 0) { | |
| 60 | spin_lock_irqsave(&vmbus_connection.channelmsg_lock, | |
| 61 | flags); |