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

Commit 539b3248 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/srpt: Introduce srpt_process_wait_list() 



This patch does not change any functionality.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAlex Estrin <alex.estrin@intel.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 043a6806

drivers/infiniband/ulp/srpt/ib_srpt.c

+24 −18
Original line number Original line Diff line number Diff line
@@ -1730,6 +1730,28 @@ static void srpt_recv_done(struct ib_cq *cq, struct ib_wc *wc) 
	}

	}

}

}





/*

 * This function must be called from the context in which RDMA completions are

 * processed because it accesses the wait list without protection against

 * access from other threads.

 */

static void srpt_process_wait_list(struct srpt_rdma_ch *ch)

{

	struct srpt_send_ioctx *ioctx;



	while (!list_empty(&ch->cmd_wait_list) &&

	       ch->state >= CH_LIVE &&

	       (ioctx = srpt_get_send_ioctx(ch)) != NULL) {

		struct srpt_recv_ioctx *recv_ioctx;



		recv_ioctx = list_first_entry(&ch->cmd_wait_list,

					      struct srpt_recv_ioctx,

					      wait_list);

		list_del(&recv_ioctx->wait_list);

		srpt_handle_new_iu(ch, recv_ioctx, ioctx);

	}

}



/**

/**

 * Note: Although this has not yet been observed during tests, at least in

 * Note: Although this has not yet been observed during tests, at least in

 * theory it is possible that the srpt_get_send_ioctx() call invoked by

 * theory it is possible that the srpt_get_send_ioctx() call invoked by
@@ -1769,17 +1791,7 @@ static void srpt_send_done(struct ib_cq *cq, struct ib_wc *wc) 
		       " wr_id = %u.\n", ioctx->ioctx.index);

		       " wr_id = %u.\n", ioctx->ioctx.index);

	}

	}





	while (!list_empty(&ch->cmd_wait_list) &&

	srpt_process_wait_list(ch);

	       ch->state == CH_LIVE &&

	       (ioctx = srpt_get_send_ioctx(ch)) != NULL) {

		struct srpt_recv_ioctx *recv_ioctx;



		recv_ioctx = list_first_entry(&ch->cmd_wait_list,

					      struct srpt_recv_ioctx,

					      wait_list);

		list_del(&recv_ioctx->wait_list);

		srpt_handle_new_iu(ch, recv_ioctx, ioctx);

	}

}

}





/**

/**
@@ -2310,15 +2322,9 @@ static void srpt_cm_rtu_recv(struct srpt_rdma_ch *ch) 
	int ret;

	int ret;





	if (srpt_set_ch_state(ch, CH_LIVE)) {

	if (srpt_set_ch_state(ch, CH_LIVE)) {

		struct srpt_recv_ioctx *ioctx, *ioctx_tmp;



		ret = srpt_ch_qp_rts(ch, ch->qp);

		ret = srpt_ch_qp_rts(ch, ch->qp);





		list_for_each_entry_safe(ioctx, ioctx_tmp, &ch->cmd_wait_list,

		srpt_process_wait_list(ch);

					 wait_list) {

			list_del(&ioctx->wait_list);

			srpt_handle_new_iu(ch, ioctx, NULL);

		}

		if (ret)

		if (ret)

			srpt_close_ch(ch);

			srpt_close_ch(ch);

	}

	}