apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

RDMA/cxgb3: Fix error paths in post_send and post_recv

Browse Source 
Always set bad_wr when an immediate error is detected.  Return ENOMEM
for queue full instead of EINVAL to match other drivers.

Signed-off-by: Frank Zago <fzago@systemfabricworks.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Frank Zago
2009-12-15 23:39:10 -08:00
committed by Roland Dreier
parent 3939b20f90
commit 48617f862f
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/infiniband/hw/cxgb3/iwch_qp.c
+20 -12
View File
@@ -365,18 +365,19 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
spin_lock_irqsave(&qhp->lock, flag); spin_lock_irqsave(&qhp->lock, flag);
if (qhp->attr.state > IWCH_QP_STATE_RTS) { if (qhp->attr.state > IWCH_QP_STATE_RTS) {
spin_unlock_irqrestore(&qhp->lock, flag); spin_unlock_irqrestore(&qhp->lock, flag);
return -EINVAL; err = -EINVAL;
goto out;
} }
num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr, num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr,
qhp->wq.sq_size_log2); qhp->wq.sq_size_log2);
if (num_wrs <= 0) { if (num_wrs <= 0) {
spin_unlock_irqrestore(&qhp->lock, flag); spin_unlock_irqrestore(&qhp->lock, flag);
return -ENOMEM; err = -ENOMEM;
goto out;
} }
while (wr) { while (wr) {
if (num_wrs == 0) { if (num_wrs == 0) {
err = -ENOMEM; err = -ENOMEM;
*bad_wr = wr;
break; break;
} }
idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2); idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2);
@@ -428,10 +429,8 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
wr->opcode); wr->opcode);
err = -EINVAL; err = -EINVAL;
} }
if (err) { if (err)
*bad_wr = wr;
break; break;
}
wqe->send.wrid.id0.hi = qhp->wq.sq_wptr; wqe->send.wrid.id0.hi = qhp->wq.sq_wptr;
sqp->wr_id = wr->wr_id; sqp->wr_id = wr->wr_id;
sqp->opcode = wr2opcode(t3_wr_opcode); sqp->opcode = wr2opcode(t3_wr_opcode);
@@ -454,6 +453,10 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
} }
spin_unlock_irqrestore(&qhp->lock, flag); spin_unlock_irqrestore(&qhp->lock, flag);
ring_doorbell(qhp->wq.doorbell, qhp->wq.qpid); ring_doorbell(qhp->wq.doorbell, qhp->wq.qpid);
out:
if (err)
*bad_wr = wr;
return err; return err;
} }
@@ -471,18 +474,19 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
spin_lock_irqsave(&qhp->lock, flag); spin_lock_irqsave(&qhp->lock, flag);
if (qhp->attr.state > IWCH_QP_STATE_RTS) { if (qhp->attr.state > IWCH_QP_STATE_RTS) {
spin_unlock_irqrestore(&qhp->lock, flag); spin_unlock_irqrestore(&qhp->lock, flag);
return -EINVAL; err = -EINVAL;
goto out;
} }
num_wrs = Q_FREECNT(qhp->wq.rq_rptr, qhp->wq.rq_wptr, num_wrs = Q_FREECNT(qhp->wq.rq_rptr, qhp->wq.rq_wptr,
qhp->wq.rq_size_log2) - 1; qhp->wq.rq_size_log2) - 1;
if (!wr) { if (!wr) {
spin_unlock_irqrestore(&qhp->lock, flag); spin_unlock_irqrestore(&qhp->lock, flag);
return -EINVAL; err = -ENOMEM;
goto out;
} }
while (wr) { while (wr) {
if (wr->num_sge > T3_MAX_SGE) { if (wr->num_sge > T3_MAX_SGE) {
err = -EINVAL; err = -EINVAL;
*bad_wr = wr;
break; break;
} }
idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2); idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2);
@@ -494,10 +498,10 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
err = build_zero_stag_recv(qhp, wqe, wr); err = build_zero_stag_recv(qhp, wqe, wr);
else else
err = -ENOMEM; err = -ENOMEM;
if (err) {
*bad_wr = wr; if (err)
break; break;
}
build_fw_riwrh((void *) wqe, T3_WR_RCV, T3_COMPLETION_FLAG, build_fw_riwrh((void *) wqe, T3_WR_RCV, T3_COMPLETION_FLAG,
Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2), Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2),
0, sizeof(struct t3_receive_wr) >> 3, T3_SOPEOP); 0, sizeof(struct t3_receive_wr) >> 3, T3_SOPEOP);
@@ -511,6 +515,10 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr,
} }
spin_unlock_irqrestore(&qhp->lock, flag); spin_unlock_irqrestore(&qhp->lock, flag);
ring_doorbell(qhp->wq.doorbell, qhp->wq.qpid); ring_doorbell(qhp->wq.doorbell, qhp->wq.qpid);
out:
if (err)
*bad_wr = wr;
return err; return err;
} }