[SCSI] ibmvfc: Fix target initialization failure retry handling

If the ibmvfc driver is in discovery attempting to log into a target
and it encounters an error, the command may get retried one or more
times, depending on the error received. If the retries are
unsuccessful such that the discovery thread gives up on discovery to
that target, the target ends up in a state where, if SCSI core had
previously known about the device, the host will get unblocked but the
host will not be logged into the target, causing any commands sent to
the target to fail. This patch fixes this so that if this occurs, the
target is deleted such that the normal dev_loss processing can occur
instead.

Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

2 files changed, 23 insertions, 20 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index af69c0738edb..844684581e45 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -496,6 +496,7 @@ static void ibmvfc_set_host_action(struct ibmvfc_host *vhost,
         case IBMVFC_HOST_ACTION_INIT:
         case IBMVFC_HOST_ACTION_TGT_DEL:
         case IBMVFC_HOST_ACTION_QUERY_TGTS:
+        case IBMVFC_HOST_ACTION_TGT_DEL_FAILED:
         case IBMVFC_HOST_ACTION_TGT_ADD:
         case IBMVFC_HOST_ACTION_NONE:
         default:
@@ -2791,6 +2792,8 @@ static void ibmvfc_tgt_prli_done(struct ibmvfc_event *evt)
                         rsp->status, rsp->error, status);
                 if (ibmvfc_retry_cmd(rsp->status, rsp->error))
                         ibmvfc_retry_tgt_init(tgt, ibmvfc_tgt_send_prli);
+                else
+                        ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);
                 break;
         };
 
@@ -2885,6 +2888,8 @@ static void ibmvfc_tgt_plogi_done(struct ibmvfc_event *evt)
 
                 if (ibmvfc_retry_cmd(rsp->status, rsp->error))
                         ibmvfc_retry_tgt_init(tgt, ibmvfc_tgt_send_plogi);
+                else
+                        ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);
                 break;
         };
 
@@ -3176,6 +3181,8 @@ static void ibmvfc_tgt_query_target_done(struct ibmvfc_event *evt)
                         ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);
                 else if (ibmvfc_retry_cmd(rsp->status, rsp->error))
                         ibmvfc_retry_tgt_init(tgt, ibmvfc_tgt_query_target);
+                else
+                        ibmvfc_set_tgt_action(tgt, IBMVFC_TGT_ACTION_DEL_RPORT);
                 break;
         };
 
@@ -3506,6 +3513,7 @@ static int __ibmvfc_work_to_do(struct ibmvfc_host *vhost)
         case IBMVFC_HOST_ACTION_ALLOC_TGTS:
         case IBMVFC_HOST_ACTION_TGT_ADD:
         case IBMVFC_HOST_ACTION_TGT_DEL:
+        case IBMVFC_HOST_ACTION_TGT_DEL_FAILED:
         case IBMVFC_HOST_ACTION_QUERY:
         default:
                 break;
@@ -3621,6 +3629,7 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                         ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_TGT_DEL);
                 break;
         case IBMVFC_HOST_ACTION_TGT_DEL:
+        case IBMVFC_HOST_ACTION_TGT_DEL_FAILED:
                 list_for_each_entry(tgt, &vhost->targets, queue) {
                         if (tgt->action == IBMVFC_TGT_ACTION_DEL_RPORT) {
                                 tgt_dbg(tgt, "Deleting rport\n");
@@ -3636,8 +3645,17 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                 }
 
                 if (vhost->state == IBMVFC_INITIALIZING) {
-                        ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT);
-                        vhost->job_step = ibmvfc_discover_targets;
+                        if (vhost->action == IBMVFC_HOST_ACTION_TGT_DEL_FAILED) {
+                                ibmvfc_set_host_state(vhost, IBMVFC_ACTIVE);
+                                ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_TGT_ADD);
+                                vhost->init_retries = 0;
+                                spin_unlock_irqrestore(vhost->host->host_lock, flags);
+                                scsi_unblock_requests(vhost->host);
+                                return;
+                        } else {
+                                ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_INIT);
+                                vhost->job_step = ibmvfc_discover_targets;
+                        }
                 } else {
                         ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_NONE);
                         spin_unlock_irqrestore(vhost->host->host_lock, flags);
@@ -3660,14 +3678,8 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                         }
                 }
 
-                if (!ibmvfc_dev_init_to_do(vhost)) {
-                        ibmvfc_set_host_state(vhost, IBMVFC_ACTIVE);
-                        ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_TGT_ADD);
-                        vhost->init_retries = 0;
-                        spin_unlock_irqrestore(vhost->host->host_lock, flags);
-                        scsi_unblock_requests(vhost->host);
-                        return;
-                }
+                if (!ibmvfc_dev_init_to_do(vhost))
+                        ibmvfc_set_host_action(vhost, IBMVFC_HOST_ACTION_TGT_DEL_FAILED);
                 break;
         case IBMVFC_HOST_ACTION_TGT_ADD:
                 list_for_each_entry(tgt, &vhost->targets, queue) {
@@ -3675,16 +3687,6 @@ static void ibmvfc_do_work(struct ibmvfc_host *vhost)
                                 spin_unlock_irqrestore(vhost->host->host_lock, flags);
                                 ibmvfc_tgt_add_rport(tgt);
                                 return;
-                        } else if (tgt->action == IBMVFC_TGT_ACTION_DEL_RPORT) {
-                                tgt_dbg(tgt, "Deleting rport\n");
-                                rport = tgt->rport;
-                                tgt->rport = NULL;
-                                list_del(&tgt->queue);
-                                spin_unlock_irqrestore(vhost->host->host_lock, flags);
-                                if (rport)
-                                        fc_remote_port_delete(rport);
-                                kref_put(&tgt->kref, ibmvfc_release_tgt);
-                                return;
                         }
                 }
 
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.h b/drivers/scsi/ibmvscsi/ibmvfc.h
index c3696ce470bd..2d723df5b18c 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.h
+++ b/drivers/scsi/ibmvscsi/ibmvfc.h
@@ -626,6 +626,7 @@ enum ibmvfc_host_action {
         IBMVFC_HOST_ACTION_TGT_DEL,
         IBMVFC_HOST_ACTION_ALLOC_TGTS,
         IBMVFC_HOST_ACTION_TGT_INIT,
+        IBMVFC_HOST_ACTION_TGT_DEL_FAILED,
         IBMVFC_HOST_ACTION_TGT_ADD,
 };