Merge pull request #1743 from yishaih/mlx5_misc
mlx5: Fix inline-scatter source address on 128B CQE REQ completions
diff --git a/providers/mlx5/cq.c b/providers/mlx5/cq.c
index befacac..b2dd664 100644
--- a/providers/mlx5/cq.c
+++ b/providers/mlx5/cq.c
@@ -530,12 +530,10 @@
}
static inline int mlx5_get_next_cqe(struct mlx5_cq *cq,
- struct mlx5_cqe64 **pcqe64,
- void **pcqe)
+ struct mlx5_cqe64 **pcqe64)
ALWAYS_INLINE;
static inline int mlx5_get_next_cqe(struct mlx5_cq *cq,
- struct mlx5_cqe64 **pcqe64,
- void **pcqe)
+ struct mlx5_cqe64 **pcqe64)
{
void *cqe;
struct mlx5_cqe64 *cqe64;
@@ -568,7 +566,6 @@
}
#endif
*pcqe64 = cqe64;
- *pcqe = cqe;
return CQ_OK;
}
@@ -703,7 +700,6 @@
static inline int mlx5_parse_cqe(struct mlx5_cq *cq,
struct mlx5_cqe64 *cqe64,
- void *cqe,
struct mlx5_resource **cur_rsc,
struct mlx5_srq **cur_srq,
struct ibv_wc *wc,
@@ -711,7 +707,6 @@
ALWAYS_INLINE;
static inline int mlx5_parse_cqe(struct mlx5_cq *cq,
struct mlx5_cqe64 *cqe64,
- void *cqe,
struct mlx5_resource **cur_rsc,
struct mlx5_srq **cur_srq,
struct ibv_wc *wc,
@@ -778,10 +773,10 @@
scatter_out:
if (cqe64->op_own & MLX5_INLINE_SCATTER_32)
err = mlx5_copy_to_send_wqe(
- mqp, wqe_ctr, cqe, wc_byte_len);
+ mqp, wqe_ctr, cqe64, wc_byte_len);
else if (cqe64->op_own & MLX5_INLINE_SCATTER_64)
err = mlx5_copy_to_send_wqe(
- mqp, wqe_ctr, cqe - 1, wc_byte_len);
+ mqp, wqe_ctr, cqe64 - 1, wc_byte_len);
break;
}
@@ -794,11 +789,11 @@
handle_good_req(wc, cqe64, wq, idx);
if (cqe64->op_own & MLX5_INLINE_SCATTER_32)
- err = mlx5_copy_to_send_wqe(mqp, wqe_ctr, cqe,
+ err = mlx5_copy_to_send_wqe(mqp, wqe_ctr, cqe64,
wc->byte_len);
else if (cqe64->op_own & MLX5_INLINE_SCATTER_64)
err = mlx5_copy_to_send_wqe(
- mqp, wqe_ctr, cqe - 1, wc->byte_len);
+ mqp, wqe_ctr, cqe64 - 1, wc->byte_len);
wc->wr_id = wq->wrid[idx];
wc->status = err;
@@ -865,7 +860,7 @@
get_sig_err_info(sigerr_cqe, &mkey->sig->err_info);
pthread_mutex_unlock(&mctx->mkey_table_mutex);
- err = mlx5_get_next_cqe(cq, &cqe64, &cqe);
+ err = mlx5_get_next_cqe(cq, &cqe64);
/*
* CQ_POLL_NODATA indicates that CQ was not empty but the polled
* CQE was handled internally and should not processed by the
@@ -924,7 +919,7 @@
if (is_srq) {
if (is_odp_pfault_err(ecqe)) {
mlx5_complete_odp_fault(*cur_srq, wqe_ctr);
- err = mlx5_get_next_cqe(cq, &cqe64, &cqe);
+ err = mlx5_get_next_cqe(cq, &cqe64);
/* CQ_POLL_NODATA indicates that CQ was not empty but the polled CQE
* was handled internally and should not processed by the caller.
*/
@@ -964,13 +959,13 @@
static inline int mlx5_parse_lazy_cqe(struct mlx5_cq *cq,
struct mlx5_cqe64 *cqe64,
- void *cqe, int cqe_ver)
+ int cqe_ver)
ALWAYS_INLINE;
static inline int mlx5_parse_lazy_cqe(struct mlx5_cq *cq,
struct mlx5_cqe64 *cqe64,
- void *cqe, int cqe_ver)
+ int cqe_ver)
{
- return mlx5_parse_cqe(cq, cqe64, cqe, &cq->cur_rsc, &cq->cur_srq, NULL, cqe_ver, 1);
+ return mlx5_parse_cqe(cq, cqe64, &cq->cur_rsc, &cq->cur_srq, NULL, cqe_ver, 1);
}
static inline int mlx5_poll_one(struct mlx5_cq *cq,
@@ -984,14 +979,13 @@
struct ibv_wc *wc, int cqe_ver)
{
struct mlx5_cqe64 *cqe64;
- void *cqe;
int err;
- err = mlx5_get_next_cqe(cq, &cqe64, &cqe);
+ err = mlx5_get_next_cqe(cq, &cqe64);
if (err == CQ_EMPTY)
return err;
- return mlx5_parse_cqe(cq, cqe64, cqe, cur_rsc, cur_srq, wc, cqe_ver, 0);
+ return mlx5_parse_cqe(cq, cqe64, cur_rsc, cur_srq, wc, cqe_ver, 0);
}
static inline int poll_cq(struct ibv_cq *ibcq, int ne,
@@ -1103,7 +1097,6 @@
{
struct mlx5_cq *cq = to_mcq(ibv_cq_ex_to_cq(ibcq));
struct mlx5_cqe64 *cqe64;
- void *cqe;
int err;
if (unlikely(attr->comp_mask))
@@ -1125,7 +1118,7 @@
cq->cur_rsc = NULL;
cq->cur_srq = NULL;
- err = mlx5_get_next_cqe(cq, &cqe64, &cqe);
+ err = mlx5_get_next_cqe(cq, &cqe64);
if (err == CQ_EMPTY) {
if (lock)
mlx5_spin_unlock(&cq->lock);
@@ -1146,7 +1139,7 @@
if (stall)
cq->flags |= MLX5_CQ_FLAGS_FOUND_CQES;
- err = mlx5_parse_lazy_cqe(cq, cqe64, cqe, cqe_version);
+ err = mlx5_parse_lazy_cqe(cq, cqe64, cqe_version);
if (lock && err)
mlx5_spin_unlock(&cq->lock);
@@ -1181,10 +1174,9 @@
{
struct mlx5_cq *cq = to_mcq(ibv_cq_ex_to_cq(ibcq));
struct mlx5_cqe64 *cqe64;
- void *cqe;
int err;
- err = mlx5_get_next_cqe(cq, &cqe64, &cqe);
+ err = mlx5_get_next_cqe(cq, &cqe64);
if (err == CQ_EMPTY) {
if (stall == POLLING_MODE_STALL_ADAPTIVE)
cq->flags |= MLX5_CQ_FLAGS_EMPTY_DURING_POLL;
@@ -1192,7 +1184,7 @@
return ENOENT;
}
- return mlx5_parse_lazy_cqe(cq, cqe64, cqe, cqe_version);
+ return mlx5_parse_lazy_cqe(cq, cqe64, cqe_version);
}
static inline int mlx5_next_poll_adaptive_v0(struct ibv_cq_ex *ibcq)
