From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80EDBC636CA for ; Sun, 18 Jul 2021 21:29:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 678E760FEA for ; Sun, 18 Jul 2021 21:29:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233058AbhGRVcQ (ORCPT ); Sun, 18 Jul 2021 17:32:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232459AbhGRVcP (ORCPT ); Sun, 18 Jul 2021 17:32:15 -0400 Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64BC9C061762 for ; Sun, 18 Jul 2021 14:29:16 -0700 (PDT) Received: by mail-ot1-x336.google.com with SMTP id f93-20020a9d03e60000b02904b1f1d7c5f4so16165603otf.9 for ; Sun, 18 Jul 2021 14:29:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7iSr868ePqw6t/YV2Zd1yZ1KuDtKFL5l/NV+90CA+Tc=; b=G7bHutMJqDZBeTIO77LnkBR+tfntWq152xKpEfbCk1rI3HBkLWP9clzs3zwq5evWp1 99joGUSy8eDw781SNKjaqafqtlDokfaq7GDJg5J3zw515+mIFltIAR4Ga2rd2lL1sCi0 rA3xrRnn0cu7WXuXd6GqicXUuSv/+WwVOZ0NvmFVK05JVmCAZOvlI+iFuLjo+mmPtWW/ xF+9S36GiMaR3OhI3LgFGFNyk4sT3a+WXZwL1IXyHXcyDBdHxqz8bec07R7SK3kt9nfM siu64xmmQ/XdW+52Y3GqvQrIRRR2r2n7a8lBxrACWrMImfrgy6TX2Ul3X4kVHvJbHUFf 7qcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7iSr868ePqw6t/YV2Zd1yZ1KuDtKFL5l/NV+90CA+Tc=; b=XRDX9HyIzPFAwKs7B8tPGBG4hWIkaa7VPNWhcyInttMIGrW0PjFzMZIx6WnQtjN/9G QF6UzOgVu795kDEANnHqbjvxZxRmDn1VWNMi0BT1AhA/dhQwqz7DjFZ/MVDqY+cq8zpi UIopT8Q0++cwlpiKzQjo9FYxGv4UHyBvk0ggYcICOsYpq8PCGRsNPPLgK5roLOki7qVf UCsgwV01iv5Z7mjxTz+AkJftmMkM9G240NX0CMs4qgEqBoBW9wBiAXLjLlczfLJ2ooEQ 01DeF5CdjfN16wFAG3MdQFlndfwygDUHVGu98F1UQcPF/f9aTrqqT6WsqPwMJnWMmVTe WHig== X-Gm-Message-State: AOAM532r3J+K4V0OESqdPMjQCFl+fEcL0Lb2guQMV4snMRQsI0b37J4M zZFcTfJjye5OOZL45csN3MI= X-Google-Smtp-Source: ABdhPJxt6tBGjzReR7tKVk9oD9ARPGUcdJtu3nPePJO4FEJvvDJu4uGGPkk1SOm6l4eV9BG/8tEn2w== X-Received: by 2002:a05:6830:411b:: with SMTP id w27mr1066222ott.221.1626643755845; Sun, 18 Jul 2021 14:29:15 -0700 (PDT) Received: from localhost (2603-8081-140c-1a00-0284-9a3c-0f8a-4ac7.res6.spectrum.com. [2603:8081:140c:1a00:284:9a3c:f8a:4ac7]) by smtp.gmail.com with ESMTPSA id a137sm2842333oib.0.2021.07.18.14.29.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jul 2021 14:29:15 -0700 (PDT) From: Bob Pearson To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org Cc: Bob Pearson Subject: [PATCH v2 2/2] Providers/rxe: Replace AV by AH for UD sends Date: Sun, 18 Jul 2021 16:28:43 -0500 Message-Id: <20210718212842.21559-3-rpearsonhpe@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210718212842.21559-1-rpearsonhpe@gmail.com> References: <20210718212842.21559-1-rpearsonhpe@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org Currently the rxe provider computes an AV for each AH created. These are then passed to the kernel in each UD send WQE. This rxe provider patch matches a set of kernel patches that creates an index for the pool of AHs which are passed back to the rxe provider which in turn returns them in the UD send WQEs instead of AVs. This falls back to the older AV based WQE if either the rxe provider or the kernel does not have these patches applied. Signed-off-by: Bob Pearson --- providers/rxe/rxe-abi.h | 2 + providers/rxe/rxe.c | 117 ++++++++++++++++++++++++++-------------- providers/rxe/rxe.h | 8 ++- 3 files changed, 85 insertions(+), 42 deletions(-) diff --git a/providers/rxe/rxe-abi.h b/providers/rxe/rxe-abi.h index 0689c3f4..020201a9 100644 --- a/providers/rxe/rxe-abi.h +++ b/providers/rxe/rxe-abi.h @@ -39,6 +39,8 @@ #include #include +DECLARE_DRV_CMD(urxe_create_ah, IB_USER_VERBS_CMD_CREATE_AH, + empty, rxe_create_ah_resp); DECLARE_DRV_CMD(urxe_create_cq, IB_USER_VERBS_CMD_CREATE_CQ, empty, rxe_create_cq_resp); DECLARE_DRV_CMD(urxe_create_cq_ex, IB_USER_VERBS_EX_CMD_CREATE_CQ, diff --git a/providers/rxe/rxe.c b/providers/rxe/rxe.c index d19aa9df..b34fb488 100644 --- a/providers/rxe/rxe.c +++ b/providers/rxe/rxe.c @@ -975,16 +975,20 @@ static void wr_set_ud_addr(struct ibv_qp_ex *ibqp, struct ibv_ah *ibah, uint32_t remote_qpn, uint32_t remote_qkey) { struct rxe_qp *qp = container_of(ibqp, struct rxe_qp, vqp.qp_ex); - struct rxe_ah *ah = container_of(ibah, struct rxe_ah, ibv_ah); + struct rxe_ah *ah = to_rah(ibah); struct rxe_send_wqe *wqe = addr_from_index(qp->sq.queue, qp->cur_index - 1); if (qp->err) return; - 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; + wqe->wr.wr.ud.ah_num = ah->ah_num; + + if (!ah->ah_num) + /* old kernels only */ + memcpy(&wqe->wr.wr.ud.av, &ah->av, sizeof(ah->av)); } static void wr_set_inline_data(struct ibv_qp_ex *ibqp, void *addr, @@ -1404,7 +1408,8 @@ static int validate_send_wr(struct rxe_qp *qp, struct ibv_send_wr *ibwr, return 0; } -static void convert_send_wr(struct rxe_send_wr *kwr, struct ibv_send_wr *uwr) +static void convert_send_wr(struct rxe_qp *qp, struct rxe_send_wr *kwr, + struct ibv_send_wr *uwr) { struct ibv_mw *ibmw; struct ibv_mr *ibmr; @@ -1427,8 +1432,13 @@ static void convert_send_wr(struct rxe_send_wr *kwr, struct ibv_send_wr *uwr) case IBV_WR_SEND: case IBV_WR_SEND_WITH_IMM: - kwr->wr.ud.remote_qpn = uwr->wr.ud.remote_qpn; - kwr->wr.ud.remote_qkey = uwr->wr.ud.remote_qkey; + if (qp_type(qp) == IBV_QPT_UD) { + struct rxe_ah *ah = to_rah(uwr->wr.ud.ah); + + kwr->wr.ud.remote_qpn = uwr->wr.ud.remote_qpn; + kwr->wr.ud.remote_qkey = uwr->wr.ud.remote_qkey; + kwr->wr.ud.ah_num = ah->ah_num; + } break; case IBV_WR_ATOMIC_CMP_AND_SWP: @@ -1464,11 +1474,15 @@ static int init_send_wqe(struct rxe_qp *qp, struct rxe_wq *sq, int i; unsigned int opcode = ibwr->opcode; - convert_send_wr(&wqe->wr, ibwr); + convert_send_wr(qp, &wqe->wr, ibwr); - if (qp_type(qp) == IBV_QPT_UD) - memcpy(&wqe->wr.wr.ud.av, &to_rah(ibwr->wr.ud.ah)->av, - sizeof(struct rxe_av)); + if (qp_type(qp) == IBV_QPT_UD) { + struct rxe_ah *ah = to_rah(ibwr->wr.ud.ah); + + if (!ah->ah_num) + /* old kernels only */ + memcpy(&wqe->wr.wr.ud.av, &ah->av, sizeof(struct rxe_av)); + } if (ibwr->send_flags & IBV_SEND_INLINE) { uint8_t *inline_data = wqe->dma.inline_data; @@ -1645,59 +1659,82 @@ static inline int rdma_gid2ip(sockaddr_union_t *out, union ibv_gid *gid) return 0; } -static struct ibv_ah *rxe_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) +static int rxe_create_av(struct rxe_ah *ah, struct ibv_pd *pd, + struct ibv_ah_attr *attr) { - int err; - struct rxe_ah *ah; - struct rxe_av *av; + struct rxe_av *av = &ah->av; union ibv_gid sgid; - struct ib_uverbs_create_ah_resp resp; - - err = ibv_query_gid(pd->context, attr->port_num, attr->grh.sgid_index, - &sgid); - if (err) { - fprintf(stderr, "rxe: Failed to query sgid.\n"); - return NULL; - } + int ret; - ah = malloc(sizeof(*ah)); - if (ah == NULL) - return NULL; + ret = ibv_query_gid(pd->context, attr->port_num, + attr->grh.sgid_index, &sgid); + if (ret) + return ret; - av = &ah->av; av->port_num = attr->port_num; memcpy(&av->grh, &attr->grh, sizeof(attr->grh)); - av->network_type = - ipv6_addr_v4mapped((struct in6_addr *)attr->grh.dgid.raw) ? - RXE_NETWORK_TYPE_IPV4 : RXE_NETWORK_TYPE_IPV6; + + ret = ipv6_addr_v4mapped((struct in6_addr *)attr->grh.dgid.raw); + av->network_type = ret ? RXE_NETWORK_TYPE_IPV4 : + RXE_NETWORK_TYPE_IPV6; rdma_gid2ip(&av->sgid_addr, &sgid); rdma_gid2ip(&av->dgid_addr, &attr->grh.dgid); - if (ibv_resolve_eth_l2_from_gid(pd->context, attr, av->dmac, NULL)) { - free(ah); - return NULL; - } - memset(&resp, 0, sizeof(resp)); - if (ibv_cmd_create_ah(pd, &ah->ibv_ah, attr, &resp, sizeof(resp))) { - free(ah); + ret = ibv_resolve_eth_l2_from_gid(pd->context, attr, + av->dmac, NULL); + + return ret; +} + +/* + * Newer kernels will return a non-zero AH index in resp.ah_num + * which can be returned in UD send WQEs. + * Older kernels will leave ah_num == 0. For these create an AV and use + * in UD send WQEs. + */ +static struct ibv_ah *rxe_create_ah(struct ibv_pd *pd, + struct ibv_ah_attr *attr) +{ + struct rxe_ah *ah; + struct urxe_create_ah_resp resp = {}; + int ret; + + ah = calloc(1, sizeof(*ah)); + if (!ah) return NULL; + + ret = ibv_cmd_create_ah(pd, &ah->ibv_ah, attr, + &resp.ibv_resp, sizeof(resp)); + if (ret) + goto err_free; + + ah->ah_num = resp.ah_num; + + if (!ah->ah_num) { + /* old kernels only */ + ret = rxe_create_av(ah, pd, attr); + if (ret) + goto err_free; } return &ah->ibv_ah; + +err_free: + free(ah); + return NULL; } static int rxe_destroy_ah(struct ibv_ah *ibah) { - int ret; struct rxe_ah *ah = to_rah(ibah); + int ret; ret = ibv_cmd_destroy_ah(&ah->ibv_ah); - if (ret) - return ret; + if (!ret) + free(ah); - free(ah); - return 0; + return ret; } static const struct verbs_context_ops rxe_ctx_ops = { diff --git a/providers/rxe/rxe.h b/providers/rxe/rxe.h index ddb8fe89..6882d9c7 100644 --- a/providers/rxe/rxe.h +++ b/providers/rxe/rxe.h @@ -67,6 +67,7 @@ struct rxe_cq { struct rxe_ah { struct ibv_ah ibv_ah; struct rxe_av av; + int ah_num; }; struct rxe_wq { @@ -89,8 +90,6 @@ struct rxe_qp { int err; }; -#define qp_type(qp) ((qp)->vqp.qp.qp_type) - struct rxe_srq { struct ibv_srq ibv_srq; struct mminfo mmap_info; @@ -130,4 +129,9 @@ static inline struct rxe_ah *to_rah(struct ibv_ah *ibah) return to_rxxx(ah, ah); } +static inline enum ibv_qp_type qp_type(struct rxe_qp *qp) +{ + return qp->vqp.qp.qp_type; +} + #endif /* RXE_H */ -- 2.30.2