Commit 3104a217 authored by Erez Zilber's avatar Erez Zilber Committed by Roland Dreier

IB/iser: Handle aborting a command after it is sent

The SCSI midlayer may abort a command that was already sent.  If the
initiator is still trying to send the command (or data-out PDUs for
that command), the QP may time out after the midlayer times
out. Therefore, when aborting the command, iSER may still have
references for the command's buffers.  When sending these PDUs, the
sends will complete with an error and their resources will be released
then.
Signed-off-by: default avatarErez Zilber <erezz@voltaire.com>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 0264d885
...@@ -658,6 +658,7 @@ void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask) ...@@ -658,6 +658,7 @@ void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask)
{ {
int deferred; int deferred;
int is_rdma_aligned = 1; int is_rdma_aligned = 1;
struct iser_regd_buf *regd;
/* if we were reading, copy back to unaligned sglist, /* if we were reading, copy back to unaligned sglist,
* anyway dma_unmap and free the copy * anyway dma_unmap and free the copy
...@@ -672,20 +673,20 @@ void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask) ...@@ -672,20 +673,20 @@ void iser_ctask_rdma_finalize(struct iscsi_iser_cmd_task *iser_ctask)
} }
if (iser_ctask->dir[ISER_DIR_IN]) { if (iser_ctask->dir[ISER_DIR_IN]) {
deferred = iser_regd_buff_release regd = &iser_ctask->rdma_regd[ISER_DIR_IN];
(&iser_ctask->rdma_regd[ISER_DIR_IN]); deferred = iser_regd_buff_release(regd);
if (deferred) { if (deferred) {
iser_err("References remain for BUF-IN rdma reg\n"); iser_err("%d references remain for BUF-IN rdma reg\n",
BUG(); atomic_read(&regd->ref_count));
} }
} }
if (iser_ctask->dir[ISER_DIR_OUT]) { if (iser_ctask->dir[ISER_DIR_OUT]) {
deferred = iser_regd_buff_release regd = &iser_ctask->rdma_regd[ISER_DIR_OUT];
(&iser_ctask->rdma_regd[ISER_DIR_OUT]); deferred = iser_regd_buff_release(regd);
if (deferred) { if (deferred) {
iser_err("References remain for BUF-OUT rdma reg\n"); iser_err("%d references remain for BUF-OUT rdma reg\n",
BUG(); atomic_read(&regd->ref_count));
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment