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

Commit 2d67017c authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/srpt: Micro-optimize I/O context state manipulation 



Since all I/O context state changes are already serialized, it is
not necessary to protect I/O context state changes with the I/O
context spinlock. Hence remove that spinlock.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent dd3bec86

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −15
Original line number Diff line number Diff line
@@ -764,15 +764,10 @@ static enum srpt_command_state srpt_set_cmd_state(struct srpt_send_ioctx *ioctx, 
						  enum srpt_command_state new)

{

	enum srpt_command_state previous;

	unsigned long flags;



	BUG_ON(!ioctx);



	spin_lock_irqsave(&ioctx->spinlock, flags);

	previous = ioctx->state;

	if (previous != SRPT_STATE_DONE)

		ioctx->state = new;

	spin_unlock_irqrestore(&ioctx->spinlock, flags);



	return previous;

}
@@ -790,17 +785,15 @@ static bool srpt_test_and_set_cmd_state(struct srpt_send_ioctx *ioctx, 
					enum srpt_command_state new)

{

	enum srpt_command_state previous;

	unsigned long flags;



	WARN_ON(!ioctx);

	WARN_ON(old == SRPT_STATE_DONE);

	WARN_ON(new == SRPT_STATE_NEW);



	spin_lock_irqsave(&ioctx->spinlock, flags);

	previous = ioctx->state;

	if (previous == old)

		ioctx->state = new;

	spin_unlock_irqrestore(&ioctx->spinlock, flags);



	return previous == old;

}
@@ -1170,7 +1163,6 @@ static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch) 
		return ioctx;



	BUG_ON(ioctx->ch != ch);

	spin_lock_init(&ioctx->spinlock);

	ioctx->state = SRPT_STATE_NEW;

	ioctx->n_rdma = 0;

	ioctx->n_rw_ctx = 0;
@@ -1192,7 +1184,6 @@ static struct srpt_send_ioctx *srpt_get_send_ioctx(struct srpt_rdma_ch *ch) 
static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx)

{

	enum srpt_command_state state;

	unsigned long flags;



	BUG_ON(!ioctx);
@@ -1201,7 +1192,6 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
	 * the ib_srpt driver, change the state to the next state.

	 */



	spin_lock_irqsave(&ioctx->spinlock, flags);

	state = ioctx->state;

	switch (state) {

	case SRPT_STATE_NEED_DATA:
@@ -1216,7 +1206,6 @@ static int srpt_abort_cmd(struct srpt_send_ioctx *ioctx) 
			  __func__, state);

		break;

	}

	spin_unlock_irqrestore(&ioctx->spinlock, flags);



	pr_debug("Aborting cmd with state %d -> %d and tag %lld\n", state,

		 ioctx->state, ioctx->cmd.tag);
@@ -2431,13 +2420,11 @@ static void srpt_queue_response(struct se_cmd *cmd) 
	struct ib_send_wr send_wr, *first_wr = &send_wr, *bad_wr;

	struct ib_sge sge;

	enum srpt_command_state state;

	unsigned long flags;

	int resp_len, ret, i;

	u8 srp_tm_status;



	BUG_ON(!ch);



	spin_lock_irqsave(&ioctx->spinlock, flags);

	state = ioctx->state;

	switch (state) {

	case SRPT_STATE_NEW:
@@ -2452,7 +2439,6 @@ static void srpt_queue_response(struct se_cmd *cmd) 
			ch, ioctx->ioctx.index, ioctx->state);

		break;

	}

	spin_unlock_irqrestore(&ioctx->spinlock, flags);



	if (unlikely(WARN_ON_ONCE(state == SRPT_STATE_CMD_RSP_SENT)))

		return;

drivers/infiniband/ulp/srpt/ib_srpt.h

+0 −2
Original line number Diff line number Diff line
@@ -195,7 +195,6 @@ struct srpt_rw_ctx { 
 * @rw_ctxs:     RDMA read/write contexts.

 * @rdma_cqe:    RDMA completion queue element.

 * @free_list:   Node in srpt_rdma_ch.free_list.

 * @spinlock:    Protects 'state'.

 * @state:       I/O context state.

 * @cmd:         Target core command data structure.

 * @sense_data:  SCSI sense data.
@@ -213,7 +212,6 @@ struct srpt_send_ioctx { 


	struct ib_cqe		rdma_cqe;

	struct list_head	free_list;

	spinlock_t		spinlock;

	enum srpt_command_state	state;

	struct se_cmd		cmd;

	u8			n_rdma;