diff mbox

block/iscsi: fix deadlock on scsi check condition

Message ID 1392725319-16789-1-git-send-email-pl@kamp.de
State New
Headers show

Commit Message

Peter Lieven Feb. 18, 2014, 12:08 p.m. UTC 
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>
---
 block/iscsi.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

Comments

Paolo Bonzini Feb. 18, 2014, 12:40 p.m. UTC | #1 
Il 18/02/2014 13:08, Peter Lieven ha scritto:
> 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>
> ---
>  block/iscsi.c |    9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/block/iscsi.c b/block/iscsi.c
> index 3c0b728..ded414e 100644
> --- a/block/iscsi.c
> +++ b/block/iscsi.c
> @@ -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;
>      }
>
>

Applied to scsi-next, thanks.

Paolo
diff mbox

Patch

diff --git a/block/iscsi.c b/block/iscsi.c
index 3c0b728..ded414e 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -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;
     }