adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

IB/ehca: Fix error paths in post_send and post_recv

Browse source 
Always set bad_wr when an immediate error is detected.  Do not report
success if an error occurred.

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-09 15:07:25 -08:00 committed by Roland Dreier
parent 9420269428
commit e147de0361
1 changed files with 31 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
drivers/infiniband/hw/ehca/ehca_reqs.c
View file

@ -400,7 +400,6 @@ static inline void map_ib_wc_status(u32 cqe_status,
static inline int post_one_send(struct ehca_qp *my_qp, static inline int post_one_send(struct ehca_qp *my_qp,
struct ib_send_wr *cur_send_wr, struct ib_send_wr *cur_send_wr,
struct ib_send_wr **bad_send_wr,
int hidden) int hidden)
{ {
struct ehca_wqe *wqe_p; struct ehca_wqe *wqe_p;
@ -412,8 +411,6 @@ static inline int post_one_send(struct ehca_qp *my_qp,
wqe_p = ipz_qeit_get_inc(&my_qp->ipz_squeue); wqe_p = ipz_qeit_get_inc(&my_qp->ipz_squeue);
if (unlikely(!wqe_p)) { if (unlikely(!wqe_p)) {
/* too many posted work requests: queue overflow */ /* too many posted work requests: queue overflow */
if (bad_send_wr)
*bad_send_wr = cur_send_wr;
ehca_err(my_qp->ib_qp.device, "Too many posted WQEs " ehca_err(my_qp->ib_qp.device, "Too many posted WQEs "
"qp_num=%x", my_qp->ib_qp.qp_num); "qp_num=%x", my_qp->ib_qp.qp_num);
return -ENOMEM; return -ENOMEM;
@ -433,8 +430,6 @@ static inline int post_one_send(struct ehca_qp *my_qp,
*/ */
if (unlikely(ret)) { if (unlikely(ret)) {
my_qp->ipz_squeue.current_q_offset = start_offset; my_qp->ipz_squeue.current_q_offset = start_offset;
if (bad_send_wr)
*bad_send_wr = cur_send_wr;
ehca_err(my_qp->ib_qp.device, "Could not write WQE " ehca_err(my_qp->ib_qp.device, "Could not write WQE "
"qp_num=%x", my_qp->ib_qp.qp_num); "qp_num=%x", my_qp->ib_qp.qp_num);
return -EINVAL; return -EINVAL;
@ -448,7 +443,6 @@ int ehca_post_send(struct ib_qp *qp,
struct ib_send_wr **bad_send_wr) struct ib_send_wr **bad_send_wr)
{ {
struct ehca_qp *my_qp = container_of(qp, struct ehca_qp, ib_qp); struct ehca_qp *my_qp = container_of(qp, struct ehca_qp, ib_qp);
struct ib_send_wr *cur_send_wr;
int wqe_cnt = 0; int wqe_cnt = 0;
int ret = 0; int ret = 0;
unsigned long flags; unsigned long flags;
@ -457,7 +451,8 @@ int ehca_post_send(struct ib_qp *qp,
if (unlikely(my_qp->state < IB_QPS_RTS)) { if (unlikely(my_qp->state < IB_QPS_RTS)) {
ehca_err(qp->device, "Invalid QP state qp_state=%d qpn=%x", ehca_err(qp->device, "Invalid QP state qp_state=%d qpn=%x",
my_qp->state, qp->qp_num); my_qp->state, qp->qp_num);
return -EINVAL; ret = -EINVAL;
goto out;
} }
/* LOCK the QUEUE */ /* LOCK the QUEUE */
@ -476,24 +471,21 @@ int ehca_post_send(struct ib_qp *qp,
struct ib_send_wr circ_wr; struct ib_send_wr circ_wr;
memset(&circ_wr, 0, sizeof(circ_wr)); memset(&circ_wr, 0, sizeof(circ_wr));
circ_wr.opcode = IB_WR_RDMA_READ; circ_wr.opcode = IB_WR_RDMA_READ;
post_one_send(my_qp, &circ_wr, NULL, 1); /* ignore retcode */ post_one_send(my_qp, &circ_wr, 1); /* ignore retcode */
wqe_cnt++; wqe_cnt++;
ehca_dbg(qp->device, "posted circ wr qp_num=%x", qp->qp_num); ehca_dbg(qp->device, "posted circ wr qp_num=%x", qp->qp_num);
my_qp->message_count = my_qp->packet_count = 0; my_qp->message_count = my_qp->packet_count = 0;
} }
/* loop processes list of send reqs */ /* loop processes list of send reqs */
for (cur_send_wr = send_wr; cur_send_wr != NULL; while (send_wr) {
cur_send_wr = cur_send_wr->next) { ret = post_one_send(my_qp, send_wr, 0);
ret = post_one_send(my_qp, cur_send_wr, bad_send_wr, 0);
if (unlikely(ret)) { if (unlikely(ret)) {
/* if one or more WQEs were successful, don't fail */
if (wqe_cnt)
ret = 0;
goto post_send_exit0; goto post_send_exit0;
} }
wqe_cnt++; wqe_cnt++;
} /* eof for cur_send_wr */ send_wr = send_wr->next;
}
post_send_exit0: post_send_exit0:
iosync(); /* serialize GAL register access */ iosync(); /* serialize GAL register access */
@ -503,6 +495,10 @@ post_send_exit0:
my_qp, qp->qp_num, wqe_cnt, ret); my_qp, qp->qp_num, wqe_cnt, ret);
my_qp->message_count += wqe_cnt; my_qp->message_count += wqe_cnt;
spin_unlock_irqrestore(&my_qp->spinlock_s, flags); spin_unlock_irqrestore(&my_qp->spinlock_s, flags);
out:
if (ret)
*bad_send_wr = send_wr;
return ret; return ret;
} }
@ -511,7 +507,6 @@ static int internal_post_recv(struct ehca_qp *my_qp,
struct ib_recv_wr *recv_wr, struct ib_recv_wr *recv_wr,
struct ib_recv_wr **bad_recv_wr) struct ib_recv_wr **bad_recv_wr)
{ {
struct ib_recv_wr *cur_recv_wr;
struct ehca_wqe *wqe_p; struct ehca_wqe *wqe_p;
int wqe_cnt = 0; int wqe_cnt = 0;
int ret = 0; int ret = 0;
@ -522,27 +517,23 @@ static int internal_post_recv(struct ehca_qp *my_qp,
if (unlikely(!HAS_RQ(my_qp))) { if (unlikely(!HAS_RQ(my_qp))) {
ehca_err(dev, "QP has no RQ ehca_qp=%p qp_num=%x ext_type=%d", ehca_err(dev, "QP has no RQ ehca_qp=%p qp_num=%x ext_type=%d",
my_qp, my_qp->real_qp_num, my_qp->ext_type); my_qp, my_qp->real_qp_num, my_qp->ext_type);
return -ENODEV; ret = -ENODEV;
goto out;
} }
/* LOCK the QUEUE */ /* LOCK the QUEUE */
spin_lock_irqsave(&my_qp->spinlock_r, flags); spin_lock_irqsave(&my_qp->spinlock_r, flags);
/* loop processes list of send reqs */ /* loop processes list of recv reqs */
for (cur_recv_wr = recv_wr; cur_recv_wr != NULL; while (recv_wr) {
cur_recv_wr = cur_recv_wr->next) {
u64 start_offset = my_qp->ipz_rqueue.current_q_offset; u64 start_offset = my_qp->ipz_rqueue.current_q_offset;
/* get pointer next to free WQE */ /* get pointer next to free WQE */
wqe_p = ipz_qeit_get_inc(&my_qp->ipz_rqueue); wqe_p = ipz_qeit_get_inc(&my_qp->ipz_rqueue);
if (unlikely(!wqe_p)) { if (unlikely(!wqe_p)) {
/* too many posted work requests: queue overflow */ /* too many posted work requests: queue overflow */
if (bad_recv_wr) ret = -ENOMEM;
*bad_recv_wr = cur_recv_wr; ehca_err(dev, "Too many posted WQEs "
if (wqe_cnt == 0) { "qp_num=%x", my_qp->real_qp_num);
ret = -ENOMEM;
ehca_err(dev, "Too many posted WQEs "
"qp_num=%x", my_qp->real_qp_num);
}
goto post_recv_exit0; goto post_recv_exit0;
} }
/* /*
@ -552,7 +543,7 @@ static int internal_post_recv(struct ehca_qp *my_qp,
rq_map_idx = start_offset / my_qp->ipz_rqueue.qe_size; rq_map_idx = start_offset / my_qp->ipz_rqueue.qe_size;
/* write a RECV WQE into the QUEUE */ /* write a RECV WQE into the QUEUE */
ret = ehca_write_rwqe(&my_qp->ipz_rqueue, wqe_p, cur_recv_wr, ret = ehca_write_rwqe(&my_qp->ipz_rqueue, wqe_p, recv_wr,
rq_map_idx); rq_map_idx);
/* /*
* if something failed, * if something failed,
@ -560,22 +551,20 @@ static int internal_post_recv(struct ehca_qp *my_qp,
*/ */
if (unlikely(ret)) { if (unlikely(ret)) {
my_qp->ipz_rqueue.current_q_offset = start_offset; my_qp->ipz_rqueue.current_q_offset = start_offset;
*bad_recv_wr = cur_recv_wr; ret = -EINVAL;
if (wqe_cnt == 0) { ehca_err(dev, "Could not write WQE "
ret = -EINVAL; "qp_num=%x", my_qp->real_qp_num);
ehca_err(dev, "Could not write WQE "
"qp_num=%x", my_qp->real_qp_num);
}
goto post_recv_exit0; goto post_recv_exit0;
} }
qmap_entry = &my_qp->rq_map.map[rq_map_idx]; qmap_entry = &my_qp->rq_map.map[rq_map_idx];
qmap_entry->app_wr_id = get_app_wr_id(cur_recv_wr->wr_id); qmap_entry->app_wr_id = get_app_wr_id(recv_wr->wr_id);
qmap_entry->reported = 0; qmap_entry->reported = 0;
qmap_entry->cqe_req = 1; qmap_entry->cqe_req = 1;
wqe_cnt++; wqe_cnt++;
} /* eof for cur_recv_wr */ recv_wr = recv_wr->next;
} /* eof for recv_wr */
post_recv_exit0: post_recv_exit0:
iosync(); /* serialize GAL register access */ iosync(); /* serialize GAL register access */
@ -584,6 +573,11 @@ post_recv_exit0:
ehca_dbg(dev, "ehca_qp=%p qp_num=%x wqe_cnt=%d ret=%i", ehca_dbg(dev, "ehca_qp=%p qp_num=%x wqe_cnt=%d ret=%i",
my_qp, my_qp->real_qp_num, wqe_cnt, ret); my_qp, my_qp->real_qp_num, wqe_cnt, ret);
spin_unlock_irqrestore(&my_qp->spinlock_r, flags); spin_unlock_irqrestore(&my_qp->spinlock_r, flags);
out:
if (ret)
*bad_recv_wr = recv_wr;
return ret; return ret;
} }
@ -597,6 +591,7 @@ int ehca_post_recv(struct ib_qp *qp,
if (unlikely(my_qp->state == IB_QPS_RESET)) { if (unlikely(my_qp->state == IB_QPS_RESET)) {
ehca_err(qp->device, "Invalid QP state qp_state=%d qpn=%x", ehca_err(qp->device, "Invalid QP state qp_state=%d qpn=%x",
my_qp->state, qp->qp_num); my_qp->state, qp->qp_num);
*bad_recv_wr = recv_wr;
return -EINVAL; return -EINVAL;
} }