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

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

IB/srp: Introduce srp_handle_qp_err() 



Introduce the function srp_handle_qp_err(), change the type of
qp_in_error from int into bool and move the initialization of that
variable from srp_reconnect_target() to srp_connect_target().

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 224db157

drivers/infiniband/ulp/srp/ib_srp.c

+20 −17
Original line number Original line Diff line number Diff line
@@ -515,6 +515,8 @@ static int srp_connect_target(struct srp_target_port *target) 
	int retries = 3;

	int retries = 3;

	int ret;

	int ret;





	target->qp_in_error = false;



	ret = srp_lookup_path(target);

	ret = srp_lookup_path(target);

	if (ret)

	if (ret)

		return ret;

		return ret;
@@ -689,7 +691,6 @@ static int srp_reconnect_target(struct srp_target_port *target) 
	for (i = 0; i < SRP_SQ_SIZE; ++i)

	for (i = 0; i < SRP_SQ_SIZE; ++i)

		list_add(&target->tx_ring[i]->list, &target->free_tx);

		list_add(&target->tx_ring[i]->list, &target->free_tx);





	target->qp_in_error = 0;

	ret = srp_connect_target(target);

	ret = srp_connect_target(target);





unblock:

unblock:
@@ -1269,6 +1270,15 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc) 
			     PFX "Recv failed with error code %d\n", res);

			     PFX "Recv failed with error code %d\n", res);

}

}





static void srp_handle_qp_err(enum ib_wc_status wc_status,

			      enum ib_wc_opcode wc_opcode,

			      struct srp_target_port *target)

{

	shost_printk(KERN_ERR, target->scsi_host, PFX "failed %s status %d\n",

		     wc_opcode & IB_WC_RECV ? "receive" : "send", wc_status);

	target->qp_in_error = true;

}



static void srp_recv_completion(struct ib_cq *cq, void *target_ptr)

static void srp_recv_completion(struct ib_cq *cq, void *target_ptr)

{

{

	struct srp_target_port *target = target_ptr;

	struct srp_target_port *target = target_ptr;
@@ -1276,15 +1286,12 @@ static void srp_recv_completion(struct ib_cq *cq, void *target_ptr) 




	ib_req_notify_cq(cq, IB_CQ_NEXT_COMP);

	ib_req_notify_cq(cq, IB_CQ_NEXT_COMP);

	while (ib_poll_cq(cq, 1, &wc) > 0) {

	while (ib_poll_cq(cq, 1, &wc) > 0) {

		if (wc.status) {

		if (likely(wc.status == IB_WC_SUCCESS)) {

			shost_printk(KERN_ERR, target->scsi_host,

			srp_handle_recv(target, &wc);

				     PFX "failed receive status %d\n",

		} else {

				     wc.status);

			srp_handle_qp_err(wc.status, wc.opcode, target);

			target->qp_in_error = 1;

			break;

			break;

		}

		}



		srp_handle_recv(target, &wc);

	}

	}

}

}
@@ -1295,16 +1302,13 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr) 
	struct srp_iu *iu;

	struct srp_iu *iu;





	while (ib_poll_cq(cq, 1, &wc) > 0) {

	while (ib_poll_cq(cq, 1, &wc) > 0) {

		if (wc.status) {

		if (likely(wc.status == IB_WC_SUCCESS)) {

			shost_printk(KERN_ERR, target->scsi_host,

				     PFX "failed send status %d\n",

				     wc.status);

			target->qp_in_error = 1;

			break;

		}



			iu = (struct srp_iu *) (uintptr_t) wc.wr_id;

			iu = (struct srp_iu *) (uintptr_t) wc.wr_id;

			list_add(&iu->list, &target->free_tx);

			list_add(&iu->list, &target->free_tx);

		} else {

			srp_handle_qp_err(wc.status, wc.opcode, target);

			break;

		}

	}

	}

}

}
@@ -2269,7 +2273,6 @@ static ssize_t srp_create_target(struct device *dev, 
	if (ret)

	if (ret)

		goto err_free_ib;

		goto err_free_ib;





	target->qp_in_error = 0;

	ret = srp_connect_target(target);

	ret = srp_connect_target(target);

	if (ret) {

	if (ret) {

		shost_printk(KERN_ERR, target->scsi_host,

		shost_printk(KERN_ERR, target->scsi_host,

drivers/infiniband/ulp/srp/ib_srp.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -179,7 +179,7 @@ struct srp_target_port { 
	struct list_head	list;

	struct list_head	list;

	struct completion	done;

	struct completion	done;

	int			status;

	int			status;

	int			qp_in_error;

	bool			qp_in_error;





	struct completion	tsk_mgmt_done;

	struct completion	tsk_mgmt_done;

	u8			tsk_mgmt_status;

	u8			tsk_mgmt_status;