Skip to content

[LE-3545] scsi: storvsc: Increase the timeouts to storvsc_timeout #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2025
Merged

[LE-3545] scsi: storvsc: Increase the timeouts to storvsc_timeout #524

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions drivers/scsi/storvsc_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ MODULE_PARM_DESC(ring_avail_percent_lowater,
/*
* Timeout in seconds for all devices managed by this driver.
*/
static int storvsc_timeout = 180;
static const int storvsc_timeout = 180;

#if IS_ENABLED(CONFIG_SCSI_FC_ATTRS)
static struct scsi_transport_template *fc_transport_template;
Expand Down Expand Up @@ -762,7 +762,7 @@ static void handle_multichannel_storage(struct hv_device *device, int max_chns)
return;
}

t = wait_for_completion_timeout(&request->wait_event, 10*HZ);
t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);
if (t == 0) {
dev_err(dev, "Failed to create sub-channel: timed out\n");
return;
Expand Down Expand Up @@ -827,7 +827,7 @@ static int storvsc_execute_vstor_op(struct hv_device *device,
if (ret != 0)
return ret;

t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);
if (t == 0)
return -ETIMEDOUT;

Expand Down Expand Up @@ -1345,6 +1345,8 @@ static int storvsc_connect_to_vsp(struct hv_device *device, u32 ring_size,
return ret;

ret = storvsc_channel_init(device, is_fc);
if (ret)
vmbus_close(device->channel);

return ret;
}
Expand Down Expand Up @@ -1662,7 +1664,7 @@ static int storvsc_host_reset_handler(struct scsi_cmnd *scmnd)
if (ret != 0)
return FAILED;

t = wait_for_completion_timeout(&request->wait_event, 5*HZ);
t = wait_for_completion_timeout(&request->wait_event, storvsc_timeout * HZ);
if (t == 0)
return TIMEOUT_ERROR;

Expand Down