OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/iscsi: fix deadlock on scsi check condition

Browse Source 
the retry logic was broken because the complete status
of the task structure was not reset. this resulted in
an infinite loop retrying the command over and over.

CC: qemu-stable@nongnu.org
Signed-off-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Peter Lieven 2014-02-18 13:08:39 +01:00 committed by Paolo Bonzini
parent 7ef8cf9a08
commit 837c390137
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
block/iscsi.c
View File

@ -145,12 +145,13 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
if (iTask->retries-- > 0 && status == SCSI_STATUS_CHECK_CONDITION
&& task->sense.key == SCSI_SENSE_UNIT_ATTENTION) {
error_report("iSCSI CheckCondition: %s", iscsi_get_error(iscsi));
iTask->do_retry = 1;
goto out;
}
if (status != SCSI_STATUS_GOOD) {
error_report("iSCSI: Failure. %s", iscsi_get_error(iscsi));
error_report("iSCSI Failure: %s", iscsi_get_error(iscsi));
}
out:
@ -325,6 +326,7 @@ retry:
}
if (iTask.do_retry) {
iTask.complete = 0;
goto retry;
}
@ -399,6 +401,7 @@ retry:
}
if (iTask.do_retry) {
iTask.complete = 0;
goto retry;
}
@ -433,6 +436,7 @@ retry:
}
if (iTask.do_retry) {
iTask.complete = 0;
goto retry;
}
@ -683,6 +687,7 @@ retry:
scsi_free_scsi_task(iTask.task);
iTask.task = NULL;
}
iTask.complete = 0;
goto retry;
}
@ -767,6 +772,7 @@ retry:
}
if (iTask.do_retry) {
iTask.complete = 0;
goto retry;
}
@ -836,6 +842,7 @@ retry:
}
if (iTask.do_retry) {
iTask.complete = 0;
goto retry;
}