The sysfs attribute 'add_target' may be used to relogin to a target. An SRP target that receives a second login request from an initiator will disconnect the previous connection. So before trying to reconnect, check whether another connection to the same SRP target identifier already exists. If so, remove the target port. Add a target to the target list before connecting instead of after such that this algorithm has a chance to work.
Signed-off-by: Bart Van Assche <[email protected]> Cc: David Dillow <[email protected]> Cc: Roland Dreier <[email protected]> --- drivers/infiniband/ulp/srp/ib_srp.c | 124 ++++++++++++++++++++++++++++------- drivers/infiniband/ulp/srp/ib_srp.h | 10 +++ 2 files changed, 110 insertions(+), 24 deletions(-) diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c index 63f57fd..eeb6d3f 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c @@ -449,7 +449,16 @@ static bool srp_change_state(struct srp_target_port *target, static bool srp_change_state_to_removed(struct srp_target_port *target) { - return srp_change_state(target, SRP_TARGET_LIVE, SRP_TARGET_REMOVED); + bool changed = false; + + spin_lock_irq(&target->lock); + if (target->state != SRP_TARGET_REMOVED) { + target->state = SRP_TARGET_REMOVED; + changed = true; + } + spin_unlock_irq(&target->lock); + + return changed; } static bool srp_change_conn_state(struct srp_target_port *target, @@ -592,9 +601,15 @@ static void srp_remove_target(struct srp_target_port *target) WARN_ON(target->state != SRP_TARGET_REMOVED); srp_del_scsi_host_attr(shost); - srp_remove_host(shost); - scsi_remove_host(shost); + + mutex_lock(&target->mutex); + if (target->scsi_host_added) { + srp_remove_host(shost); + scsi_remove_host(shost); + } srp_disconnect_target(target); + mutex_unlock(&target->mutex); + srp_free_target_ib(target); srp_free_req_data(target); scsi_host_put(shost); @@ -629,6 +644,30 @@ static void srp_rport_delete(struct srp_rport *rport) queue_work(system_long_wq, &target->remove_work); } +/** + * srp_conn_unique() - Check whether the connection to a target is unique. + */ +static bool srp_conn_unique(struct srp_host *host, + struct srp_target_port *target) +{ + struct srp_target_port *t; + bool ret = true; + + spin_lock(&host->target_lock); + list_for_each_entry(t, &host->target_list, list) { + if (t != target && + target->id_ext == t->id_ext && + target->ioc_guid == t->ioc_guid && + target->initiator_ext == t->initiator_ext) { + ret = false; + break; + } + } + spin_unlock(&host->target_lock); + + return ret; +} + static int srp_connect_target(struct srp_target_port *target) { int retries = 3; @@ -738,8 +777,20 @@ static int srp_reconnect_target(struct srp_target_port *target) struct ib_qp_attr qp_attr; int i, ret; - if (target->state != SRP_TARGET_LIVE) + if (!srp_conn_unique(target->srp_host, target) && + srp_change_state_to_removed(target)) { + shost_printk(KERN_INFO, target->scsi_host, + PFX "deleting SCSI host because obsolete.\n"); + queue_work(system_long_wq, &target->remove_work); + return -ENXIO; + } + if (target->state == SRP_TARGET_REMOVED) { + shost_printk(KERN_DEBUG, target->scsi_host, + PFX "Already removed\n"); return -EAGAIN; + } + + mutex_lock(&target->mutex); scsi_target_block(&shost->shost_gendev); @@ -775,8 +826,11 @@ static int srp_reconnect_target(struct srp_target_port *target) if (ret) goto err; +unblock: scsi_target_unblock(&shost->shost_gendev); + mutex_unlock(&target->mutex); + return ret; err: @@ -792,9 +846,7 @@ err: if (srp_change_state_to_removed(target)) queue_work(ib_wq, &target->remove_work); - scsi_target_unblock(&shost->shost_gendev); - - return ret; + goto unblock; } static void srp_map_desc(struct srp_map_state *state, dma_addr_t dma_addr, @@ -1711,6 +1763,10 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event) shost_printk(KERN_ERR, target->scsi_host, PFX "connection closed\n"); + if (!srp_conn_unique(target->srp_host, target) && + srp_change_state_to_removed(target)) + queue_work(system_long_wq, &target->remove_work); + comp = 1; target->status = 0; break; @@ -2025,16 +2081,6 @@ static int srp_add_target(struct srp_host *host, struct srp_target_port *target) rport->lld_data = target; - spin_lock(&host->target_lock); - list_add_tail(&target->list, &host->target_list); - spin_unlock(&host->target_lock); - - target->state = SRP_TARGET_LIVE; - target->connected = false; - - scsi_scan_target(&target->scsi_host->shost_gendev, - 0, target->scsi_id, SCAN_WILD_CARD, 0); - return 0; } @@ -2320,6 +2366,7 @@ static ssize_t srp_create_target(struct device *dev, sizeof (struct srp_indirect_buf) + target->cmd_sg_cnt * sizeof (struct srp_direct_buf); + mutex_init(&target->mutex); INIT_WORK(&target->remove_work, srp_remove_work); spin_lock_init(&target->lock); INIT_LIST_HEAD(&target->free_tx); @@ -2366,24 +2413,53 @@ static ssize_t srp_create_target(struct device *dev, if (ret) goto err_free_ib; + target->connected = false; + target->rq_tmo_jiffies = 1 * HZ; + target->state = SRP_TARGET_CONNECTING; + target->scsi_host_added = false; + + spin_lock(&host->target_lock); + list_add_tail(&target->list, &host->target_list); + spin_unlock(&host->target_lock); + + mutex_lock(&target->mutex); + if (!srp_change_state(target, SRP_TARGET_CONNECTING, SRP_TARGET_LIVE)) { + ret = -ENOENT; + goto err_unlock_remove; + } + ret = srp_connect_target(target); if (ret) { shost_printk(KERN_ERR, target->scsi_host, PFX "Connection failed\n"); - goto err_cm_id; + goto err_unlock_remove; } ret = srp_add_target(host, target); + target->scsi_host_added = ret == 0; + + WARN_ON(!scsi_host_get(target_host)); + mutex_unlock(&target->mutex); + + scsi_scan_target(&target->scsi_host->shost_gendev, 0, target->scsi_id, + SCAN_WILD_CARD, 0); + + scsi_host_put(target_host); + if (ret) - goto err_disconnect; + goto err_remove; return count; -err_disconnect: - srp_disconnect_target(target); - -err_cm_id: - ib_destroy_cm_id(target->cm_id); +err_unlock_remove: + mutex_unlock(&target->mutex); +err_remove: + if (srp_change_state_to_removed(target)) { + shost_printk(KERN_INFO, target->scsi_host, + PFX "deleting SCSI host (ret = %d).\n", ret); + srp_remove_work(&target->remove_work); + } + return ret; err_free_ib: srp_free_target_ib(target); diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h index 84b6a4c..0106183 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.h +++ b/drivers/infiniband/ulp/srp/ib_srp.h @@ -78,7 +78,15 @@ enum { SRP_MAP_NO_FMR = 1, }; +/** + * enum srp_target_state - State of the SCSI host associated with an SRP target. + * @SRP_TARGET_CONNECTING: IB connection being established and SCSI host being + * added. + * @SRP_TARGET_LIVE: IB RC connection is established and SCSI host is unblocked. + * @SRP_TARGET_REMOVED: SCSI host removal is pending. + */ enum srp_target_state { + SRP_TARGET_CONNECTING, SRP_TARGET_LIVE, SRP_TARGET_REMOVED, }; @@ -163,6 +171,7 @@ struct srp_target_port { u32 rq_tmo_jiffies; bool connected; + bool scsi_host_added; struct ib_cm_id *cm_id; @@ -183,6 +192,7 @@ struct srp_target_port { bool last_recv_wqe; bool last_send_wqe; wait_queue_head_t qp_wq; + struct mutex mutex; struct completion tsk_mgmt_done; u8 tsk_mgmt_status; -- 1.7.7 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
