iser-target: Fix post_send_buf_count for RDMA READ/WRITE
This patch fixes the incorrect setting of ->post_send_buf_count related to RDMA WRITEs + READs where isert_rdma_rw->send_wr_num was not being taken into account. This includes incrementing ->post_send_buf_count within isert_put_datain() + isert_get_dataout(), decrementing within __isert_send_completion() + isert_response_completion(), and clearing wr->send_wr_num within isert_completion_rdma_read() This is necessary because even though IB_SEND_SIGNALED is not set for RDMA WRITEs + READs, during a QP failure event the work requests will be returned with exception status from the TX completion queue. Acked-by: Sagi Grimberg <sagig@mellanox.com> Cc: Or Gerlitz <ogerlitz@mellanox.com> Cc: <stable@vger.kernel.org> #3.10+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
parent
defd884845
commit
b6b87a1df6
|
@ -1549,6 +1549,7 @@ isert_completion_rdma_read(struct iser_tx_desc *tx_desc,
|
|||
iscsit_stop_dataout_timer(cmd);
|
||||
device->unreg_rdma_mem(isert_cmd, isert_conn);
|
||||
cmd->write_data_done = wr->cur_rdma_length;
|
||||
wr->send_wr_num = 0;
|
||||
|
||||
pr_debug("Cmd: %p RDMA_READ comp calling execute_cmd\n", isert_cmd);
|
||||
spin_lock_bh(&cmd->istate_lock);
|
||||
|
@ -1613,6 +1614,7 @@ isert_response_completion(struct iser_tx_desc *tx_desc,
|
|||
struct ib_device *ib_dev)
|
||||
{
|
||||
struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;
|
||||
struct isert_rdma_wr *wr = &isert_cmd->rdma_wr;
|
||||
|
||||
if (cmd->i_state == ISTATE_SEND_TASKMGTRSP ||
|
||||
cmd->i_state == ISTATE_SEND_LOGOUTRSP ||
|
||||
|
@ -1624,7 +1626,7 @@ isert_response_completion(struct iser_tx_desc *tx_desc,
|
|||
queue_work(isert_comp_wq, &isert_cmd->comp_work);
|
||||
return;
|
||||
}
|
||||
atomic_dec(&isert_conn->post_send_buf_count);
|
||||
atomic_sub(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
|
||||
|
||||
cmd->i_state = ISTATE_SENT_STATUS;
|
||||
isert_completion_put(tx_desc, isert_cmd, ib_dev);
|
||||
|
@ -1662,7 +1664,7 @@ __isert_send_completion(struct iser_tx_desc *tx_desc,
|
|||
case ISER_IB_RDMA_READ:
|
||||
pr_debug("isert_send_completion: Got ISER_IB_RDMA_READ:\n");
|
||||
|
||||
atomic_dec(&isert_conn->post_send_buf_count);
|
||||
atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
|
||||
isert_completion_rdma_read(tx_desc, isert_cmd);
|
||||
break;
|
||||
default:
|
||||
|
@ -2386,12 +2388,12 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsi_cmd *cmd)
|
|||
isert_init_send_wr(isert_conn, isert_cmd,
|
||||
&isert_cmd->tx_desc.send_wr, true);
|
||||
|
||||
atomic_inc(&isert_conn->post_send_buf_count);
|
||||
atomic_add(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
|
||||
|
||||
rc = ib_post_send(isert_conn->conn_qp, wr->send_wr, &wr_failed);
|
||||
if (rc) {
|
||||
pr_warn("ib_post_send() failed for IB_WR_RDMA_WRITE\n");
|
||||
atomic_dec(&isert_conn->post_send_buf_count);
|
||||
atomic_sub(wr->send_wr_num + 1, &isert_conn->post_send_buf_count);
|
||||
}
|
||||
pr_debug("Cmd: %p posted RDMA_WRITE + Response for iSER Data READ\n",
|
||||
isert_cmd);
|
||||
|
@ -2419,12 +2421,12 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsi_cmd *cmd, bool recovery)
|
|||
return rc;
|
||||
}
|
||||
|
||||
atomic_inc(&isert_conn->post_send_buf_count);
|
||||
atomic_add(wr->send_wr_num, &isert_conn->post_send_buf_count);
|
||||
|
||||
rc = ib_post_send(isert_conn->conn_qp, wr->send_wr, &wr_failed);
|
||||
if (rc) {
|
||||
pr_warn("ib_post_send() failed for IB_WR_RDMA_READ\n");
|
||||
atomic_dec(&isert_conn->post_send_buf_count);
|
||||
atomic_sub(wr->send_wr_num, &isert_conn->post_send_buf_count);
|
||||
}
|
||||
pr_debug("Cmd: %p posted RDMA_READ memory for ISER Data WRITE\n",
|
||||
isert_cmd);
|
||||
|
|
Loading…
Reference in a new issue