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

Commit 51188ac2 authored by Bart Van Assche's avatar Bart Van Assche Committed by Greg Kroah-Hartman
Browse files

IB/srpt: Fix abort handling 




[ Upstream commit 55d694275f41a1c0eef4ef49044ff29bc3999490 ]

Let the target core check the CMD_T_ABORTED flag instead of the SRP
target driver. Hence remove the transport_check_aborted_status()
call. Since state == SRPT_STATE_CMD_RSP_SENT is something that really
should not happen, do not try to recover if srpt_queue_response() is
called for an I/O context that is in that state. This patch is a bug
fix because the srpt_abort_cmd() call is misplaced - if that function
is called from srpt_queue_response() it should either be called
before the command state is changed or after the response has been
sent.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Cc: Doug Ledford <dledford@redhat.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Andy Grover <agrover@redhat.com>
Cc: David Disseldorp <ddiss@suse.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5054873

drivers/infiniband/ulp/srpt/ib_srpt.c

+1 −5
Original line number Diff line number Diff line
@@ -2986,12 +2986,8 @@ static void srpt_queue_response(struct se_cmd *cmd) 
	}

	spin_unlock_irqrestore(&ioctx->spinlock, flags);



	if (unlikely(transport_check_aborted_status(&ioctx->cmd, false)

		     || WARN_ON_ONCE(state == SRPT_STATE_CMD_RSP_SENT))) {

		atomic_inc(&ch->req_lim_delta);

		srpt_abort_cmd(ioctx);

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

		return;

	}



	dir = ioctx->cmd.data_direction;