Implement the xrc transport
Subsystems (2)
v2 cover Implement the xrc transport
This patch series implements the xrc transport for the rdma_rxe driver. It is based on the current for-next branch of rdma-linux. The first two patches in the series do some cleanup which is helpful for this effort. The remaining patches implement the xrc functionality. There is a matching patch set for the user space rxe provider driver. The communications between these is accomplished without making an ABI change by taking advantage of the space freed up by a recent patch called "Remove redundant num_sge fields" which is a reprequisite for this patch series.
The two patch sets have been tested with the pyverbs regression test suite with and without each set installed. This series enables 5 of the 6 xrc test cases in pyverbs. The ODP case does is currently skipped but should work once the ODP patch series is accepted.
---
v2
Rebased to current for-next
Bob Pearson (13):
RDMA/rxe: Replace START->FIRST, END->LAST RDMA/rxe: Move next_opcode() to rxe_opcode.c
RDMA: Add xrc opcodes to ib_pack.h RDMA/rxe: Extend opcodes and headers to support xrc RDMA/rxe: Add xrc opcodes to next_opcode() RDMA/rxe: Implement open_xrcd and close_xrcd RDMA/rxe: Extend srq verbs to support xrcd RDMA/rxe: Extend rxe_qp.c to support xrc qps RDMA/rxe: Extend rxe_recv.c to support xrc RDMA/rxe: Extend rxe_comp.c to support xrc qps RDMA/rxe: Extend rxe_req.c to support xrc qps RDMA/rxe: Extend rxe_net.c to support xrc qps RDMA/rxe: Extend rxe_resp.c to support xrc qps
drivers/infiniband/sw/rxe/rxe.c | 2 + drivers/infiniband/sw/rxe/rxe_av.c | 3 +- drivers/infiniband/sw/rxe/rxe_comp.c | 51 +- drivers/infiniband/sw/rxe/rxe_hdr.h | 41 +- drivers/infiniband/sw/rxe/rxe_loc.h | 13 +- drivers/infiniband/sw/rxe/rxe_mw.c | 14 +- drivers/infiniband/sw/rxe/rxe_net.c | 23 +- drivers/infiniband/sw/rxe/rxe_opcode.c | 766 +++++++++++++++++++++---- drivers/infiniband/sw/rxe/rxe_opcode.h | 9 +- drivers/infiniband/sw/rxe/rxe_param.h | 3 + drivers/infiniband/sw/rxe/rxe_pool.c | 8 + drivers/infiniband/sw/rxe/rxe_pool.h | 1 + drivers/infiniband/sw/rxe/rxe_qp.c | 308 ++++++---- drivers/infiniband/sw/rxe/rxe_recv.c | 79 ++- drivers/infiniband/sw/rxe/rxe_req.c | 204 +------ drivers/infiniband/sw/rxe/rxe_resp.c | 168 ++++-- drivers/infiniband/sw/rxe/rxe_srq.c | 131 +++-- drivers/infiniband/sw/rxe/rxe_verbs.c | 57 +- drivers/infiniband/sw/rxe/rxe_verbs.h | 20 +- include/rdma/ib_pack.h | 32 +- include/uapi/rdma/rdma_user_rxe.h | 4 +- 21 files changed, 1341 insertions(+), 596 deletions(-)
base-commit: cbdae01d8b517b81ed271981395fee8ebd08ba7d
Signature · 1 line
2.34.1
PATCH v2 1/13 RDMA/rxe: Replace START->FIRST, END->LAST
Replace RXE_START_MASK by RXE_FIRST_MASK, RXE_END_MASK by RXE_LAST_MASK and add RXE_ONLY_MASK = FIRST | LAST to match normal IBA usage.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 6 +- drivers/infiniband/sw/rxe/rxe_net.c | 2 +- drivers/infiniband/sw/rxe/rxe_opcode.c | 143 +++++++++++-------------- drivers/infiniband/sw/rxe/rxe_opcode.h | 5 +- drivers/infiniband/sw/rxe/rxe_req.c | 10 +- drivers/infiniband/sw/rxe/rxe_resp.c | 4 +- 6 files changed, 76 insertions(+), 94 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +3 -3
@@ -221,7 +221,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,switch (qp->comp.opcode) {case -1 :/* Will catch all *_ONLY cases. */ -if (!(mask &RXE_START_MASK )) +if (!(mask &RXE_FIRST_MASK ))return COMPST_ERROR ;break ;
@@ -354,7 +354,7 @@ static inline enum comp_state do_read(struct rxe_qp *qp,return COMPST_ERROR ; } -if (wqe->dma.resid ==0 && (pkt->mask &RXE_END_MASK )) +if (wqe->dma.resid ==0 && (pkt->mask &RXE_LAST_MASK ))return COMPST_COMP_ACK ;return COMPST_UPDATE_COMP ;
@@ -636,7 +636,7 @@ int rxe_completer(void *arg)break ;case COMPST_UPDATE_COMP : -if (pkt->mask &RXE_END_MASK ) +if (pkt->mask &RXE_LAST_MASK ) qp->comp.opcode =-1 ;else qp->comp.opcode = pkt->opcode;
drivers/infiniband/sw/rxe/rxe_net.c +1 -1
@@ -428,7 +428,7 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt, }if ((qp_type (qp) !=IB_QPT_RC ) && - (pkt->mask &RXE_END_MASK )) { + (pkt->mask &RXE_LAST_MASK )) { pkt->wqe->state = wqe_state_done;rxe_run_task (&qp->comp.task,1 ); }
drivers/infiniband/sw/rxe/rxe_opcode.c +62 -81
455 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_opcode.h +3 -2
@@ -75,9 +75,10 @@ enum rxe_hdr_mask {RXE_RWR_MASK =BIT (NUM_HDR_TYPES +6 ),RXE_COMP_MASK =BIT (NUM_HDR_TYPES +7 ), -RXE_START_MASK =BIT (NUM_HDR_TYPES +8 ), +RXE_FIRST_MASK =BIT (NUM_HDR_TYPES +8 ),RXE_MIDDLE_MASK =BIT (NUM_HDR_TYPES +9 ), -RXE_END_MASK =BIT (NUM_HDR_TYPES +10 ), +RXE_LAST_MASK =BIT (NUM_HDR_TYPES +10 ), +RXE_ONLY_MASK =RXE_FIRST_MASK |RXE_LAST_MASK , RXE_LOOPBACK_MASK = BIT(NUM_HDR_TYPES + 12),
drivers/infiniband/sw/rxe/rxe_req.c +5 -5
@@ -403,7 +403,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,/* init bth */ solicited = (ibwr->send_flags &IB_SEND_SOLICITED ) && - (pkt->mask &RXE_END_MASK ) && + (pkt->mask &RXE_LAST_MASK ) && ((pkt->mask & (RXE_SEND_MASK )) || (pkt->mask & (RXE_WRITE_MASK |RXE_IMMDT_MASK )) == (RXE_WRITE_MASK |RXE_IMMDT_MASK ));
@@ -411,7 +411,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, qp_num = (pkt->mask &RXE_DETH_MASK ) ? ibwr->wr.ud.remote_qpn : qp->attr.dest_qp_num; - ack_req = ((pkt->mask &RXE_END_MASK ) || + ack_req = ((pkt->mask &RXE_LAST_MASK ) || (qp->req.noack_pkts++ >RXE_MAX_PKT_PER_ACK ));if (ack_req) qp->req.noack_pkts =0 ;
@@ -493,7 +493,7 @@ static void update_wqe_state(struct rxe_qp *qp, struct rxe_send_wqe *wqe, struct rxe_pkt_info *pkt) { -if (pkt->mask &RXE_END_MASK ) { +if (pkt->mask &RXE_LAST_MASK ) {if (qp_type (qp) ==IB_QPT_RC ) wqe->state = wqe_state_pending; }else {
@@ -513,7 +513,7 @@ static void update_wqe_psn(struct rxe_qp *qp,if (num_pkt ==0 ) num_pkt =1 ; -if (pkt->mask &RXE_START_MASK ) { +if (pkt->mask &RXE_FIRST_MASK ) { wqe->first_psn = qp->req.psn; wqe->last_psn = (qp->req.psn + num_pkt -1 ) &BTH_PSN_MASK ; }
@@ -550,7 +550,7 @@ static void update_state(struct rxe_qp *qp, struct rxe_pkt_info *pkt) { qp->req.opcode = pkt->opcode; -if (pkt->mask &RXE_END_MASK ) +if (pkt->mask &RXE_LAST_MASK ) qp->req.wqe_index =queue_next_index (qp->sq.queue, qp->req.wqe_index);
drivers/infiniband/sw/rxe/rxe_resp.c +2 -2
@@ -147,7 +147,7 @@ static enum resp_states check_psn(struct rxe_qp *qp,case IB_QPT_UC :if (qp->resp.drop_msg || diff !=0 ) { -if (pkt->mask &RXE_START_MASK ) { +if (pkt->mask &RXE_FIRST_MASK ) { qp->resp.drop_msg =0 ;return RESPST_CHK_OP_SEQ ; }
@@ -901,7 +901,7 @@ static enum resp_states execute(struct rxe_qp *qp, struct rxe_pkt_info *pkt)return RESPST_ERR_INVALIDATE_RKEY ; } -if (pkt->mask &RXE_END_MASK ) +if (pkt->mask &RXE_LAST_MASK )/* We successfully processed this new request. */ qp->resp.msn++;
Signature · 1 line
2.34.1
PATCH v2 2/13 RDMA/rxe: Move next_opcode() to rxe_opcode.c
In reply to Bob PearsonMove next_opcode() from rxe_req.c to rxe_opcode.c.
--- drivers/infiniband/sw/rxe/rxe_loc.h | 3 + drivers/infiniband/sw/rxe/rxe_opcode.c | 156 ++++++++++++++++++++++++- drivers/infiniband/sw/rxe/rxe_req.c | 156 ------------------------- 3 files changed, 157 insertions(+), 158 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +3 -0
@@ -99,6 +99,9 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt, struct sk_buff *skb);const char *rxe_parent_name (struct rxe_dev *rxe,unsigned int port_num); +/* opcode.c */ +int next_opcode (struct rxe_qp *qp,struct rxe_send_wqe *wqe,u32 opcode); +/* rxe_qp.c */ int rxe_qp_chk_init (struct rxe_dev *rxe,struct ib_qp_init_attr *init); int rxe_qp_from_init(struct rxe_dev *rxe, struct rxe_qp *qp, struct rxe_pd *pd,
drivers/infiniband/sw/rxe/rxe_opcode.c +154 -2
165 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_req.c +0 -156
168 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 3/13 RDMA: Add xrc opcodes to ib_pack.h
In reply to Bob PearsonExtend ib_pack.h to include xrc opcodes.
--- include/rdma/ib_pack.h | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-)
include/rdma/ib_pack.h +31 -1
@@ -56,8 +56,11 @@ enum {IB_OPCODE_UD =0x60 ,/* per IBTA 1.3 vol 1 Table 38, A10.3.2 */ IB_OPCODE_CNP =0x80 , +IB_OPCODE_XRC =0xa0 ,/* Manufacturer specific */ IB_OPCODE_MSP =0xe0 , +/* opcode type bits */ +IB_OPCODE_TYPE =0xe0 ,/* operations -- just used to define real constants */ IB_OPCODE_SEND_FIRST = 0x00,
@@ -84,6 +87,8 @@ enum {/* opcode 0x15 is reserved */ IB_OPCODE_SEND_LAST_WITH_INVALIDATE =0x16 ,IB_OPCODE_SEND_ONLY_WITH_INVALIDATE =0x17 , +/* opcode command bits */ + IB_OPCODE_CMD = 0x1f,/* real constants follow -- see comment about above IB_OPCODE() macro for more details */
@@ -152,7 +157,32 @@ enum {/* UD */ IB_OPCODE (UD ,SEND_ONLY ), -IB_OPCODE (UD ,SEND_ONLY_WITH_IMMEDIATE ) +IB_OPCODE (UD ,SEND_ONLY_WITH_IMMEDIATE ), + +/* XRC */ +IB_OPCODE (XRC ,SEND_FIRST ), +IB_OPCODE (XRC ,SEND_MIDDLE ), +IB_OPCODE (XRC ,SEND_LAST ), +IB_OPCODE (XRC ,SEND_LAST_WITH_IMMEDIATE ), +IB_OPCODE (XRC ,SEND_ONLY ), +IB_OPCODE (XRC ,SEND_ONLY_WITH_IMMEDIATE ), +IB_OPCODE (XRC ,RDMA_WRITE_FIRST ), +IB_OPCODE (XRC ,RDMA_WRITE_MIDDLE ), +IB_OPCODE (XRC ,RDMA_WRITE_LAST ), +IB_OPCODE (XRC ,RDMA_WRITE_LAST_WITH_IMMEDIATE ), +IB_OPCODE (XRC ,RDMA_WRITE_ONLY ), +IB_OPCODE (XRC ,RDMA_WRITE_ONLY_WITH_IMMEDIATE ), +IB_OPCODE (XRC ,RDMA_READ_REQUEST ), +IB_OPCODE (XRC ,RDMA_READ_RESPONSE_FIRST ), +IB_OPCODE (XRC ,RDMA_READ_RESPONSE_MIDDLE ), +IB_OPCODE (XRC ,RDMA_READ_RESPONSE_LAST ), +IB_OPCODE (XRC ,RDMA_READ_RESPONSE_ONLY ), +IB_OPCODE (XRC ,ACKNOWLEDGE ), +IB_OPCODE (XRC ,ATOMIC_ACKNOWLEDGE ), +IB_OPCODE (XRC ,COMPARE_SWAP ), +IB_OPCODE (XRC ,FETCH_ADD ), +IB_OPCODE (XRC ,SEND_LAST_WITH_INVALIDATE ), + IB_OPCODE(XRC, SEND_ONLY_WITH_INVALIDATE), }; enum {
Signature · 1 line
2.34.1
PATCH v2 4/13 RDMA/rxe: Extend opcodes and headers to support xrc
In reply to Bob PearsonExtend rxe_hdr.h to include the xrceth header and extend opcode tables in rxe_opcode.c to support xrc operations and qps.
--- drivers/infiniband/sw/rxe/rxe_hdr.h | 36 +++ drivers/infiniband/sw/rxe/rxe_opcode.c | 379 +++++++++++++++++++++++-- drivers/infiniband/sw/rxe/rxe_opcode.h | 4 +- 3 files changed, 395 insertions(+), 24 deletions(-)
drivers/infiniband/sw/rxe/rxe_hdr.h +36 -0
@@ -900,6 +900,41 @@ static inline void ieth_set_rkey(struct rxe_pkt_info *pkt, u32 rkey) rxe_opcode[pkt->opcode].offset[RXE_IETH], rkey); } +/****************************************************************************** +* XRC Extended Transport Header +******************************************************************************/ +struct rxe_xrceth { +__be32 srqn; +}; + +#define XRCETH_SRQN_MASK (0x00ffffff) + +static inline u32 __xrceth_srqn (void *arg) +{ +struct rxe_xrceth *xrceth = arg; + +return be32_to_cpu (xrceth->srqn); +} + +static inline void __xrceth_set_srqn (void *arg,u32 srqn) +{ +struct rxe_xrceth *xrceth = arg; + + xrceth->srqn =cpu_to_be32 (srqn &XRCETH_SRQN_MASK ); +} + +static inline u32 xrceth_srqn (struct rxe_pkt_info *pkt) +{ +return __xrceth_srqn (pkt->hdr + + rxe_opcode[pkt->opcode].offset[RXE_XRCETH ]); +} + +static inline void xrceth_set_srqn (struct rxe_pkt_info *pkt,u32 srqn) +{ +__xrceth_set_srqn (pkt->hdr + + rxe_opcode[pkt->opcode].offset[RXE_XRCETH ], srqn); +} +enum rxe_hdr_length {RXE_BTH_BYTES =sizeof (struct rxe_bth ),RXE_DETH_BYTES =sizeof (struct rxe_deth ),
@@ -909,6 +944,7 @@ enum rxe_hdr_length {RXE_ATMACK_BYTES =sizeof (struct rxe_atmack ),RXE_ATMETH_BYTES =sizeof (struct rxe_atmeth ),RXE_IETH_BYTES =sizeof (struct rxe_ieth ), +RXE_XRCETH_BYTES =sizeof (struct rxe_xrceth ), RXE_RDETH_BYTES = sizeof(struct rxe_rdeth), };
drivers/infiniband/sw/rxe/rxe_opcode.c +356 -23
447 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_opcode.h +3 -1
@@ -30,7 +30,7 @@ enum rxe_wr_mask {struct rxe_wr_opcode_info {char *name; -enum rxe_wr_mask mask[WR_MAX_QPT ]; +enum rxe_wr_mask mask[IB_QPT_MAX ]; };extern struct rxe_wr_opcode_info rxe_wr_opcode_info[];
@@ -44,6 +44,7 @@ enum rxe_hdr_type {RXE_ATMETH ,RXE_ATMACK ,RXE_IETH , +RXE_XRCETH ,RXE_RDETH ,RXE_DETH , RXE_IMMDT,
@@ -61,6 +62,7 @@ enum rxe_hdr_mask {RXE_ATMETH_MASK =BIT (RXE_ATMETH ),RXE_ATMACK_MASK =BIT (RXE_ATMACK ),RXE_IETH_MASK =BIT (RXE_IETH ), +RXE_XRCETH_MASK =BIT (RXE_XRCETH ),RXE_RDETH_MASK =BIT (RXE_RDETH ),RXE_DETH_MASK =BIT (RXE_DETH ), RXE_PAYLOAD_MASK = BIT(RXE_PAYLOAD),
Signature · 1 line
2.34.1
PATCH v2 5/13 RDMA/rxe: Add xrc opcodes to next_opcode()
In reply to Bob PearsonExtend next_opcode() to support xrc operations.
--- drivers/infiniband/sw/rxe/rxe_opcode.c | 88 ++++++++++++++++++++++++++ 1 file changed, 88 insertions(+)
drivers/infiniband/sw/rxe/rxe_opcode.c +88 -0
@@ -1376,6 +1376,91 @@ static int next_opcode_uc(struct rxe_qp *qp, u32 opcode, int fits)return -EINVAL ; } +static int next_opcode_xrc (struct rxe_qp *qp,u32 wr_opcode,int fits) +{ +switch (wr_opcode) { +case IB_WR_RDMA_WRITE : +if (qp->req.opcode ==IB_OPCODE_XRC_RDMA_WRITE_FIRST || + qp->req.opcode ==IB_OPCODE_XRC_RDMA_WRITE_MIDDLE ) +return fits ? +IB_OPCODE_XRC_RDMA_WRITE_LAST : +IB_OPCODE_XRC_RDMA_WRITE_MIDDLE ; +else +return fits ? +IB_OPCODE_XRC_RDMA_WRITE_ONLY : +IB_OPCODE_XRC_RDMA_WRITE_FIRST ; + +case IB_WR_RDMA_WRITE_WITH_IMM : +if (qp->req.opcode ==IB_OPCODE_XRC_RDMA_WRITE_FIRST || + qp->req.opcode ==IB_OPCODE_XRC_RDMA_WRITE_MIDDLE ) +return fits ? +IB_OPCODE_XRC_RDMA_WRITE_LAST_WITH_IMMEDIATE : +IB_OPCODE_XRC_RDMA_WRITE_MIDDLE ; +else +return fits ? +IB_OPCODE_XRC_RDMA_WRITE_ONLY_WITH_IMMEDIATE : +IB_OPCODE_XRC_RDMA_WRITE_FIRST ; + +case IB_WR_SEND : +if (qp->req.opcode ==IB_OPCODE_XRC_SEND_FIRST || + qp->req.opcode ==IB_OPCODE_XRC_SEND_MIDDLE ) +return fits ? +IB_OPCODE_XRC_SEND_LAST : +IB_OPCODE_XRC_SEND_MIDDLE ; +else +return fits ? +IB_OPCODE_XRC_SEND_ONLY : +IB_OPCODE_XRC_SEND_FIRST ; + +case IB_WR_SEND_WITH_IMM : +if (qp->req.opcode ==IB_OPCODE_XRC_SEND_FIRST || + qp->req.opcode ==IB_OPCODE_XRC_SEND_MIDDLE ) +return fits ? +IB_OPCODE_XRC_SEND_LAST_WITH_IMMEDIATE : +IB_OPCODE_XRC_SEND_MIDDLE ; +else +return fits ? +IB_OPCODE_XRC_SEND_ONLY_WITH_IMMEDIATE : +IB_OPCODE_XRC_SEND_FIRST ; + +case IB_WR_RDMA_READ : +return IB_OPCODE_XRC_RDMA_READ_REQUEST ; + +case IB_WR_RDMA_READ_WITH_INV : +return IB_OPCODE_XRC_RDMA_READ_REQUEST ; + +case IB_WR_ATOMIC_CMP_AND_SWP : +return IB_OPCODE_XRC_COMPARE_SWAP ; + +case IB_WR_MASKED_ATOMIC_CMP_AND_SWP : +return -EOPNOTSUPP ; + +case IB_WR_ATOMIC_FETCH_AND_ADD : +return IB_OPCODE_XRC_FETCH_ADD ; + +case IB_WR_MASKED_ATOMIC_FETCH_AND_ADD : +return -EOPNOTSUPP ; + +case IB_WR_SEND_WITH_INV : +if (qp->req.opcode ==IB_OPCODE_XRC_SEND_FIRST || + qp->req.opcode ==IB_OPCODE_XRC_SEND_MIDDLE ) +return fits ? +IB_OPCODE_XRC_SEND_LAST_WITH_INVALIDATE : +IB_OPCODE_XRC_SEND_MIDDLE ; +else +return fits ? +IB_OPCODE_XRC_SEND_ONLY_WITH_INVALIDATE : +IB_OPCODE_XRC_SEND_FIRST ; + +case IB_WR_LOCAL_INV : +case IB_WR_REG_MR : +case IB_WR_BIND_MW : +return wr_opcode; + } + +return -EINVAL ; +} +int next_opcode (struct rxe_qp *qp,struct rxe_send_wqe *wqe,u32 opcode) {int fits = (wqe->dma.resid <= qp->mtu);
@@ -1387,6 +1472,9 @@ int next_opcode(struct rxe_qp *qp, struct rxe_send_wqe *wqe, u32 opcode)case IB_QPT_UC :return next_opcode_uc (qp, opcode, fits); +case IB_QPT_XRC_INI : +return next_opcode_xrc (qp, opcode, fits); +case IB_QPT_UD :case IB_QPT_GSI :switch (opcode) {
Signature · 1 line
2.34.1
PATCH v2 6/13 RDMA/rxe: Implement open_xrcd and close_xrcd
In reply to Bob PearsonAdd rxe_open_xrcd() and rxe_close_xrcd() and add xrcd objects to rxe object pools to implement ib_open_xrcd() and ib_close_xrcd().
--- drivers/infiniband/sw/rxe/rxe.c | 2 ++ drivers/infiniband/sw/rxe/rxe_param.h | 3 +++ drivers/infiniband/sw/rxe/rxe_pool.c | 8 ++++++++ drivers/infiniband/sw/rxe/rxe_pool.h | 1 + drivers/infiniband/sw/rxe/rxe_verbs.c | 23 +++++++++++++++++++++++ drivers/infiniband/sw/rxe/rxe_verbs.h | 11 +++++++++++ 6 files changed, 48 insertions(+)
drivers/infiniband/sw/rxe/rxe.c +2 -0
@@ -23,6 +23,7 @@ void rxe_dealloc(struct ib_device *ib_dev)rxe_pool_cleanup (&rxe->uc_pool);rxe_pool_cleanup (&rxe->pd_pool);rxe_pool_cleanup (&rxe->ah_pool); +rxe_pool_cleanup (&rxe->xrcd_pool);rxe_pool_cleanup (&rxe->srq_pool);rxe_pool_cleanup (&rxe->qp_pool);rxe_pool_cleanup (&rxe->cq_pool);
@@ -120,6 +121,7 @@ static void rxe_init_pools(struct rxe_dev *rxe)rxe_pool_init (rxe, &rxe->uc_pool,RXE_TYPE_UC );rxe_pool_init (rxe, &rxe->pd_pool,RXE_TYPE_PD );rxe_pool_init (rxe, &rxe->ah_pool,RXE_TYPE_AH ); +rxe_pool_init (rxe, &rxe->xrcd_pool,RXE_TYPE_XRCD );rxe_pool_init (rxe, &rxe->srq_pool,RXE_TYPE_SRQ );rxe_pool_init (rxe, &rxe->qp_pool,RXE_TYPE_QP );rxe_pool_init (rxe, &rxe->cq_pool,RXE_TYPE_CQ );
drivers/infiniband/sw/rxe/rxe_param.h +3 -0
@@ -86,6 +86,9 @@ enum rxe_device_param {RXE_MAX_QP_INDEX =DEFAULT_MAX_VALUE ,RXE_MAX_QP =DEFAULT_MAX_VALUE -RXE_MIN_QP_INDEX , +RXE_MIN_XRCD_INDEX =1 , +RXE_MAX_XRCD_INDEX =128 , +RXE_MAX_XRCD =128 ,RXE_MIN_SRQ_INDEX =0x00020001 ,RXE_MAX_SRQ_INDEX =DEFAULT_MAX_VALUE , RXE_MAX_SRQ = DEFAULT_MAX_VALUE - RXE_MIN_SRQ_INDEX,
drivers/infiniband/sw/rxe/rxe_pool.c +8 -0
@@ -42,6 +42,14 @@ static const struct rxe_type_info { .max_index = RXE_MAX_AH_INDEX, .max_elem = RXE_MAX_AH_INDEX - RXE_MIN_AH_INDEX + 1, }, + [RXE_TYPE_XRCD] = { + .name = "xrcd", + .size = sizeof(struct rxe_xrcd), + .elem_offset = offsetof(struct rxe_xrcd, elem), + .min_index = RXE_MIN_XRCD_INDEX, + .max_index = RXE_MAX_XRCD_INDEX, + .max_elem = RXE_MAX_XRCD_INDEX - RXE_MIN_XRCD_INDEX + 1, + }, [RXE_TYPE_SRQ] = { .name = "srq", .size = sizeof(struct rxe_srq),
drivers/infiniband/sw/rxe/rxe_pool.h +1 -0
@@ -11,6 +11,7 @@ enum rxe_elem_type {RXE_TYPE_UC ,RXE_TYPE_PD ,RXE_TYPE_AH , +RXE_TYPE_XRCD ,RXE_TYPE_SRQ ,RXE_TYPE_QP , RXE_TYPE_CQ,
drivers/infiniband/sw/rxe/rxe_verbs.c +23 -0
@@ -280,6 +280,26 @@ static int post_one_recv(struct rxe_rq *rq, const struct ib_recv_wr *ibwr)return err; } +static int rxe_alloc_xrcd (struct ib_xrcd *ibxrcd,struct ib_udata *udata) +{ +struct rxe_dev *rxe =to_rdev (ibxrcd->device); +struct rxe_xrcd *xrcd =to_rxrcd (ibxrcd); +int err; + + err =rxe_add_to_pool (&rxe->xrcd_pool, xrcd); + +return err; +} + +static int rxe_dealloc_xrcd (struct ib_xrcd *ibxrcd,struct ib_udata *udata) +{ +struct rxe_xrcd *xrcd =to_rxrcd (ibxrcd); + +rxe_cleanup (xrcd); + +return 0 ; +} +static int rxe_create_srq (struct ib_srq *ibsrq,struct ib_srq_init_attr *init,struct ib_udata *udata) {
@@ -1053,6 +1073,7 @@ static const struct ib_device_ops rxe_dev_ops = { .alloc_mw = rxe_alloc_mw, .alloc_pd = rxe_alloc_pd, .alloc_ucontext = rxe_alloc_ucontext, + .alloc_xrcd = rxe_alloc_xrcd, .attach_mcast = rxe_attach_mcast, .create_ah = rxe_create_ah, .create_cq = rxe_create_cq,
@@ -1063,6 +1084,7 @@ static const struct ib_device_ops rxe_dev_ops = { .dealloc_mw = rxe_dealloc_mw, .dealloc_pd = rxe_dealloc_pd, .dealloc_ucontext = rxe_dealloc_ucontext, + .dealloc_xrcd = rxe_dealloc_xrcd, .dereg_mr = rxe_dereg_mr, .destroy_ah = rxe_destroy_ah, .destroy_cq = rxe_destroy_cq,
@@ -1101,6 +1123,7 @@ static const struct ib_device_ops rxe_dev_ops = {INIT_RDMA_OBJ_SIZE (ib_cq, rxe_cq, ibcq),INIT_RDMA_OBJ_SIZE (ib_pd, rxe_pd, ibpd),INIT_RDMA_OBJ_SIZE (ib_qp, rxe_qp, ibqp), +INIT_RDMA_OBJ_SIZE (ib_xrcd, rxe_xrcd, ibxrcd),INIT_RDMA_OBJ_SIZE (ib_srq, rxe_srq, ibsrq),INIT_RDMA_OBJ_SIZE (ib_ucontext, rxe_ucontext, ibuc), INIT_RDMA_OBJ_SIZE(ib_mw, rxe_mw, ibmw),
drivers/infiniband/sw/rxe/rxe_verbs.h +11 -0
@@ -93,6 +93,11 @@ struct rxe_rq {struct rxe_queue *queue; }; +struct rxe_xrcd { +struct ib_xrcd ibxrcd; +struct rxe_pool_elem elem; +}; +struct rxe_srq {struct ib_srq ibsrq;struct rxe_pool_elem elem;
@@ -381,6 +386,7 @@ struct rxe_dev {struct rxe_pool uc_pool;struct rxe_pool pd_pool;struct rxe_pool ah_pool; +struct rxe_pool xrcd_pool;struct rxe_pool srq_pool;struct rxe_pool qp_pool;struct rxe_pool cq_pool;
@@ -430,6 +436,11 @@ static inline struct rxe_ah *to_rah(struct ib_ah *ah) return ah ? container_of(ah, struct rxe_ah, ibah) : NULL; } +static inline struct rxe_xrcd *to_rxrcd (struct ib_xrcd *ibxrcd) +{ + return ibxrcd ? container_of(ibxrcd, struct rxe_xrcd, ibxrcd) : NULL; +} +static inline struct rxe_srq *to_rsrq (struct ib_srq *srq) { return srq ? container_of(srq, struct rxe_srq, ibsrq) : NULL;
Signature · 1 line
2.34.1
PATCH v2 7/13 RDMA/rxe: Extend srq verbs to support xrcd
In reply to Bob PearsonExtend srq to support xrcd in create verb
---
v2
Rebased to current for-next
drivers/infiniband/sw/rxe/rxe_srq.c | 131 ++++++++++++++------------ drivers/infiniband/sw/rxe/rxe_verbs.c | 12 +-- drivers/infiniband/sw/rxe/rxe_verbs.h | 8 +- include/uapi/rdma/rdma_user_rxe.h | 4 +- 4 files changed, 83 insertions(+), 72 deletions(-)
drivers/infiniband/sw/rxe/rxe_srq.c +70 -61
@@ -11,61 +11,85 @@int rxe_srq_chk_init (struct rxe_dev *rxe,struct ib_srq_init_attr *init) {struct ib_srq_attr *attr = &init->attr; +int err = -EINVAL ; -if (attr->max_wr > rxe->attr.max_srq_wr) { -pr_warn ("max_wr(%d) > max_srq_wr(%d)\n" , - attr->max_wr, rxe->attr.max_srq_wr); - goto err1; +if (init->srq_type ==IB_SRQT_TM ) { + err = -EOPNOTSUPP ; + goto err_out; } -if (attr->max_wr <=0 ) { -pr_warn ("max_wr(%d) <= 0\n" , attr->max_wr); - goto err1; +if (init->srq_type ==IB_SRQT_XRC ) { +if (!init->ext.cq || !init->ext.xrc.xrcd) + goto err_out; } +if (attr->max_wr > rxe->attr.max_srq_wr) + goto err_out; + +if (attr->max_wr <=0 ) + goto err_out; +if (attr->max_wr <RXE_MIN_SRQ_WR ) attr->max_wr =RXE_MIN_SRQ_WR ; -if (attr->max_sge > rxe->attr.max_srq_sge) { -pr_warn ("max_sge(%d) > max_srq_sge(%d)\n" , - attr->max_sge, rxe->attr.max_srq_sge); - goto err1; - } +if (attr->max_sge > rxe->attr.max_srq_sge) + goto err_out;if (attr->max_sge <RXE_MIN_SRQ_SGE ) attr->max_sge =RXE_MIN_SRQ_SGE ;return 0 ; -err1: -return -EINVAL ; +err_out: +pr_debug ("%s: failed err = %d\n" , __func__, err); +return err; }int rxe_srq_from_init (struct rxe_dev *rxe,struct rxe_srq *srq,struct ib_srq_init_attr *init,struct ib_udata *udata,struct rxe_create_srq_resp __user *uresp) { -int err; -int srq_wqe_size; +struct rxe_pd *pd =to_rpd (srq->ibsrq.pd); +struct rxe_cq *cq; +struct rxe_xrcd *xrcd;struct rxe_queue *q; -enum queue_type type; +int srq_wqe_size; +int err; + +rxe_get (pd); + srq->pd = pd; srq->ibsrq.event_handler = init->event_handler; srq->ibsrq.srq_context = init->srq_context; srq->limit = init->attr.srq_limit; - srq->srq_num = srq->elem.index; srq->rq.max_wr = init->attr.max_wr; srq->rq.max_sge = init->attr.max_sge; - srq_wqe_size =rcv_wqe_size (srq->rq.max_sge); +if (init->srq_type ==IB_SRQT_XRC ) { + cq =to_rcq (init->ext.cq); +if (cq) { +rxe_get (cq); + srq->cq =to_rcq (init->ext.cq); + }else { +return -EINVAL ; + } + xrcd =to_rxrcd (init->ext.xrc.xrcd); +if (xrcd) { +rxe_get (xrcd); + srq->xrcd =to_rxrcd (init->ext.xrc.xrcd); + } + srq->ibsrq.ext.xrc.srq_num = srq->elem.index; + }spin_lock_init (&srq->rq.producer_lock);spin_lock_init (&srq->rq.consumer_lock); - type =QUEUE_TYPE_FROM_CLIENT ; - q =rxe_queue_init (rxe, &srq->rq.max_wr, srq_wqe_size, type); + srq_wqe_size =rcv_wqe_size (srq->rq.max_sge); + q =rxe_queue_init (rxe, &srq->rq.max_wr, srq_wqe_size, +QUEUE_TYPE_FROM_CLIENT );if (!q) { -pr_warn ("unable to allocate queue for srq\n" ); +pr_debug ("%s: srq#%d: unable to allocate queue\n" , + __func__, srq->elem.index);return -ENOMEM ; }
@@ -79,66 +103,45 @@ int rxe_srq_from_init(struct rxe_dev *rxe, struct rxe_srq *srq,return err; } -if (uresp) { -if (copy_to_user (&uresp->srq_num, &srq->srq_num, -sizeof (uresp->srq_num))) { -rxe_queue_cleanup (q); -return -EFAULT ; - } - } -return 0 ; }int rxe_srq_chk_attr (struct rxe_dev *rxe,struct rxe_srq *srq,struct ib_srq_attr *attr,enum ib_srq_attr_mask mask) { -if (srq->error) { -pr_warn ("srq in error state\n" ); - goto err1; - } +int err = -EINVAL ; + +if (srq->error) + goto err_out;if (mask &IB_SRQ_MAX_WR ) { -if (attr->max_wr > rxe->attr.max_srq_wr) { -pr_warn ("max_wr(%d) > max_srq_wr(%d)\n" , - attr->max_wr, rxe->attr.max_srq_wr); - goto err1; - } +if (attr->max_wr > rxe->attr.max_srq_wr) + goto err_out; -if (attr->max_wr <=0 ) { -pr_warn ("max_wr(%d) <= 0\n" , attr->max_wr); - goto err1; - } +if (attr->max_wr <=0 ) + goto err_out; -if (srq->limit && (attr->max_wr < srq->limit)) { -pr_warn ("max_wr (%d) < srq->limit (%d)\n" , - attr->max_wr, srq->limit); - goto err1; - } +if (srq->limit && (attr->max_wr < srq->limit)) + goto err_out;if (attr->max_wr <RXE_MIN_SRQ_WR ) attr->max_wr =RXE_MIN_SRQ_WR ; }if (mask &IB_SRQ_LIMIT ) { -if (attr->srq_limit > rxe->attr.max_srq_wr) { -pr_warn ("srq_limit(%d) > max_srq_wr(%d)\n" , - attr->srq_limit, rxe->attr.max_srq_wr); - goto err1; - } +if (attr->srq_limit > rxe->attr.max_srq_wr) + goto err_out; -if (attr->srq_limit > srq->rq.queue->buf->index_mask) { -pr_warn ("srq_limit (%d) > cur limit(%d)\n" , - attr->srq_limit, - srq->rq.queue->buf->index_mask); - goto err1; - } +if (attr->srq_limit > srq->rq.queue->buf->index_mask) + goto err_out; }return 0 ; -err1: -return -EINVAL ; +err_out: +pr_debug ("%s: srq#%d: failed err = %d\n" , __func__, + srq->elem.index, err); +return err; } int rxe_srq_from_attr(struct rxe_dev *rxe, struct rxe_srq *srq,
@@ -182,6 +185,12 @@ void rxe_srq_cleanup(struct rxe_pool_elem *elem)if (srq->pd)rxe_put (srq->pd); +if (srq->cq) +rxe_put (srq->cq); + +if (srq->xrcd) +rxe_put (srq->xrcd); +if (srq->rq.queue)rxe_queue_cleanup (srq->rq.queue); }
drivers/infiniband/sw/rxe/rxe_verbs.c +5 -7
@@ -305,7 +305,6 @@ static int rxe_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init, {int err;struct rxe_dev *rxe =to_rdev (ibsrq->device); -struct rxe_pd *pd =to_rpd (ibsrq->pd);struct rxe_srq *srq =to_rsrq (ibsrq);struct rxe_create_srq_resp __user *uresp =NULL ;
@@ -315,9 +314,6 @@ static int rxe_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init, uresp = udata->outbuf; } -if (init->srq_type !=IB_SRQT_BASIC ) -return -EOPNOTSUPP ; - err =rxe_srq_chk_init (rxe, init);if (err)return err;
@@ -326,13 +322,11 @@ static int rxe_create_srq(struct ib_srq *ibsrq, struct ib_srq_init_attr *init,if (err)return err; -rxe_get (pd); - srq->pd = pd; - err =rxe_srq_from_init (rxe, srq, init, udata, uresp);if (err) goto err_cleanup; +rxe_finalize (srq);return 0 ; err_cleanup:
@@ -366,6 +360,7 @@ static int rxe_modify_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr, err =rxe_srq_from_attr (rxe, srq, attr, mask, &ucmd, udata);if (err)return err; +return 0 ; }
@@ -379,6 +374,7 @@ static int rxe_query_srq(struct ib_srq *ibsrq, struct ib_srq_attr *attr) attr->max_wr = srq->rq.queue->buf->index_mask; attr->max_sge = srq->rq.max_sge; attr->srq_limit = srq->limit; +return 0 ; }
@@ -626,6 +622,8 @@ static void init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr,return ; } + wqe->dma.num_sge = ibwr->num_sge; +if (unlikely (ibwr->send_flags &IB_SEND_INLINE ))copy_inline_data_to_wqe (wqe, ibwr);else
drivers/infiniband/sw/rxe/rxe_verbs.h +7 -1
@@ -102,13 +102,19 @@ struct rxe_srq {struct ib_srq ibsrq;struct rxe_pool_elem elem;struct rxe_pd *pd; +struct rxe_xrcd *xrcd;/* xrc only */ +struct rxe_cq *cq;/* xrc only */ struct rxe_rq rq; -u32 srq_num;int limit;int error; }; +static inline u32 srq_num (struct rxe_srq *srq) +{ +return srq->ibsrq.ext.xrc.srq_num; +} +enum rxe_qp_state {QP_STATE_RESET ,QP_STATE_INIT ,
include/uapi/rdma/rdma_user_rxe.h +1 -3
@@ -74,7 +74,7 @@ struct rxe_av {struct rxe_send_wr {__aligned_u64 wr_id; -__u32 reserved; +__u32 srq_num;/* xrc only */ __u32 opcode;__u32 send_flags;union {
@@ -191,8 +191,6 @@ struct rxe_create_qp_resp {struct rxe_create_srq_resp {struct mminfo mi; -__u32 srq_num; -__u32 reserved; };struct rxe_modify_srq_cmd {
Signature · 1 line
2.34.1
PATCH v2 8/13 RDMA/rxe: Extend rxe_qp.c to support xrc qps
In reply to Bob PearsonExtend code in rxe_qp.c to support xrc qp types.
---
v2
Rebased to current for-next.
drivers/infiniband/sw/rxe/rxe_av.c | 3 +- drivers/infiniband/sw/rxe/rxe_loc.h | 7 +- drivers/infiniband/sw/rxe/rxe_qp.c | 308 +++++++++++++++----------- drivers/infiniband/sw/rxe/rxe_verbs.c | 22 +- drivers/infiniband/sw/rxe/rxe_verbs.h | 1 + 5 files changed, 200 insertions(+), 141 deletions(-)
drivers/infiniband/sw/rxe/rxe_av.c +2 -1
@@ -110,7 +110,8 @@ struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt, struct rxe_ah **ahp)if (!pkt || !pkt->qp)return NULL ; -if (qp_type (pkt->qp) ==IB_QPT_RC ||qp_type (pkt->qp) ==IB_QPT_UC ) +if (qp_type (pkt->qp) ==IB_QPT_RC ||qp_type (pkt->qp) ==IB_QPT_UC || +qp_type (pkt->qp) ==IB_QPT_XRC_INI )return &pkt->qp->pri_av;if (!pkt->wqe)
drivers/infiniband/sw/rxe/rxe_loc.h +4 -3
@@ -103,11 +103,12 @@ const char *rxe_parent_name(struct rxe_dev *rxe, unsigned int port_num);int next_opcode (struct rxe_qp *qp,struct rxe_send_wqe *wqe,u32 opcode);/* rxe_qp.c */ -int rxe_qp_chk_init (struct rxe_dev *rxe,struct ib_qp_init_attr *init); -int rxe_qp_from_init (struct rxe_dev *rxe,struct rxe_qp *qp,struct rxe_pd *pd, +int rxe_qp_chk_init (struct rxe_dev *rxe,struct ib_qp *ibqp, +struct ib_qp_init_attr *init); +int rxe_qp_from_init (struct rxe_dev *rxe,struct rxe_qp *qp,struct ib_qp_init_attr *init,struct rxe_create_qp_resp __user *uresp, -struct ib_pd *ibpd,struct ib_udata *udata); +struct ib_udata *udata);int rxe_qp_to_init (struct rxe_qp *qp,struct ib_qp_init_attr *init);int rxe_qp_chk_attr (struct rxe_dev *rxe,struct rxe_qp *qp,struct ib_qp_attr *attr,int mask);
drivers/infiniband/sw/rxe/rxe_qp.c +183 -125
474 lines not on this page · raw message
drivers/infiniband/sw/rxe/rxe_verbs.c +10 -12
@@ -415,7 +415,6 @@ static int rxe_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init, {int err;struct rxe_dev *rxe =to_rdev (ibqp->device); -struct rxe_pd *pd =to_rpd (ibqp->pd);struct rxe_qp *qp =to_rqp (ibqp);struct rxe_create_qp_resp __user *uresp =NULL ;
@@ -423,16 +422,7 @@ static int rxe_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init,if (udata->outlen <sizeof (*uresp))return -EINVAL ; uresp = udata->outbuf; - } - -if (init->create_flags) -return -EOPNOTSUPP ; - err =rxe_qp_chk_init (rxe, init); -if (err) -return err; - -if (udata) {if (udata->inlen)return -EINVAL ;
@@ -441,11 +431,15 @@ static int rxe_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *init, qp->is_user = false; } + err =rxe_qp_chk_init (rxe, ibqp, init); +if (err) +return err; + err =rxe_add_to_pool (&rxe->qp_pool, qp);if (err)return err; - err =rxe_qp_from_init (rxe, qp, pd, init, uresp, ibqp->pd, udata); + err =rxe_qp_from_init (rxe, qp, init, uresp, udata);if (err) goto qp_init;
@@ -516,6 +510,9 @@ static int validate_send_wr(struct rxe_qp *qp, const struct ib_send_wr *ibwr,int num_sge = ibwr->num_sge;struct rxe_sq *sq = &qp->sq; +if (unlikely (qp_type (qp) ==IB_QPT_XRC_TGT )) +return -EOPNOTSUPP ; +if (unlikely (num_sge > sq->max_sge)) goto err1;
@@ -739,8 +736,9 @@ static int rxe_post_send(struct ib_qp *ibqp, const struct ib_send_wr *wr,/* Utilize process context to do protocol processing */ rxe_run_task (&qp->req.task,0 );return 0 ; - }else + }else {return rxe_post_send_kernel (qp, wr, bad_wr); + } } static int rxe_post_recv(struct ib_qp *ibqp, const struct ib_recv_wr *wr,
drivers/infiniband/sw/rxe/rxe_verbs.h +1 -0
@@ -230,6 +230,7 @@ struct rxe_qp {struct rxe_srq *srq;struct rxe_cq *scq;struct rxe_cq *rcq; +struct rxe_xrcd *xrcd;enum ib_sig_type sq_sig_type;
Signature · 1 line
2.34.1
PATCH v2 9/13 RDMA/rxe: Extend rxe_recv.c to support xrc
In reply to Bob PearsonExtend rxe_recv.c to support xrc packets. Add checks for qp type and check qp->xrcd matches srq->xrcd.
--- drivers/infiniband/sw/rxe/rxe_hdr.h | 5 +- drivers/infiniband/sw/rxe/rxe_recv.c | 79 +++++++++++++++++++++------- 2 files changed, 63 insertions(+), 21 deletions(-)
drivers/infiniband/sw/rxe/rxe_hdr.h +4 -1
@@ -14,7 +14,10 @@struct rxe_pkt_info {struct rxe_dev *rxe;/* device that owns packet */ struct rxe_qp *qp;/* qp that owns packet */ -struct rxe_send_wqe *wqe;/* send wqe */ +union { +struct rxe_send_wqe *wqe;/* send wqe */ +struct rxe_srq *srq;/* srq for recvd xrc packets */ + };u8 *hdr;/* points to bth */ u32 mask;/* useful info about pkt */ u32 psn;/* bth psn of packet */
drivers/infiniband/sw/rxe/rxe_recv.c +59 -20
120 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v2 10/13 RDMA/rxe: Extend rxe_comp.c to support xrc qps
In reply to Bob PearsonExtend code in rxe_comp.c to support xrc qp types.
--- drivers/infiniband/sw/rxe/rxe_comp.c | 45 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 23 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +22 -23
@@ -213,12 +213,13 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,struct rxe_pkt_info *pkt, struct rxe_send_wqe *wqe) { + struct rxe_dev *rxe = to_rdev(qp->ibqp.device);unsigned int mask = pkt->mask; +int opcode;u8 syn; -struct rxe_dev *rxe =to_rdev (qp->ibqp.device); -/* Check the sequence only */ -switch (qp->comp.opcode) { +/* Mask off type bits and check the sequence only */ +switch (qp->comp.opcode &IB_OPCODE_CMD ) {case -1 :/* Will catch all *_ONLY cases. */ if (!(mask &RXE_FIRST_MASK ))
@@ -226,42 +227,39 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,break ; -case IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST : -case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE : -if (pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE && - pkt->opcode !=IB_OPCODE_RC_RDMA_READ_RESPONSE_LAST ) { +case IB_OPCODE_RDMA_READ_RESPONSE_FIRST : +case IB_OPCODE_RDMA_READ_RESPONSE_MIDDLE : + opcode = pkt->opcode &IB_OPCODE_CMD ; +if (opcode !=IB_OPCODE_RDMA_READ_RESPONSE_MIDDLE && + opcode !=IB_OPCODE_RDMA_READ_RESPONSE_LAST ) {/* read retries of partial data may restart from * read response first or response only. */ if ((pkt->psn == wqe->first_psn && - pkt->opcode == -IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST ) || + opcode ==IB_OPCODE_RDMA_READ_RESPONSE_FIRST ) || (wqe->first_psn == wqe->last_psn && - pkt->opcode == -IB_OPCODE_RC_RDMA_READ_RESPONSE_ONLY )) + opcode ==IB_OPCODE_RDMA_READ_RESPONSE_ONLY ))break ;return COMPST_ERROR ; }break ;default : -WARN_ON_ONCE (1 ); +//WARN_ON_ONCE(1); } -/* Check operation validity. */ -switch (pkt->opcode) { -case IB_OPCODE_RC_RDMA_READ_RESPONSE_FIRST : -case IB_OPCODE_RC_RDMA_READ_RESPONSE_LAST : -case IB_OPCODE_RC_RDMA_READ_RESPONSE_ONLY : +/* Mask off the type bits and check operation validity. */ +switch (pkt->opcode &IB_OPCODE_CMD ) { +case IB_OPCODE_RDMA_READ_RESPONSE_FIRST : +case IB_OPCODE_RDMA_READ_RESPONSE_LAST : +case IB_OPCODE_RDMA_READ_RESPONSE_ONLY : syn =aeth_syn (pkt);if ((syn &AETH_TYPE_MASK ) !=AETH_ACK )return COMPST_ERROR ; fallthrough; -/* (IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE doesn't have an AETH) -*/ -case IB_OPCODE_RC_RDMA_READ_RESPONSE_MIDDLE : +case IB_OPCODE_RDMA_READ_RESPONSE_MIDDLE :if (wqe->wr.opcode !=IB_WR_RDMA_READ && wqe->wr.opcode !=IB_WR_RDMA_READ_WITH_INV ) { wqe->status =IB_WC_FATAL_ERR ;
@@ -270,7 +268,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,reset_retry_counters (qp);return COMPST_READ ; -case IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE : +case IB_OPCODE_ATOMIC_ACKNOWLEDGE : syn =aeth_syn (pkt);if ((syn &AETH_TYPE_MASK ) !=AETH_ACK )
@@ -282,7 +280,7 @@ static inline enum comp_state check_ack(struct rxe_qp *qp,reset_retry_counters (qp);return COMPST_ATOMIC ; -case IB_OPCODE_RC_ACKNOWLEDGE : +case IB_OPCODE_ACKNOWLEDGE : syn =aeth_syn (pkt);switch (syn &AETH_TYPE_MASK ) {case AETH_ACK :
@@ -669,7 +667,8 @@ int rxe_completer(void *arg)* timeouts but try to keep them as few as possible) * (4) the timeout parameter is set */ -if ((qp_type (qp) ==IB_QPT_RC ) && +if ((qp_type (qp) ==IB_QPT_RC || +qp_type (qp) ==IB_QPT_XRC_INI ) && (qp->req.state ==QP_STATE_READY ) && (psn_compare (qp->req.psn, qp->comp.psn) >0 ) && qp->qp_timeout_jiffies)
Signature · 1 line
2.34.1
PATCH v2 11/13 RDMA/rxe: Extend rxe_req.c to support xrc qps
In reply to Bob PearsonExtend code in rxe_req.c to support xrc qp types.
--- drivers/infiniband/sw/rxe/rxe_req.c | 38 +++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/infiniband/sw/rxe/rxe_req.c +22 -16
@@ -229,7 +229,7 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, {struct rxe_dev *rxe =to_rdev (qp->ibqp.device);struct sk_buff *skb; -struct rxe_send_wr *ibwr = &wqe->wr; +struct rxe_send_wr *wr = &wqe->wr;int pad = (-payload) &0x3 ;int paylen;int solicited;
@@ -246,13 +246,13 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,return NULL ;/* init bth */ - solicited = (ibwr->send_flags &IB_SEND_SOLICITED ) && + solicited = (wr->send_flags &IB_SEND_SOLICITED ) && (pkt->mask &RXE_LAST_MASK ) && ((pkt->mask & (RXE_SEND_MASK )) || (pkt->mask & (RXE_WRITE_MASK |RXE_IMMDT_MASK )) == (RXE_WRITE_MASK |RXE_IMMDT_MASK )); - qp_num = (pkt->mask &RXE_DETH_MASK ) ? ibwr->wr.ud.remote_qpn : + qp_num = (pkt->mask &RXE_DETH_MASK ) ? wr->wr.ud.remote_qpn : qp->attr.dest_qp_num; ack_req = ((pkt->mask & RXE_LAST_MASK) ||
@@ -264,34 +264,37 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp, ack_req, pkt->psn);/* init optional headers */ +if (pkt->mask &RXE_XRCETH_MASK ) +xrceth_set_srqn (pkt, wr->srq_num); +if (pkt->mask &RXE_RETH_MASK ) { -reth_set_rkey (pkt, ibwr->wr.rdma.rkey); +reth_set_rkey (pkt, wr->wr.rdma.rkey);reth_set_va (pkt, wqe->iova);reth_set_len (pkt, wqe->dma.resid); }if (pkt->mask &RXE_IMMDT_MASK ) -immdt_set_imm (pkt, ibwr->ex.imm_data); +immdt_set_imm (pkt, wr->ex.imm_data);if (pkt->mask &RXE_IETH_MASK ) -ieth_set_rkey (pkt, ibwr->ex.invalidate_rkey); +ieth_set_rkey (pkt, wr->ex.invalidate_rkey);if (pkt->mask &RXE_ATMETH_MASK ) {atmeth_set_va (pkt, wqe->iova); -if (opcode ==IB_OPCODE_RC_COMPARE_SWAP ) { -atmeth_set_swap_add (pkt, ibwr->wr.atomic.swap); -atmeth_set_comp (pkt, ibwr->wr.atomic.compare_add); +if ((opcode &IB_OPCODE_CMD ) ==IB_OPCODE_COMPARE_SWAP ) { +atmeth_set_swap_add (pkt, wr->wr.atomic.swap); +atmeth_set_comp (pkt, wr->wr.atomic.compare_add); }else { -atmeth_set_swap_add (pkt, ibwr->wr.atomic.compare_add); +atmeth_set_swap_add (pkt, wr->wr.atomic.compare_add); } -atmeth_set_rkey (pkt, ibwr->wr.atomic.rkey); +atmeth_set_rkey (pkt, wr->wr.atomic.rkey); }if (pkt->mask &RXE_DETH_MASK ) {if (qp->ibqp.qp_num ==1 )deth_set_qkey (pkt,GSI_QKEY );else -deth_set_qkey (pkt, ibwr->wr.ud.remote_qkey); +deth_set_qkey (pkt, wr->wr.ud.remote_qkey);deth_set_sqp (pkt, qp->ibqp.qp_num); }
@@ -338,8 +341,10 @@ static void update_wqe_state(struct rxe_qp *qp, struct rxe_pkt_info *pkt) {if (pkt->mask &RXE_LAST_MASK ) { -if (qp_type (qp) ==IB_QPT_RC ) +if (qp_type (qp) ==IB_QPT_RC || +qp_type (qp) ==IB_QPT_XRC_INI ) wqe->state = wqe_state_pending; +/* other qp types handled in rxe_xmit_packet() */ }else { wqe->state = wqe_state_processing; }
@@ -532,9 +537,10 @@ int rxe_requester(void *arg) goto done; } -if (unlikely (qp_type (qp) ==IB_QPT_RC && -psn_compare (qp->req.psn, (qp->comp.psn + -RXE_MAX_UNACKED_PSNS )) >0 )) { +if (unlikely ((qp_type (qp) ==IB_QPT_RC || +qp_type (qp) ==IB_QPT_XRC_INI ) && +psn_compare (qp->req.psn, (qp->comp.psn + +RXE_MAX_UNACKED_PSNS )) >0 )) { qp->req.wait_psn =1 ; goto exit; }
Signature · 1 line
2.34.1
PATCH v2 12/13 RDMA/rxe: Extend rxe_net.c to support xrc qps
In reply to Bob PearsonExtend code in rxe_net.c to support xrc qp types.
--- drivers/infiniband/sw/rxe/rxe_net.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-)
drivers/infiniband/sw/rxe/rxe_net.c +16 -7
@@ -92,7 +92,7 @@ static struct dst_entry *rxe_find_route(struct net_device *ndev, {struct dst_entry *dst =NULL ; -if (qp_type (qp) ==IB_QPT_RC ) +if (qp_type (qp) ==IB_QPT_RC ||qp_type (qp) ==IB_QPT_XRC_INI ) dst =sk_dst_get (qp->sk->sk);if (!dst || !dst_check (dst, qp->dst_cookie)) {
@@ -120,7 +120,8 @@ static struct dst_entry *rxe_find_route(struct net_device *ndev,#endif } -if (dst && (qp_type (qp) ==IB_QPT_RC )) { +if (dst && (qp_type (qp) ==IB_QPT_RC || +qp_type (qp) ==IB_QPT_XRC_INI )) {dst_hold (dst);sk_dst_set (qp->sk->sk, dst); }
@@ -386,14 +387,23 @@ static int rxe_send(struct sk_buff *skb, struct rxe_pkt_info *pkt)*/ static int rxe_loopback (struct sk_buff *skb,struct rxe_pkt_info *pkt) { -memcpy (SKB_TO_PKT (skb), pkt,sizeof (*pkt)); +struct rxe_pkt_info *new_pkt =SKB_TO_PKT (skb); + +memset (new_pkt,0 ,sizeof (*new_pkt)); + +/* match rxe_udp_encap_recv */ + new_pkt->rxe = pkt->rxe; + new_pkt->port_num =1 ; + new_pkt->hdr = pkt->hdr; + new_pkt->mask =RXE_GRH_MASK ; + new_pkt->paylen = pkt->paylen;if (skb->protocol ==htons (ETH_P_IP ))skb_pull (skb,sizeof (struct iphdr ));else skb_pull (skb,sizeof (struct ipv6hdr )); -if (WARN_ON (!ib_device_try_get (&pkt->rxe->ib_dev))) { +if (WARN_ON (!ib_device_try_get (&new_pkt->rxe->ib_dev))) {kfree_skb (skb);return -EIO ; }
@@ -412,7 +422,6 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,if ((is_request && (qp->req.state !=QP_STATE_READY )) || (!is_request && (qp->resp.state !=QP_STATE_READY ))) { -pr_info ("Packet dropped. QP is not in ready state\n" ); goto drop; }
@@ -427,8 +436,8 @@ int rxe_xmit_packet(struct rxe_qp *qp, struct rxe_pkt_info *pkt,return err; } -if ((qp_type (qp) !=IB_QPT_RC ) && - (pkt->mask &RXE_LAST_MASK )) { +if ((pkt->mask &RXE_REQ_MASK ) && (pkt->mask &RXE_LAST_MASK ) && + (qp_type (qp) !=IB_QPT_RC &&qp_type (qp) !=IB_QPT_XRC_INI )) { pkt->wqe->state = wqe_state_done;rxe_run_task (&qp->comp.task,1 ); }
Signature · 1 line
2.34.1
PATCH v2 13/13 RDMA/rxe: Extend rxe_resp.c to support xrc qps
In reply to Bob PearsonExtend code in rxe_resp.c to support xrc qp types.
---
v2
Rebased ot current for-next
drivers/infiniband/sw/rxe/rxe_loc.h | 3 +- drivers/infiniband/sw/rxe/rxe_mw.c | 14 +-- drivers/infiniband/sw/rxe/rxe_resp.c | 164 +++++++++++++++++++++------ 3 files changed, 141 insertions(+), 40 deletions(-)
drivers/infiniband/sw/rxe/rxe_loc.h +2 -1
@@ -87,7 +87,8 @@ int rxe_alloc_mw(struct ib_mw *ibmw, struct ib_udata *udata);int rxe_dealloc_mw (struct ib_mw *ibmw);int rxe_bind_mw (struct rxe_qp *qp,struct rxe_send_wqe *wqe);int rxe_invalidate_mw (struct rxe_qp *qp,u32 rkey); -struct rxe_mw *rxe_lookup_mw (struct rxe_qp *qp,int access,u32 rkey); +struct rxe_mw *rxe_lookup_mw (struct rxe_pd *pd,struct rxe_qp *qp, +int access,u32 rkey);void rxe_mw_cleanup (struct rxe_pool_elem *elem);/* rxe_net.c */
drivers/infiniband/sw/rxe/rxe_mw.c +7 -7
@@ -280,10 +280,10 @@ int rxe_invalidate_mw(struct rxe_qp *qp, u32 rkey)return ret; } -struct rxe_mw *rxe_lookup_mw (struct rxe_qp *qp,int access,u32 rkey) +struct rxe_mw *rxe_lookup_mw (struct rxe_pd *pd,struct rxe_qp *qp, +int access,u32 rkey) {struct rxe_dev *rxe =to_rdev (qp->ibqp.device); -struct rxe_pd *pd =to_rpd (qp->ibqp.pd);struct rxe_mw *mw;int index = rkey >>8 ;
@@ -291,11 +291,11 @@ struct rxe_mw *rxe_lookup_mw(struct rxe_qp *qp, int access, u32 rkey)if (!mw)return NULL ; -if (unlikely ((mw->rkey != rkey) ||rxe_mw_pd (mw) != pd || - (mw->ibmw.type ==IB_MW_TYPE_2 && mw->qp != qp) || - (mw->length ==0 ) || - (access && !(access & mw->access)) || - mw->state !=RXE_MW_STATE_VALID )) { +if ((mw->rkey != rkey) ||rxe_mw_pd (mw) != pd || + (mw->ibmw.type ==IB_MW_TYPE_2 && + (mw->qp != qp ||qp_type (qp) ==IB_QPT_XRC_TGT )) || + (mw->length ==0 ) || (access && !(access & mw->access)) || + mw->state !=RXE_MW_STATE_VALID ) {rxe_put (mw);return NULL ; }
drivers/infiniband/sw/rxe/rxe_resp.c +132 -32
377 lines not on this page · raw message
Signature · 1 line
2.34.1
Jason Gunthorpe
maintainerQuoted 20 lines · Bob Pearson
This patch series implements the xrc transport for the
rdma_rxedriver. It is based on the current for-next branch of rdma-linux. The first two patches in the series do some cleanup which is helpful for this effort. The remaining patches implement the xrc functionality. There is a matching patch set for the user space rxe provider driver. The communications between these is accomplished without making an ABI change by taking advantage of the space freed up by a recent patch called "Remove redundantnum_sgefields" which is a reprequisite for this patch series.The two patch sets have been tested with the pyverbs regression test suite with and without each set installed. This series enables 5 of the 6 xrc test cases in pyverbs. The ODP case does is currently skipped but should work once the ODP patch series is accepted.
Signed-off-by Bob Pearson <[email protected]>---
v2
Rebased to current for-next
Quoted 14 lines
Bob Pearson (13):
RDMA/rxe: ReplaceSTART->FIRST,END->LASTRDMA/rxe: Movenext_opcode()torxe_opcode.c
RDMA: Add xrc opcodes toib_pack.hRDMA/rxe: Extend opcodes and headers to support xrc RDMA/rxe: Add xrc opcodes tonext_opcode()RDMA/rxe: Implementopen_xrcdandclose_xrcdRDMA/rxe: Extend srq verbs to support xrcd RDMA/rxe: Extendrxe_qp.cto support xrc qps RDMA/rxe: Extendrxe_recv.cto support xrc RDMA/rxe: Extendrxe_comp.cto support xrc qps RDMA/rxe: Extendrxe_req.cto support xrc qps RDMA/rxe: Extendrxe_net.cto support xrc qps RDMA/rxe: Extendrxe_resp.cto support xrc qps
This doesn't apply anymore, so it needs a rebase. But nothing caught my eye in it.
If nobody has anything to say I will apply the rebased v3 next week.
Thanks,
Jason