mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 19:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

ib_srpt: Avoid that cmd_wait_list processing triggers command reordering

Browse Source 
Although harmless for SCSI commands with SIMPLE ordering, avoid that commands
received before RTU can get reordered.


git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@5349 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2014-03-20 15:18:06 +00:00
parent f44bd8a7fa
commit 91358f846c
2 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
srpt/src/ib_srpt.c
View File

@@ -1837,11 +1837,12 @@ static u8 scst_to_srp_tsk_mgmt_status(const int scst_mgmt_status)
* @recv_ioctx: SRPT I/O context associated with the information unit.
* @context: SCST command processing context.
*/
static void srpt_handle_new_iu(struct srpt_rdma_ch *ch,
struct srpt_recv_ioctx *recv_ioctx,
struct srpt_send_ioctx *send_ioctx,
enum scst_exec_context context)
static struct srpt_send_ioctx *
srpt_handle_new_iu(struct srpt_rdma_ch *ch,
struct srpt_recv_ioctx *recv_ioctx,
enum scst_exec_context context)
{
struct srpt_send_ioctx *send_ioctx = NULL;
struct srp_cmd *srp_cmd;
BUG_ON(!ch);
@@ -1852,21 +1853,18 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch,
DMA_FROM_DEVICE);
srp_cmd = recv_ioctx->ioctx.buf;
if (unlikely(ch->state == CH_CONNECTING)) {
list_add_tail(&recv_ioctx->wait_list, &ch->cmd_wait_list);
goto out;
}
if (unlikely(ch->state == CH_CONNECTING))
goto push;
if (srp_cmd->opcode == SRP_CMD || srp_cmd->opcode == SRP_TSK_MGMT) {
if (!send_ioctx)
send_ioctx = srpt_get_send_ioctx(ch);
if (unlikely(!send_ioctx)) {
list_add_tail(&recv_ioctx->wait_list,
&ch->cmd_wait_list);
goto out;
}
send_ioctx = srpt_get_send_ioctx(ch);
if (unlikely(!send_ioctx))
goto push;
}
if (!list_empty(&recv_ioctx->wait_list))
list_del_init(&recv_ioctx->wait_list);
switch (srp_cmd->opcode) {
case SRP_CMD:
srpt_handle_cmd(ch, recv_ioctx, send_ioctx, context);
@@ -1893,8 +1891,15 @@ static void srpt_handle_new_iu(struct srpt_rdma_ch *ch,
}
srpt_post_recv(ch->sport->sdev, recv_ioctx);
out:
return;
return send_ioctx;
push:
if (list_empty(&recv_ioctx->wait_list))
list_add_tail(&recv_ioctx->wait_list,
&ch->cmd_wait_list);
goto out;
}
static void srpt_process_rcv_completion(struct ib_cq *cq,
@@ -1913,7 +1918,7 @@ static void srpt_process_rcv_completion(struct ib_cq *cq,
if (unlikely(req_lim < 0))
PRINT_ERROR("req_lim = %d < 0", req_lim);
ioctx = sdev->ioctx_ring[index];
srpt_handle_new_iu(ch, ioctx, NULL, srpt_new_iu_context);
srpt_handle_new_iu(ch, ioctx, srpt_new_iu_context);
} else {
PRINT_INFO("receiving failed for idx %u with status %d",
index, wc->status);
@@ -1923,17 +1928,16 @@ static void srpt_process_rcv_completion(struct ib_cq *cq,
static void srpt_process_wait_list(struct srpt_rdma_ch *ch)
{
struct srpt_recv_ioctx *recv_ioctx, *tmp;
struct srpt_send_ioctx *send_ioctx;
ch->processing_wait_list = true;
list_for_each_entry_safe(recv_ioctx, tmp, &ch->cmd_wait_list,
wait_list) {
send_ioctx = srpt_get_send_ioctx(ch);
if (!send_ioctx)
if (!srpt_handle_new_iu(ch, recv_ioctx, srpt_new_iu_context))
break;
list_del(&recv_ioctx->wait_list);
srpt_handle_new_iu(ch, recv_ioctx, send_ioctx,
srpt_new_iu_context);
}
ch->processing_wait_list = false;
}
/**
@@ -1991,7 +1995,8 @@ static void srpt_process_send_completion(struct ib_cq *cq,
}
if (unlikely(!list_empty(&ch->cmd_wait_list) &&
ch->state != CH_CONNECTING))
ch->state != CH_CONNECTING &&
!ch->processing_wait_list))
srpt_process_wait_list(ch);
}
@@ -3950,8 +3955,10 @@ static void srpt_add_one(struct ib_device *device)
goto err_event;
}
for (i = 0; i < sdev->srq_size; ++i)
for (i = 0; i < sdev->srq_size; ++i) {
INIT_LIST_HEAD(&sdev->ioctx_ring[i]->wait_list);
srpt_post_recv(sdev, sdev->ioctx_ring[i]);
}
WARN_ON(sdev->device->phys_port_cnt > ARRAY_SIZE(sdev->port));

2
srpt/src/ib_srpt.h
View File

@@ -318,6 +318,7 @@ enum rdma_ch_state {
* @ioctx_ring: Send I/O context ring.
* @wc: Work completion array.
* @state: channel state. See also enum rdma_ch_state.
* @processing_wait_list: Whether or not cmd_wait_list is being processed.
* @dreq_received: Whether an IB CM DREQ event has been received.
* @last_wqe_received: Whether the Last WQE QP event has been received.
* @list: node for insertion in the srpt_device.rch_list list.
@@ -353,6 +354,7 @@ struct srpt_rdma_ch {
struct list_head list;
struct list_head cmd_wait_list;
uint16_t pkey_index;
bool processing_wait_list;
bool dreq_received;
bool last_wqe_received;