|
@@ -33,6 +33,7 @@
|
|
#include <linux/device.h>
|
|
#include <linux/device.h>
|
|
#include <linux/hyperv.h>
|
|
#include <linux/hyperv.h>
|
|
#include <linux/mempool.h>
|
|
#include <linux/mempool.h>
|
|
|
|
+#include <linux/blkdev.h>
|
|
#include <scsi/scsi.h>
|
|
#include <scsi/scsi.h>
|
|
#include <scsi/scsi_cmnd.h>
|
|
#include <scsi/scsi_cmnd.h>
|
|
#include <scsi/scsi_host.h>
|
|
#include <scsi/scsi_host.h>
|
|
@@ -1518,6 +1519,16 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
|
|
return SUCCESS;
|
|
return SUCCESS;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/*
|
|
|
|
+ * The host guarantees to respond to each command, although I/O latencies might
|
|
|
|
+ * be unbounded on Azure. Reset the timer unconditionally to give the host a
|
|
|
|
+ * chance to perform EH.
|
|
|
|
+ */
|
|
|
|
+static enum blk_eh_timer_return storvsc_eh_timed_out(struct scsi_cmnd *scmnd)
|
|
|
|
+{
|
|
|
|
+ return BLK_EH_RESET_TIMER;
|
|
|
|
+}
|
|
|
|
+
|
|
static bool storvsc_scsi_cmd_ok(struct scsi_cmnd *scmnd)
|
|
static bool storvsc_scsi_cmd_ok(struct scsi_cmnd *scmnd)
|
|
{
|
|
{
|
|
bool allowed = true;
|
|
bool allowed = true;
|
|
@@ -1697,6 +1708,7 @@ static struct scsi_host_template scsi_driver = {
|
|
.bios_param = storvsc_get_chs,
|
|
.bios_param = storvsc_get_chs,
|
|
.queuecommand = storvsc_queuecommand,
|
|
.queuecommand = storvsc_queuecommand,
|
|
.eh_host_reset_handler = storvsc_host_reset_handler,
|
|
.eh_host_reset_handler = storvsc_host_reset_handler,
|
|
|
|
+ .eh_timed_out = storvsc_eh_timed_out,
|
|
.slave_alloc = storvsc_device_alloc,
|
|
.slave_alloc = storvsc_device_alloc,
|
|
.slave_destroy = storvsc_device_destroy,
|
|
.slave_destroy = storvsc_device_destroy,
|
|
.slave_configure = storvsc_device_configure,
|
|
.slave_configure = storvsc_device_configure,
|