From patchwork Thu Sep 30 04:35:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Pearson X-Patchwork-Id: 12527239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 60DC7C433F5 for ; Thu, 30 Sep 2021 04:36:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C76561263 for ; Thu, 30 Sep 2021 04:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229643AbhI3Eh7 (ORCPT ); Thu, 30 Sep 2021 00:37:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229509AbhI3Eh6 (ORCPT ); Thu, 30 Sep 2021 00:37:58 -0400 Received: from mail-ot1-x332.google.com (mail-ot1-x332.google.com [IPv6:2607:f8b0:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0AE8C06161C for ; Wed, 29 Sep 2021 21:36:16 -0700 (PDT) Received: by mail-ot1-x332.google.com with SMTP id r43-20020a05683044ab00b0054716b40005so5727700otv.4 for ; Wed, 29 Sep 2021 21:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rnph8n3lz4XfDGvrHQ9k3gv+YZef3cwysa36LX/XIz4=; b=mmJYG/arklm+ULnhgEER0tctlt6hD/ihtYVHV+PmdBmhngfGO6heA4mJhVPQ2sxbG+ naseXHJBBaYGioHMv8i0Nd3ghyLURqdGnQaHH0AQmVbirCGGesZBjq3NSAI5/nnFLhoN m9kgibpvEvr73a2iG2gKKYe/R9DlWf30uapSs0uqsjOvaaEZD4X8BwSC/xVLw4t/3ks8 4rgf4bISosl8tLnKo1Pn8J8eQE7YOtxUFRy7LQQH5UCI+RiArdicazR7iXAmJHxwB+Cs QA0Kv39cqUYGu9Ggd+oIdC9a7lW4QeOiGRbOPL6HswyjE55bqFAVrxnxLaqtzDs+mdOh MotA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rnph8n3lz4XfDGvrHQ9k3gv+YZef3cwysa36LX/XIz4=; b=Ybazpdfb2ZZrFtX7MQiHhUGxckGUHq1/NGOemvtdRLhV5xNhofM+qxev6KzoEqJd5r 5kTzxLJgZxSbmcl4vxorQ8APV7d2HBHAmU9jW2UY+mGs/TOb0E04QUiPDndgox2fbaoN e+P0lV6YiBUqI/+kamBk/W/6PEi3fKEyLo/EgW481AqgwY3s3FyEWJtx9jB3sR8/gKcr emdkNLSOtKbILAV5DYdJ/sIA20QysT4FcFa/a2qRO60YedSmA7YIkw/4BebxOLuiDL4s GXjlPeZHNcp81b2XMda0b8MRJjr7yvUOG2L0yFfRFylojy2uDFEUMN8g9bN0oqHtNYoQ SONQ== X-Gm-Message-State: AOAM531Imq+BJDEkmC6yAtDWjxmcNh7m/JUPTfM6NtW/ufAx00uUVJDM zU9WRx0kUZwWJTyYzcBvyZk= X-Google-Smtp-Source: ABdhPJye/ZPKURgVBFqF9dxKNqB3Ji+aaSntmot/p/t4Vj2xXX1o+fWgQ4TDADDvum4RQEX97K5xLQ== X-Received: by 2002:a9d:734f:: with SMTP id l15mr3286438otk.4.1632976576130; Wed, 29 Sep 2021 21:36:16 -0700 (PDT) Received: from ubunto-21.tx.rr.com (2603-8081-140c-1a00-48b3-0edc-a395-cab0.res6.spectrum.com. [2603:8081:140c:1a00:48b3:edc:a395:cab0]) by smtp.gmail.com with ESMTPSA id k15sm389427ooh.41.2021.09.29.21.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 21:36:15 -0700 (PDT) From: Bob Pearson To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org Cc: Bob Pearson Subject: [PATCH resending v2 1/2] Update kernel headers Date: Wed, 29 Sep 2021 23:35:02 -0500 Message-Id: <20210930043502.4941-2-rpearsonhpe@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210930043502.4941-1-rpearsonhpe@gmail.com> References: <20210930043502.4941-1-rpearsonhpe@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org To commit ?? ("RDMA/rxe: Convert kernel UD post send to use ah_num"). Signed-off-by: Bob Pearson --- 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) { From patchwork Thu Sep 30 04:35:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bob Pearson X-Patchwork-Id: 12527241 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3631C4332F for ; Thu, 30 Sep 2021 04:36:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 95A3660F6B for ; Thu, 30 Sep 2021 04:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229509AbhI3Eh7 (ORCPT ); Thu, 30 Sep 2021 00:37:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbhI3Eh7 (ORCPT ); Thu, 30 Sep 2021 00:37:59 -0400 Received: from mail-oo1-xc32.google.com (mail-oo1-xc32.google.com [IPv6:2607:f8b0:4864:20::c32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78DEFC06161C for ; Wed, 29 Sep 2021 21:36:17 -0700 (PDT) Received: by mail-oo1-xc32.google.com with SMTP id h11-20020a4aa74b000000b002a933d156cbso1464923oom.4 for ; Wed, 29 Sep 2021 21:36:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7iSr868ePqw6t/YV2Zd1yZ1KuDtKFL5l/NV+90CA+Tc=; b=BQBIlN/jOgLwVGbCAxdRlb9tnzSzVQcgsXmJFwH5ngvq45zSE+zONuLKTF7MLfXaY/ mf0tZIlmjmA4kytzJ33X/MDW5+EfOBkLEb5h0BR99OeQy+6I+orwj9C0d9tZydGNALDo ie17eivVHKwzju02TGOKxGReVihqw7bsHJ21ZlVDZtzejFiZfB76ldvQPRGjYSGJB5Zh kRTGNfTq/SihKANcBX3zNf7aiH84CEUuorR16GljlKiV3is0y88MZYSNMPIYLj1kCMEv 5KtSmvyw5zT7+GRyR5M4hJBxZzxW55/P87v7toFaaF0oDpHl8tKrv45dP7yhzAu7Y0Nb cPKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=bjQU9BrynctlVa2nXqDX9csOeooCUPtMHgeX1B7A+sYVNVpo0p8gEeN+I7ukwgE/5e CHOmWDXsrtjNppRXwu6YbbiIGtol8fKHD3klSbW0z1kha+MeQ1CNxZpW0dCWmt7MsID2 RL2kGpLqST1i0b8J5Fv0hmlcZ4iKJTdEYk3jUDfxW11XqsxIamgNXcjsrnO61sqk09ju sBZTw2DXebMj+Xbsf5mlnWhoCoRbtGHBnWii3RKpHAZob6gxbpEyD1XIqxkBwVSwKwrv F6L5KxmZM0gcRbOIJnQhiYd2Ni3LN5ZjIIrRxNw/kOBG6oQP7sZfHqXVa0abr+NogmdZ 0/UA== X-Gm-Message-State: AOAM530ionbsZByeayBBjOlr7a1hzh10pKo4jWpjePTI4yQ2qSgCaXok 9RKRQnq420RC7pQjFeq8hxQ= X-Google-Smtp-Source: ABdhPJzhgxuxPDkcKtAtR4/5OSpp5uQXNCHPPEvxNXbK819ee+PtNxrqhAExotYvoGjYitqpOX4Qsw== X-Received: by 2002:a05:6820:386:: with SMTP id r6mr3105119ooj.88.1632976576843; Wed, 29 Sep 2021 21:36:16 -0700 (PDT) Received: from ubunto-21.tx.rr.com (2603-8081-140c-1a00-48b3-0edc-a395-cab0.res6.spectrum.com. [2603:8081:140c:1a00:48b3:edc:a395:cab0]) by smtp.gmail.com with ESMTPSA id k15sm389427ooh.41.2021.09.29.21.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Sep 2021 21:36:16 -0700 (PDT) From: Bob Pearson To: jgg@nvidia.com, zyjzyj2000@gmail.com, linux-rdma@vger.kernel.org Cc: Bob Pearson Subject: [PATCH resending v2 2/2] Providers/rxe: Replace AV by AH for UD sends Date: Wed, 29 Sep 2021 23:35:03 -0500 Message-Id: <20210930043502.4941-3-rpearsonhpe@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210930043502.4941-1-rpearsonhpe@gmail.com> References: <20210930043502.4941-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 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 */