RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC
Subsystems (3)
PATCH 1/1 RDMA/vmw_pvrdma: Fix network_hdr_type reported in WC
The PVRDMA device defines network_hdr_type according to an old definition of the rdma_network_type enum that has since changed, resulting in the wrong rdma_network_type being reported. Fix this by explicitly defining the enum used by the PVRDMA device and adding a function to convert the pvrdma_network_type to rdma_network_type enum.
---
Changelog:
- v0->v1: Moved new enum to uapi header and added Cc as per Jason.
--- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 14 ++++++++++++++ drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +- include/uapi/rdma/vmw_pvrdma-abi.h | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-)
drivers/infiniband/hw/vmw_pvrdma/pvrdma.h +14 -0
@@ -509,6 +509,20 @@ static inline int ib_send_flags_to_pvrdma(int flags)return flags &PVRDMA_MASK (PVRDMA_SEND_FLAGS_MAX ); } +static inline int pvrdma_network_type_to_ib (enum pvrdma_network_type type) +{ +switch (type) { +case PVRDMA_NETWORK_ROCE_V1 : +return RDMA_NETWORK_ROCE_V1 ; +case PVRDMA_NETWORK_IPV4 : +return RDMA_NETWORK_IPV4 ; +case PVRDMA_NETWORK_IPV6 : +return RDMA_NETWORK_IPV6 ; +default : +return RDMA_NETWORK_IPV6 ; + } +} +void pvrdma_qp_cap_to_ib (struct ib_qp_cap *dst,const struct pvrdma_qp_cap *src); void ib_qp_cap_to_pvrdma(struct pvrdma_qp_cap *dst,
drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c +1 -1
@@ -367,7 +367,7 @@ static int pvrdma_poll_one(struct pvrdma_cq *cq, struct pvrdma_qp **cur_qp, wc->dlid_path_bits = cqe->dlid_path_bits; wc->port_num = cqe->port_num; wc->vendor_err = cqe->vendor_err; - wc->network_hdr_type = cqe->network_hdr_type; + wc->network_hdr_type =pvrdma_network_type_to_ib (cqe->network_hdr_type);/* Update shared ring state */ pvrdma_idx_ring_inc (&cq->ring_state->rx.cons_head, cq->ibcq.cqe);
include/uapi/rdma/vmw_pvrdma-abi.h +7 -0
@@ -133,6 +133,13 @@ enum pvrdma_wc_flags { PVRDMA_WC_FLAGS_MAX = PVRDMA_WC_WITH_NETWORK_HDR_TYPE, }; +enum pvrdma_network_type { +PVRDMA_NETWORK_IB , +PVRDMA_NETWORK_ROCE_V1 =PVRDMA_NETWORK_IB , +PVRDMA_NETWORK_IPV4 , +PVRDMA_NETWORK_IPV6 +}; +struct pvrdma_alloc_ucontext_resp {__u32 qp_tab_size;__u32 reserved;
Signature · 1 line
2.14.1
Quoted 12 lines · Bryan Tan
The PVRDMA device defines
network_hdr_typeaccording to an old definition of therdma_network_typeenum that has since changed, resulting in the wrongrdma_network_typebeing reported. Fix this by explicitly defining the enum used by the PVRDMA device and adding a function to convert thepvrdma_network_typetordma_network_typeenum.Cc [email protected] # 5.10+Fixes 1c15b4f2a42f ("RDMA/core: Modify enum ib_gid_type and enum rdma_network_type")Reviewed-by Adit Ranadive <[email protected]>Signed-off-by Bryan Tan <[email protected]>---
Quoted 7 lines
Changelog:
-v0->v1: Moved new enum to uapi header and added Cc as per Jason.--- drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 14 ++++++++++++++ drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 2 +- include/uapi/rdma/vmw_pvrdma-abi.h | 7 +++++++ 3 files changed, 22 insertions(+), 1 deletion(-)
Applied to for-next, thanks
Jason