From: Bob Pearson <rpearsonhpe@gmail.com>
To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org
Cc: Bob Pearson <rpearsonhpe@gmail.com>
Subject: [PATCH v2 1/2] Update kernel headers
Date: Sun, 18 Jul 2021 16:28:42 -0500 [thread overview]
Message-ID: <20210718212842.21559-2-rpearsonhpe@gmail.com> (raw)
In-Reply-To: <20210718212842.21559-1-rpearsonhpe@gmail.com>
To commit ?? ("RDMA/rxe: Convert kernel UD post send to use ah_num").
Signed-off-by: Bob Pearson <rpearsonhpe@gmail.com>
---
| 10 +++++++++-
providers/rxe/rxe.c | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
--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
next prev parent reply other threads:[~2021-07-18 21:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-18 21:28 [PATCH v2 0/2] Providers/rxe: Replace AV by AH for UD sends Bob Pearson
2021-07-18 21:28 ` Bob Pearson [this message]
2021-07-18 21:28 ` [PATCH v2 2/2] " Bob Pearson
-- strict thread matches above, loose matches on Subject: below --
2021-06-08 4:28 [PATCH v2 0/2] Implement memory windows support for rxe Bob Pearson
2021-06-08 4:28 ` [PATCH v2 1/2] Update kernel headers Bob Pearson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210718212842.21559-2-rpearsonhpe@gmail.com \
--to=rpearsonhpe@gmail.com \
--cc=jgg@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
--cc=zyjzyj2000@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).