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

Commit 33912d73 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/srpt: Inline srpt_get_ch_state() 



The callers of srpt_get_ch_state() can access ch->state safely without
using locking. Hence inline this function.

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

drivers/infiniband/ulp/srpt/ib_srpt.c

+12 −30
Original line number Diff line number Diff line
@@ -109,17 +109,6 @@ enum dma_data_direction opposite_dma_dir(enum dma_data_direction dir) 
	}

}



static enum rdma_ch_state srpt_get_ch_state(struct srpt_rdma_ch *ch)

{

	unsigned long flags;

	enum rdma_ch_state state;



	spin_lock_irqsave(&ch->spinlock, flags);

	state = ch->state;

	spin_unlock_irqrestore(&ch->spinlock, flags);

	return state;

}



static enum rdma_ch_state

srpt_set_ch_state(struct srpt_rdma_ch *ch, enum rdma_ch_state new_state)

{
@@ -216,7 +205,7 @@ static void srpt_srq_event(struct ib_event *event, void *ctx) 
static void srpt_qp_event(struct ib_event *event, struct srpt_rdma_ch *ch)

{

	pr_debug("QP event %d on cm_id=%p sess_name=%s state=%d\n",

		 event->event, ch->cm_id, ch->sess_name, srpt_get_ch_state(ch));

		 event->event, ch->cm_id, ch->sess_name, ch->state);



	switch (event->event) {

	case IB_EVENT_COMM_EST:
@@ -228,7 +217,7 @@ static void srpt_qp_event(struct ib_event *event, struct srpt_rdma_ch *ch) 
			srpt_release_channel(ch);

		else

			pr_debug("%s: state %d - ignored LAST_WQE.\n",

				 ch->sess_name, srpt_get_ch_state(ch));

				 ch->sess_name, ch->state);

		break;

	default:

		pr_err("received unrecognized IB QP event %d\n", event->event);
@@ -1733,7 +1722,6 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch, 
			       struct srpt_send_ioctx *send_ioctx)

{

	struct srp_cmd *srp_cmd;

	enum rdma_ch_state ch_state;



	BUG_ON(!ch);

	BUG_ON(!recv_ioctx);
@@ -1742,13 +1730,12 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch, 
				   recv_ioctx->ioctx.dma, srp_max_req_size,

				   DMA_FROM_DEVICE);



	ch_state = srpt_get_ch_state(ch);

	if (unlikely(ch_state == CH_CONNECTING)) {

	if (unlikely(ch->state == CH_CONNECTING)) {

		list_add_tail(&recv_ioctx->wait_list, &ch->cmd_wait_list);

		goto out;

	}



	if (unlikely(ch_state != CH_LIVE))

	if (unlikely(ch->state != CH_LIVE))

		goto out;



	srp_cmd = recv_ioctx->ioctx.buf;
@@ -1857,7 +1844,7 @@ static void srpt_send_done(struct ib_cq *cq, struct ib_wc *wc) 


out:

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

	       srpt_get_ch_state(ch) == CH_LIVE &&

	       ch->state == CH_LIVE &&

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

		struct srpt_recv_ioctx *recv_ioctx;
@@ -2238,17 +2225,14 @@ static int srpt_cm_req_recv(struct ib_cm_id *cm_id, 
			    && param->port == ch->sport->port

			    && param->listen_id == ch->sport->sdev->cm_id

			    && ch->cm_id) {

				enum rdma_ch_state ch_state;



				ch_state = srpt_get_ch_state(ch);

				if (ch_state != CH_CONNECTING

				    && ch_state != CH_LIVE)

				if (ch->state != CH_CONNECTING

				    && ch->state != CH_LIVE)

					continue;



				/* found an existing channel */

				pr_debug("Found existing channel %s"

					 " cm_id= %p state= %d\n",

					 ch->sess_name, ch->cm_id, ch_state);

					 ch->sess_name, ch->cm_id, ch->state);



				__srpt_close_ch(ch);
@@ -2499,7 +2483,7 @@ static void srpt_cm_dreq_recv(struct ib_cm_id *cm_id) 
	ch = srpt_find_channel(cm_id->context, cm_id);

	BUG_ON(!ch);



	pr_debug("cm_id= %p ch->state= %d\n", cm_id, srpt_get_ch_state(ch));

	pr_debug("cm_id= %p ch->state= %d\n", cm_id, ch->state);



	spin_lock_irqsave(&ch->spinlock, flags);

	switch (ch->state) {
@@ -2691,7 +2675,6 @@ static int srpt_write_pending(struct se_cmd *se_cmd) 
	struct srpt_rdma_ch *ch;

	struct srpt_send_ioctx *ioctx;

	enum srpt_command_state new_state;

	enum rdma_ch_state ch_state;

	int ret;



	ioctx = container_of(se_cmd, struct srpt_send_ioctx, cmd);
@@ -2702,10 +2685,9 @@ static int srpt_write_pending(struct se_cmd *se_cmd) 
	ch = ioctx->ch;

	BUG_ON(!ch);



	ch_state = srpt_get_ch_state(ch);

	switch (ch_state) {

	switch (ch->state) {

	case CH_CONNECTING:

		WARN(true, "unexpected channel state %d\n", ch_state);

		WARN(true, "unexpected channel state %d\n", ch->state);

		ret = -EINVAL;

		goto out;

	case CH_LIVE:
@@ -3171,7 +3153,7 @@ static void srpt_close_session(struct se_session *se_sess) 
	ch = se_sess->fabric_sess_ptr;

	WARN_ON(ch->sess != se_sess);



	pr_debug("ch %p state %d\n", ch, srpt_get_ch_state(ch));

	pr_debug("ch %p state %d\n", ch, ch->state);



	sdev = ch->sport->sdev;

	spin_lock_irq(&sdev->spinlock);