Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1120f89 authored by Bart Van Assche's avatar Bart Van Assche Committed by Roland Dreier
Browse files

IB/srp: Start timers if a transport layer error occurs 



Start the reconnect timer, fast_io_fail timer and dev_loss timers if a
transport layer error occurs.

Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
Acked-by: default avatarDavid Dillow <dillowda@ornl.gov>
Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent ed9b2264

drivers/infiniband/ulp/srp/ib_srp.c

+19 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ static void srp_remove_target(struct srp_target_port *target) 
	srp_disconnect_target(target);

	ib_destroy_cm_id(target->cm_id);

	srp_free_target_ib(target);

	cancel_work_sync(&target->tl_err_work);

	srp_rport_put(target->rport);

	srp_free_req_data(target);

	scsi_host_put(target->scsi_host);
@@ -1362,6 +1363,21 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc) 
			     PFX "Recv failed with error code %d\n", res);

}



/**

 * srp_tl_err_work() - handle a transport layer error

 *

 * Note: This function may get invoked before the rport has been created,

 * hence the target->rport test.

 */

static void srp_tl_err_work(struct work_struct *work)

{

	struct srp_target_port *target;



	target = container_of(work, struct srp_target_port, tl_err_work);

	if (target->rport)

		srp_start_tl_fail_timers(target->rport);

}



static void srp_handle_qp_err(enum ib_wc_status wc_status,

			      enum ib_wc_opcode wc_opcode,

			      struct srp_target_port *target)
@@ -1371,6 +1387,7 @@ static void srp_handle_qp_err(enum ib_wc_status wc_status, 
			     PFX "failed %s status %d\n",

			     wc_opcode & IB_WC_RECV ? "receive" : "send",

			     wc_status);

		queue_work(system_long_wq, &target->tl_err_work);

	}

	target->qp_in_error = true;

}
@@ -1733,6 +1750,7 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event) 
		if (ib_send_cm_drep(cm_id, NULL, 0))

			shost_printk(KERN_ERR, target->scsi_host,

				     PFX "Sending CM DREP failed\n");

		queue_work(system_long_wq, &target->tl_err_work);

		break;



	case IB_CM_TIMEWAIT_EXIT:
@@ -2419,6 +2437,7 @@ static ssize_t srp_create_target(struct device *dev, 
			     sizeof (struct srp_indirect_buf) +

			     target->cmd_sg_cnt * sizeof (struct srp_direct_buf);



	INIT_WORK(&target->tl_err_work, srp_tl_err_work);

	INIT_WORK(&target->remove_work, srp_remove_work);

	spin_lock_init(&target->lock);

	INIT_LIST_HEAD(&target->free_tx);

drivers/infiniband/ulp/srp/ib_srp.h

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ struct srp_target_port { 
	struct srp_iu	       *rx_ring[SRP_RQ_SIZE];

	struct srp_request	req_ring[SRP_CMD_SQ_SIZE];



	struct work_struct	tl_err_work;

	struct work_struct	remove_work;



	struct list_head	list;