RDMA/vmw_pvrdma: Return the correct opcode when creating WR
Subsystems (3)
PATCH v2 1/1 RDMA/vmw_pvrdma: Return the correct opcode when creating WR
From: Adit Ranadive <[email protected]>
Since the IB_WR_REG_MR opcode value changed, let's set the PVRDMA device opcodes explicitly.
Reported-by Ruishuang Wang <[email protected]>
Fixes 9a59739bd01f ("IB/rxe: Revise the ib_wr_opcode enum")
Reviewed-by Bryan Tan <[email protected]>
Reviewed-by Ruishuang Wang <[email protected]>
Reviewed-by Vishnu Dasa <[email protected]>
Signed-off-by Adit Ranadive <[email protected]>
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 35 +++++++++++++++++++++++++++- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +++++ include/uapi/rdma/vmw_pvrdma-abi.h | 1 + 3 files changed, 41 insertions(+), 1 deletion(-)
drivers/infiniband/hw/vmw_pvrdma/pvrdma.h +34 -1
@@ -427,7 +427,40 @@ static inline enum ib_qp_state pvrdma_qp_state_to_ib(enum pvrdma_qp_state state)static inline enum pvrdma_wr_opcode ib_wr_opcode_to_pvrdma (enum ib_wr_opcode op) { -return (enum pvrdma_wr_opcode )op; +switch (op) { +case IB_WR_RDMA_WRITE : +return PVRDMA_WR_RDMA_WRITE ; +case IB_WR_RDMA_WRITE_WITH_IMM : +return PVRDMA_WR_RDMA_WRITE_WITH_IMM ; +case IB_WR_SEND : +return PVRDMA_WR_SEND ; +case IB_WR_SEND_WITH_IMM : +return PVRDMA_WR_SEND_WITH_IMM ; +case IB_WR_RDMA_READ : +return PVRDMA_WR_RDMA_READ ; +case IB_WR_ATOMIC_CMP_AND_SWP : +return PVRDMA_WR_ATOMIC_CMP_AND_SWP ; +case IB_WR_ATOMIC_FETCH_AND_ADD : +return PVRDMA_WR_ATOMIC_FETCH_AND_ADD ; +case IB_WR_LSO : +return PVRDMA_WR_LSO ; +case IB_WR_SEND_WITH_INV : +return PVRDMA_WR_SEND_WITH_INV ; +case IB_WR_RDMA_READ_WITH_INV : +return PVRDMA_WR_RDMA_READ_WITH_INV ; +case IB_WR_LOCAL_INV : +return PVRDMA_WR_LOCAL_INV ; +case IB_WR_REG_MR : +return PVRDMA_WR_FAST_REG_MR ; +case IB_WR_MASKED_ATOMIC_CMP_AND_SWP : +return PVRDMA_WR_MASKED_ATOMIC_CMP_AND_SWP ; +case IB_WR_MASKED_ATOMIC_FETCH_AND_ADD : +return PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD ; +case IB_WR_REG_SIG_MR : +return PVRDMA_WR_REG_SIG_MR ; +default : +return PVRDMA_WR_ERROR ; + } } static inline enum ib_wc_status pvrdma_wc_status_to_ib(
drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c +6 -0
@@ -721,6 +721,12 @@ int pvrdma_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr, wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) wqe_hdr->ex.imm_data = wr->ex.imm_data; +if (unlikely (wqe_hdr->opcode ==PVRDMA_WR_ERROR )) { + *bad_wr = wr; + ret = -EINVAL ; + goto out; + } +switch (qp->ibqp.qp_type) {case IB_QPT_GSI :case IB_QPT_UD :
include/uapi/rdma/vmw_pvrdma-abi.h +1 -0
@@ -78,6 +78,7 @@ enum pvrdma_wr_opcode {PVRDMA_WR_MASKED_ATOMIC_FETCH_AND_ADD ,PVRDMA_WR_BIND_MW ,PVRDMA_WR_REG_SIG_MR , + PVRDMA_WR_ERROR, }; enum pvrdma_wc_status {
Signature · 1 line
1.8.3.1
Jason Gunthorpe
AppliedQuoted 12 lines · Adit Ranadive
From: Adit Ranadive <[email protected]>
Since the
IB_WR_REG_MRopcode value changed, let's set the PVRDMA device opcodes explicitly.Reported-by Ruishuang Wang <[email protected]>Fixes 9a59739bd01f ("IB/rxe: Revise the ib_wr_opcode enum")Reviewed-by Bryan Tan <[email protected]>Reviewed-by Ruishuang Wang <[email protected]>Reviewed-by Vishnu Dasa <[email protected]>Signed-off-by Adit Ranadive <[email protected]>
Quoted 5 lines
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 35 +++++++++++++++++++++++++++- drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +++++ include/uapi/rdma/vmw_pvrdma-abi.h | 1 + 3 files changed, 41 insertions(+), 1 deletion(-)
Applied to for-rc, thanks
Jason