Replace AV by AH in UD sends
Subsystems (2)
v2 cover Replace AV by AH in UD sends
Currently the rdma_rxe driver and its user space provider exchange addressing information for UD sends by having the provider compute an address vector (AV) and send it with each WQE. This is not the way that the RDMA verbs API was intended to operate.
This series of patches modifies the way UD send WQEs work by exchanging an index identifying the AH replacing the 88 byte AV by a 4 byte AH index. In order to not break compatibility with the existing API the rdma_rxe driver will recognise when an older version of the provider is not sending an index (i.e. it is 0) and will use the AV instead.
v2:
Rearranged AV in rxe_send_wqe to be in the ud struct but padded to the same offset as the original preserving ABI compatibility.
Bob Pearson (5):
RDMA/rxe: Change user/kernel API to allow indexing AH RDMA/rxe: Change AH objects to indexed RDMA/rxe: Create AH index and return to user space RDMA/rxe: Lookup kernel AH from ah index in UD WQEs RDMA/rxe: Convert kernel UD post send to use ah_num
drivers/infiniband/sw/rxe/rxe_av.c | 20 +++++++++++++- drivers/infiniband/sw/rxe/rxe_param.h | 4 ++- drivers/infiniband/sw/rxe/rxe_pool.c | 4 ++- drivers/infiniband/sw/rxe/rxe_req.c | 8 +++--- drivers/infiniband/sw/rxe/rxe_verbs.c | 39 ++++++++++++++++++++++----- drivers/infiniband/sw/rxe/rxe_verbs.h | 8 +++++- include/uapi/rdma/rdma_user_rxe.h | 14 +++++++++- 7 files changed, 83 insertions(+), 14 deletions(-)
Signature · 1 line
2.30.2
PATCH v2 1/5 RDMA/rxe: Change user/kernel API to allow indexing AH
Make changes to rdma_user_rxe.h to allow indexing AH objects, passing the index in UD send WRs to the driver and returning the index to the rxe provider. This change will allow removing handling of the AV in the user space provider.
In order to preserve ABI compatibility for old kernel and/or rdma-core code keep the AV in the WQE at the same offset but move to the UD specific part of the work request since that is the only case that uses it.
---
v2:
Moved AV from rxe_send_wqe to rxe_wr.
drivers/infiniband/sw/rxe/rxe_av.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 3 ++- include/uapi/rdma/rdma_user_rxe.h | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_av.c +1 -1
@@ -107,5 +107,5 @@ struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)if (qp_type (pkt->qp) ==IB_QPT_RC ||qp_type (pkt->qp) ==IB_QPT_UC )return &pkt->qp->pri_av; -return (pkt->wqe) ? &pkt->wqe->av :NULL ; +return (pkt->wqe) ? &pkt->wqe->wr.wr.ud.av :NULL ; }
drivers/infiniband/sw/rxe/rxe_verbs.c +2 -1
@@ -605,7 +605,8 @@ static void init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr,if (qp_type (qp) ==IB_QPT_UD ||qp_type (qp) ==IB_QPT_SMI ||qp_type (qp) ==IB_QPT_GSI ) -memcpy (&wqe->av, &to_rah (ud_wr (ibwr)->ah)->av,sizeof (wqe->av)); +memcpy (&wqe->wr.wr.ud.av, &to_rah (ud_wr (ibwr)->ah)->av, +sizeof (struct rxe_av ));if (unlikely (ibwr->send_flags &IB_SEND_INLINE ))copy_inline_data_to_wqe (wqe, ibwr);
include/uapi/rdma/rdma_user_rxe.h +9 -1
@@ -98,6 +98,10 @@ struct rxe_send_wr {__u32 remote_qpn;__u32 remote_qkey;__u16 pkey_index; +__u16 reserved; +__u32 ah_num; +__u32 pad[4 ]; +struct rxe_av av;/* deprecated */ } ud;struct {__aligned_u64 addr;
@@ -148,7 +152,6 @@ struct rxe_dma_info {struct rxe_send_wqe {struct rxe_send_wr wr; -struct rxe_av av;__u32 status;__u32 state;__aligned_u64 iova;
@@ -168,6 +171,11 @@ struct rxe_recv_wqe {struct rxe_dma_info dma; }; +struct rxe_create_ah_resp { +__u32 ah_num; +__u32 reserved; +}; +struct rxe_create_cq_resp {struct mminfo mi; };
Signature · 1 line
2.30.2
Jason Gunthorpe
maintainerRe: [PATCH for-next v2 1/5] RDMA/rxe: Change user/kernel API to allow indexing AH
Quoted 45 lines · Bob Pearson
Make changes to
rdma_user_rxe.hto allow indexing AH objects, passing the index in UD send WRs to the driver and returning the index to the rxe provider. This change will allow removing handling of the AV in the user space provider.In order to preserve ABI compatibility for old kernel and/or rdma-core code keep the AV in the WQE at the same offset but move to the UD specific part of the work request since that is the only case that uses it.
Signed-off-by Bob Pearson <[email protected]>v2:
Moved AV fromrxe_send_wqetorxe_wr.drivers/infiniband/sw/rxe/rxe_av.c | 2 +- drivers/infiniband/sw/rxe/rxe_verbs.c | 3 ++- include/uapi/rdma/rdma_user_rxe.h | 10 +++++++++- 3 files changed, 12 insertions(+), 3 deletions(-)drivers/infiniband/sw/rxe/rxe_av.c +2
-1+++ b/drivers/infiniband/sw/rxe/rxe_av.c@@ -107,5 +107,5 @@ struct rxe_av *rxe_get_av(struct rxe_pkt_info *pkt)if (qp_type (pkt->qp) ==IB_QPT_RC ||qp_type (pkt->qp) ==IB_QPT_UC )return &pkt->qp->pri_av; -return (pkt->wqe) ? &pkt->wqe->av :NULL ; +return (pkt->wqe) ? &pkt->wqe->wr.wr.ud.av :NULL ; }drivers/infiniband/sw/rxe/rxe_verbs.c +3
-1+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c@@ -605,7 +605,8 @@ static void init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr,if (qp_type (qp) ==IB_QPT_UD ||qp_type (qp) ==IB_QPT_SMI ||qp_type (qp) ==IB_QPT_GSI ) -memcpy (&wqe->av, &to_rah (ud_wr (ibwr)->ah)->av,sizeof (wqe->av)); +memcpy (&wqe->wr.wr.ud.av, &to_rah (ud_wr (ibwr)->ah)->av, +sizeof (struct rxe_av ));if (unlikely (ibwr->send_flags &IB_SEND_INLINE ))copy_inline_data_to_wqe (wqe, ibwr);include/uapi/rdma/rdma_user_rxe.h +1
-0+++ b/include/uapi/rdma/rdma_user_rxe.h
include/uapi/rdma/rdma_user_rxe.h struct rxe_send_wr { · line 102
Quoted 5 lines
include/uapi/rdma/rdma_user_rxe.h +2
-0@@ -98,6 +98,10 @@ struct rxe_send_wr {__u32 remote_qpn;__u32 remote_qkey;__u16 pkey_index; +__u16 reserved; +__u32 ah_num;
I'd leave this as pad[5] until the later patch when you can swap in ah_hum/pad[4]
include/uapi/rdma/rdma_user_rxe.h struct rxe_recv_wqe { · line 177
Quoted 8 lines
include/uapi/rdma/rdma_user_rxe.h +4
-0@@ -168,6 +171,11 @@ struct rxe_recv_wqe {struct rxe_dma_info dma; }; +struct rxe_create_ah_resp { +__u32 ah_num; +__u32 reserved; +};
This hunk should be moved to the later patch
Jason
PATCH v2 2/5 RDMA/rxe: Change AH objects to indexed
In reply to Bob PearsonMake changes to rxe_param.h and rxe_pool.c to allow indexing of AH objects. Valid indices are non-zero so older providers can be detected.
--- drivers/infiniband/sw/rxe/rxe_param.h | 4 +++- drivers/infiniband/sw/rxe/rxe_pool.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_param.h +3 -1
@@ -67,7 +67,9 @@ enum rxe_device_param {RXE_MAX_MCAST_GRP =8192 ,RXE_MAX_MCAST_QP_ATTACH =56 ,RXE_MAX_TOT_MCAST_QP_ATTACH =0x70000 , -RXE_MAX_AH =100 , +RXE_MAX_AH =16383 , +RXE_MIN_AH_INDEX =1 , +RXE_MAX_AH_INDEX =16383 ,RXE_MAX_SRQ_WR =0x4000 ,RXE_MIN_SRQ_WR =1 , RXE_MAX_SRQ_SGE = 27,
drivers/infiniband/sw/rxe/rxe_pool.c +3 -1
@@ -26,7 +26,9 @@ struct rxe_type_info rxe_type_info[RXE_NUM_TYPES] = { .name = "rxe-ah", .size = sizeof(struct rxe_ah), .elem_offset = offsetof(struct rxe_ah, pelem), - .flags = RXE_POOL_NO_ALLOC, + .flags = RXE_POOL_INDEX | RXE_POOL_NO_ALLOC, + .min_index = RXE_MIN_AH_INDEX, + .max_index = RXE_MAX_AH_INDEX, }, [RXE_TYPE_SRQ] = { .name = "rxe-srq",
Signature · 1 line
2.30.2
PATCH v2 3/5 RDMA/rxe: Create AH index and return to user space
In reply to Bob PearsonModify rxe_create_ah() to add an index to AH when created and if called from a new user provider return it to user space. If called from an old provider mark the AH as not having a useful index. Modify rxe_destroy_ah to drop the index before deleting the object.
Also use the PD in the core ib_ah struct instead of a duplicate copy in rxe_ah.
--- drivers/infiniband/sw/rxe/rxe_verbs.c | 31 ++++++++++++++++++++++++++- drivers/infiniband/sw/rxe/rxe_verbs.h | 8 ++++++- 2 files changed, 37 insertions(+), 2 deletions(-)
drivers/infiniband/sw/rxe/rxe_verbs.c +30 -1
@@ -161,9 +161,19 @@ static int rxe_create_ah(struct ib_ah *ibah, struct ib_udata *udata) { -int err;struct rxe_dev *rxe =to_rdev (ibah->device);struct rxe_ah *ah =to_rah (ibah); +struct rxe_create_ah_resp __user *uresp =NULL ; +int err; + +if (udata) { +/* test if new user provider */ +if (udata->outlen >=sizeof (*uresp)) + uresp = udata->outbuf; + ah->is_user = true; + }else { + ah->is_user = false; + } err =rxe_av_chk_attr (rxe, init_attr->ah_attr);if (err)
@@ -173,6 +183,24 @@ static int rxe_create_ah(struct ib_ah *ibah,if (err)return err; +/* create index > 0 */ +rxe_add_index (ah); + ah->ah_num = ah->pelem.index; + +if (uresp) { +/* only if new user provider */ + err =copy_to_user (&uresp->ah_num, &ah->ah_num, +sizeof (uresp->ah_num)); +if (err) { +rxe_drop_index (ah); +rxe_drop_ref (ah); +return -EFAULT ; + } + }else if (ah->is_user) { +/* only if old user provider */ + ah->ah_num =0 ; + } +rxe_init_av (init_attr->ah_attr, &ah->av);return 0 ; }
@@ -205,6 +233,7 @@ static int rxe_destroy_ah(struct ib_ah *ibah, u32 flags) {struct rxe_ah *ah =to_rah (ibah); +rxe_drop_index (ah);rxe_drop_ref (ah);return 0 ; }
drivers/infiniband/sw/rxe/rxe_verbs.h +7 -1
@@ -46,8 +46,9 @@ struct rxe_pd {struct rxe_ah {struct ib_ah ibah;struct rxe_pool_entry pelem; -struct rxe_pd *pd;struct rxe_av av; +bool is_user; +int ah_num; };struct rxe_cqe {
@@ -469,6 +470,11 @@ static inline struct rxe_mw *to_rmw(struct ib_mw *mw) return mw ? container_of(mw, struct rxe_mw, ibmw) : NULL; } +static inline struct rxe_pd *ah_pd (struct rxe_ah *ah) +{ +return to_rpd (ah->ibah.pd); +} +static inline struct rxe_pd *mr_pd (struct rxe_mr *mr) {return to_rpd (mr->ibmr.pd);
Signature · 1 line
2.30.2
PATCH v2 4/5 RDMA/rxe: Lookup kernel AH from ah index in UD WQEs
In reply to Bob PearsonAdd code to rxe_get_av in rxe_av.c to use the AH index in UD send WQEs to lookup the kernel AH. For old user providers continue to use the AV passed in WQEs. Move setting pkt->rxe to before the call to rxe_get_av() to get access to the AH pool.
--- drivers/infiniband/sw/rxe/rxe_av.c | 20 +++++++++++++++++++- drivers/infiniband/sw/rxe/rxe_req.c | 8 +++++--- 2 files changed, 24 insertions(+), 4 deletions(-)
drivers/infiniband/sw/rxe/rxe_av.c +19 -1
@@ -101,11 +101,29 @@ void rxe_av_fill_ip_info(struct rxe_av *av, struct rdma_ah_attr *attr)struct rxe_av *rxe_get_av (struct rxe_pkt_info *pkt) { +struct rxe_ah *ah; +u32 ah_num; +if (!pkt || !pkt->qp)return NULL ;if (qp_type (pkt->qp) ==IB_QPT_RC ||qp_type (pkt->qp) ==IB_QPT_UC )return &pkt->qp->pri_av; -return (pkt->wqe) ? &pkt->wqe->wr.wr.ud.av :NULL ; +if (!pkt->wqe) +return NULL ; + + ah_num = pkt->wqe->wr.wr.ud.ah_num; +if (ah_num) { +/* only new user provider or kernel client */ + ah =rxe_pool_get_index (&pkt->rxe->ah_pool, ah_num); +if (!ah || ah->ah_num != ah_num ||ah_pd (ah) != pkt->qp->pd) { +pr_warn ("Unable to find AH matching ah_num\n" ); +return NULL ; + } +return &ah->av; + } + +/* only old user provider for UD sends*/ +return &pkt->wqe->wr.wr.ud.av; }
drivers/infiniband/sw/rxe/rxe_req.c +5 -3
@@ -390,9 +390,8 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,/* length from start of bth to end of icrc */ paylen = rxe_opcode[opcode].length + payload + pad +RXE_ICRC_SIZE ; -/* pkt->hdr, rxe, port_num and mask are initialized in ifc -* layer -*/ +/* pkt->hdr, port_num and mask are initialized in ifc layer */ + pkt->rxe = rxe; pkt->opcode = opcode; pkt->qp = qp; pkt->psn = qp->req.psn;
@@ -402,6 +401,9 @@ static struct sk_buff *init_req_packet(struct rxe_qp *qp,/* init skb */ av =rxe_get_av (pkt); +if (!av) +return NULL ; + skb =rxe_init_packet (rxe, av, paylen, pkt);if (unlikely (!skb))return NULL ;
Signature · 1 line
2.30.2
PATCH v2 5/5 RDMA/rxe: Convert kernel UD post send to use ah_num
In reply to Bob PearsonModify ib_post_send for kernel UD sends to put the AH index into the WQE instead of the address vector.
--- drivers/infiniband/sw/rxe/rxe_verbs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/infiniband/sw/rxe/rxe_verbs.c +3 -6
@@ -558,8 +558,11 @@ static void init_send_wr(struct rxe_qp *qp, struct rxe_send_wr *wr,if (qp_type (qp) ==IB_QPT_UD ||qp_type (qp) ==IB_QPT_SMI ||qp_type (qp) ==IB_QPT_GSI ) { +struct ib_ah *ibah =ud_wr (ibwr)->ah; + wr->wr.ud.remote_qpn =ud_wr (ibwr)->remote_qpn; wr->wr.ud.remote_qkey =ud_wr (ibwr)->remote_qkey; + wr->wr.ud.ah_num =to_rah (ibah)->ah_num;if (qp_type (qp) ==IB_QPT_GSI ) wr->wr.ud.pkey_index =ud_wr (ibwr)->pkey_index;if (wr->opcode ==IB_WR_SEND_WITH_IMM )
@@ -631,12 +634,6 @@ static void init_send_wqe(struct rxe_qp *qp, const struct ib_send_wr *ibwr,return ; } -if (qp_type (qp) ==IB_QPT_UD || -qp_type (qp) ==IB_QPT_SMI || -qp_type (qp) ==IB_QPT_GSI ) -memcpy (&wqe->wr.wr.ud.av, &to_rah (ud_wr (ibwr)->ah)->av, -sizeof (struct rxe_av )); -if (unlikely (ibwr->send_flags &IB_SEND_INLINE ))copy_inline_data_to_wqe (wqe, ibwr);else
Signature · 1 line
2.30.2