block/iscsi: fix deadlock on scsi check condition
PATCH 1/1 block/iscsi: fix deadlock on scsi check condition
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.
Signed-off-by Peter Lieven <[email protected]>
--- block/iscsi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
block/iscsi.c +8 -1
@@ -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; }
Signature · 1 line
1.7.9.5
Paolo Bonzini
AppliedIl 18/02/2014 13:08, Peter Lieven ha scritto:
Quoted 71 lines
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.
Signed-off-by Peter Lieven <[email protected]>--- block/iscsi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)block/iscsi.c +7
-1@@ -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; }
block/iscsi.c retry: · line 848
Quoted 7 lines
block/iscsi.c +1
-0@@ -836,6 +842,7 @@ retry: }if (iTask.do_retry) { + iTask.complete =0 ; goto retry; }
Applied to scsi-next, thanks.
Paolo