[PATCH v2 1/2] Update kernel headers
From: Bob Pearson <hidden>
Date: 2021-07-18 21:29:17
Subsystem:
the rest · Maintainer:
Linus Torvalds
To commit ?? ("RDMA/rxe: Convert kernel UD post send to use ah_num").
Signed-off-by: Bob Pearson <redacted>
---
kernel-headers/rdma/rdma_user_rxe.h | 10 +++++++++-
providers/rxe/rxe.c | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/kernel-headers/rdma/rdma_user_rxe.h b/kernel-headers/rdma/rdma_user_rxe.h
index e283c222..ad7da77d 100644
--- a/kernel-headers/rdma/rdma_user_rxe.h
+++ b/kernel-headers/rdma/rdma_user_rxe.h@@ -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; };
diff --git a/providers/rxe/rxe.c b/providers/rxe/rxe.c
index 3c3ea8bb..d19aa9df 100644
--- a/providers/rxe/rxe.c
+++ b/providers/rxe/rxe.c@@ -982,7 +982,7 @@ static void wr_set_ud_addr(struct ibv_qp_ex *ibqp, struct ibv_ah *ibah, if (qp->err) return; - memcpy(&wqe->av, &ah->av, sizeof(ah->av)); + memcpy(&wqe->wr.wr.ud.av, &ah->av, sizeof(ah->av)); wqe->wr.wr.ud.remote_qpn = remote_qpn; wqe->wr.wr.ud.remote_qkey = remote_qkey; }
@@ -1467,7 +1467,7 @@ static int init_send_wqe(struct rxe_qp *qp, struct rxe_wq *sq, convert_send_wr(&wqe->wr, ibwr); if (qp_type(qp) == IBV_QPT_UD) - memcpy(&wqe->av, &to_rah(ibwr->wr.ud.ah)->av, + memcpy(&wqe->wr.wr.ud.av, &to_rah(ibwr->wr.ud.ah)->av, sizeof(struct rxe_av)); if (ibwr->send_flags & IBV_SEND_INLINE) {
--
2.30.2