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

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

Drivers: hv: util: Increase the timeout for util services 



Util services such as KVP and FCOPY need assistance from daemon's running
in user space. Increase the timeout so we don't prematurely terminate
the transaction in the kernel. Host sets up a 60 second timeout for
all util driver transactions. The host will retry the transaction if it
times out. Set the guest timeout at 30 seconds.

Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9220e39b

drivers/hv/hv_fcopy.c

+2 −1
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ void hv_fcopy_onchannelcallback(void *context) 
		 * Send the information to the user-level daemon.

		 */

		schedule_work(&fcopy_send_work);

		schedule_delayed_work(&fcopy_timeout_work, 5*HZ);

		schedule_delayed_work(&fcopy_timeout_work,

				      HV_UTIL_TIMEOUT * HZ);

		return;

	}

	icmsghdr->icflags = ICMSGHDRFLAG_TRANSACTION | ICMSGHDRFLAG_RESPONSE;

drivers/hv/hv_kvp.c

+2 −1
Original line number Diff line number Diff line
@@ -668,7 +668,8 @@ void hv_kvp_onchannelcallback(void *context) 
			 * user-mode not responding.

			 */

			schedule_work(&kvp_sendkey_work);

			schedule_delayed_work(&kvp_timeout_work, 5*HZ);

			schedule_delayed_work(&kvp_timeout_work,

					      HV_UTIL_TIMEOUT * HZ);



			return;

drivers/hv/hyperv_vmbus.h

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ 
#include <linux/atomic.h>

#include <linux/hyperv.h>



/*

 * Timeout for services such as KVP and fcopy.

 */

#define HV_UTIL_TIMEOUT 30



/*

 * The below CPUID leaves are present if VersionAndFeatures.HypervisorPresent

 * is set by CPUID(HVCPUID_VERSION_FEATURES).