From patchwork Mon Jun 28 22:03:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Pearson X-Patchwork-Id: 12348629 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 D63B2C11F66 for ; Mon, 28 Jun 2021 22:03:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B12F561CF9 for ; Mon, 28 Jun 2021 22:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233872AbhF1WGK (ORCPT ); Mon, 28 Jun 2021 18:06:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236944AbhF1WGA (ORCPT ); Mon, 28 Jun 2021 18:06:00 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A958C061787 for ; Mon, 28 Jun 2021 15:03:32 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id v5-20020a0568301bc5b029045c06b14f83so20440376ota.13 for ; Mon, 28 Jun 2021 15:03:32 -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=iyzsdZq6nUU09p8DxfvtdEDEX30fQzTkBQEz+UIdUbA=; b=KLkZiWmS3b+JmPoqbAeVQC8j74AS9jcV+OskhPoMzMsn8v8ummKHRuFobmO/WEc4p6 GMQOrXqZuA+PA1OUys0YUzpyQGfxskTzstAiBu8K0DsyCjkGgKcwl+UR1N6jixVSGm+Q XtKirf/2n7nnCK7wxqiekxoky/aQ9XaW8HVKvGlEJWn+V7v7yfOZHy8h4OeIbOM166oc grccmPHIlr0d9sXUhE4P2scSeDSJe4/EwdmYtEe3Sp2eA5IPRlRyDTrzvAmwCBcbhFJS 1hkg+8WHgHA5jAf+edIyNLn5OzEXFgjPcPLVi8t3swWyguBlDQuT4ljmfNyXeCv65qlZ P/tA== 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=iyzsdZq6nUU09p8DxfvtdEDEX30fQzTkBQEz+UIdUbA=; b=D39IwuWECWf9yaZDIMAOzsKVuqUisFRHGP0A7LGUc81FepNR6oziG+YLaaMQzmYaIu sdcvQM2y6zS6YXmD4w3OzeWtMZTyyNlGDUjsSLw/dAnWJJqCn7uPRREZ+CJ9SO3akyRj ++zjeDRONuBLGIlBcVkvxHZAI4xUFMMbEI7uC30QEDf8qprNchyVj05R4/fXNeMMUMCy I/+neMVCJW7G7qJmwrd526UAlcZoQHdf+PtXXFE8AmcQH9NqLJFPHxz14Pek7H9VGHKG OjmsQR/mRwJ3shzFfu4SfXylbAR2kMqOSJAyTwh23Src+N10iphELGmXBwvHXaW6Slbk 4I/Q== X-Gm-Message-State: AOAM530YRASqkzr7kVq0t5Zh8qPZ3XdQWE7XYQy4Ay0fWRsHbhcbLjPv LDFWqvNCUaWKrh0kjxPpj0Y8hWg0x4Y= X-Google-Smtp-Source: ABdhPJx71cDJwGKSX9q+tnIQoZwt/vEMAw8zCtbpwxCOKJZtg7MXembBK2k4jFR/qQp2Ier8BwgJYQ== X-Received: by 2002:a9d:7f91:: with SMTP id t17mr1512292otp.22.1624917811731; Mon, 28 Jun 2021 15:03:31 -0700 (PDT) Received: from localhost (2603-8081-140c-1a00-aaa9-75eb-6e0f-9f85.res6.spectrum.com. [2603:8081:140c:1a00:aaa9:75eb:6e0f:9f85]) by smtp.gmail.com with ESMTPSA id w12sm3224160oor.35.2021.06.28.15.03.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jun 2021 15:03:31 -0700 (PDT) From: Bob Pearson To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org Cc: Bob Pearson Subject: [PATCH 2/2] Providers/rxe: Replace AV by AH for UD sends Date: Mon, 28 Jun 2021 17:03:04 -0500 Message-Id: <20210628220303.9938-2-rpearsonhpe@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210628220303.9938-1-rpearsonhpe@gmail.com> References: <20210628220303.9938-1-rpearsonhpe@gmail.com> MIME-Version: 1.0 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 3c3ea8bb..12ffe779 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->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->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->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->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 */