| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Bart Van Assche <bart.vanassche@sandisk.com> |
| Date: Thu, 4 May 2017 15:50:53 -0700 |
| Subject: IB/srpt: Fix abort handling |
| |
| From: Bart Van Assche <bart.vanassche@sandisk.com> |
| |
| |
| [ 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: Bart Van Assche <bart.vanassche@sandisk.com> |
| Reviewed-by: Hannes 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: Nicholas Bellinger <nab@linux-iscsi.org> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/infiniband/ulp/srpt/ib_srpt.c | 6 +----- |
| 1 file changed, 1 insertion(+), 5 deletions(-) |
| |
| --- a/drivers/infiniband/ulp/srpt/ib_srpt.c |
| +++ b/drivers/infiniband/ulp/srpt/ib_srpt.c |
| @@ -2292,12 +2292,8 @@ static void srpt_queue_response(struct s |
| } |
| 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; |
| - } |
| |
| /* For read commands, transfer the data to the initiator. */ |
| if (ioctx->cmd.data_direction == DMA_FROM_DEVICE && |
