From patchwork Thu Mar 15 07:20:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yixian Liu X-Patchwork-Id: 10283965 X-Patchwork-Delegate: leon@leon.nu Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BB1C760386 for ; Thu, 15 Mar 2018 07:21:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5849288E1 for ; Thu, 15 Mar 2018 07:21:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A0FE288F6; Thu, 15 Mar 2018 07:21:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FA61288E1 for ; Thu, 15 Mar 2018 07:21:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751362AbeCOHVS (ORCPT ); Thu, 15 Mar 2018 03:21:18 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:6237 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751405AbeCOHVQ (ORCPT ); Thu, 15 Mar 2018 03:21:16 -0400 Received: from DGGEMS406-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id DE8ACE1E55BAA; Thu, 15 Mar 2018 15:21:01 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.361.1; Thu, 15 Mar 2018 15:21:01 +0800 From: Yixian Liu To: , , CC: Subject: [PATCH v7 rdma-core 1/2] libhns: Support rq record doorbell Date: Thu, 15 Mar 2018 15:20:43 +0800 Message-ID: <1521098444-11247-2-git-send-email-liuyixian@huawei.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1521098444-11247-1-git-send-email-liuyixian@huawei.com> References: <1521098444-11247-1-git-send-email-liuyixian@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch updates to support rq record doorbell in the user space driver. Signed-off-by: Yixian Liu Signed-off-by: Lijun Ou Signed-off-by: Wei Hu (Xavier) Signed-off-by: Shaobo Xu --- providers/hns/CMakeLists.txt | 1 + providers/hns/hns_roce_u.h | 22 ++++++ providers/hns/hns_roce_u_abi.h | 5 ++ providers/hns/hns_roce_u_db.c | 165 +++++++++++++++++++++++++++++++++++++++ providers/hns/hns_roce_u_db.h | 5 ++ providers/hns/hns_roce_u_hw_v2.c | 9 ++- providers/hns/hns_roce_u_hw_v2.h | 4 + providers/hns/hns_roce_u_verbs.c | 22 +++++- 8 files changed, 229 insertions(+), 4 deletions(-) create mode 100644 providers/hns/hns_roce_u_db.c diff --git a/providers/hns/CMakeLists.txt b/providers/hns/CMakeLists.txt index f136151..697dbd7 100644 --- a/providers/hns/CMakeLists.txt +++ b/providers/hns/CMakeLists.txt @@ -1,6 +1,7 @@ rdma_provider(hns hns_roce_u.c hns_roce_u_buf.c + hns_roce_u_db.c hns_roce_u_hw_v1.c hns_roce_u_hw_v2.c hns_roce_u_verbs.c diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h index 0291246..4404c85 100644 --- a/providers/hns/hns_roce_u.h +++ b/providers/hns/hns_roce_u.h @@ -39,6 +39,7 @@ #include #include #include +#include #include #define HNS_ROCE_CQE_ENTRY_SIZE 0x20 @@ -93,6 +94,21 @@ struct hns_roce_buf { unsigned int length; }; +/* the sw doorbell type; */ +enum hns_roce_db_type { + HNS_ROCE_QP_TYPE_DB, + HNS_ROCE_CQ_TYPE_DB, + HNS_ROCE_DB_TYPE_NUM +}; + +struct hns_roce_db_page { + struct hns_roce_db_page *prev, *next; + struct hns_roce_buf buf; + unsigned int num_db; + unsigned int use_cnt; + bitmap *bitmap; +}; + struct hns_roce_context { struct verbs_context ibv_ctx; void *uar; @@ -110,6 +126,10 @@ struct hns_roce_context { int num_qps; int qp_table_shift; int qp_table_mask; + + struct hns_roce_db_page *db_list[HNS_ROCE_DB_TYPE_NUM]; + pthread_mutex_t db_list_mutex; + unsigned int max_qp_wr; unsigned int max_sge; int max_cqe; @@ -188,12 +208,14 @@ struct hns_roce_qp { unsigned int sq_signal_bits; struct hns_roce_wq sq; struct hns_roce_wq rq; + uint32_t *rdb; struct hns_roce_sge_ex sge; unsigned int next_sge; int port_num; int sl; struct hns_roce_rinl_buf rq_rinl_buf; + unsigned long flags; }; struct hns_roce_u_hw { diff --git a/providers/hns/hns_roce_u_abi.h b/providers/hns/hns_roce_u_abi.h index 251a5c9..ec145bb 100644 --- a/providers/hns/hns_roce_u_abi.h +++ b/providers/hns/hns_roce_u_abi.h @@ -38,6 +38,7 @@ struct hns_roce_alloc_ucontext_resp { struct ib_uverbs_get_context_resp ibv_resp; __u32 qp_tab_size; + __u32 reserved; }; struct hns_roce_alloc_pd_resp { @@ -68,4 +69,8 @@ struct hns_roce_create_qp { __u8 reserved[5]; }; +struct hns_roce_create_qp_resp { + struct ib_uverbs_create_qp_resp base; + __u64 cap_flags; +}; #endif /* _HNS_ROCE_U_ABI_H */ diff --git a/providers/hns/hns_roce_u_db.c b/providers/hns/hns_roce_u_db.c new file mode 100644 index 0000000..f1c849b --- /dev/null +++ b/providers/hns/hns_roce_u_db.c @@ -0,0 +1,165 @@ +/* + * Copyright (c) 2017 Hisilicon Limited. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include +#include +#include +#include +#include "hns_roce_u.h" +#include "hns_roce_u_db.h" + +/* the sw db length, on behalf of the qp/cq/srq length from left to right */ +static const unsigned int db_size[] = { + [HNS_ROCE_QP_TYPE_DB] = 4, + [HNS_ROCE_CQ_TYPE_DB] = 4, +}; + +static struct hns_roce_db_page *hns_roce_add_db_page( + struct hns_roce_context *ctx, + enum hns_roce_db_type type) +{ + struct hns_roce_db_page *page; + int page_size; + + page_size = to_hr_dev(ctx->ibv_ctx.context.device)->page_size; + page = calloc(1, sizeof(*page)); + if (!page) + goto err_page; + + /* allocate bitmap space for sw db and init all bitmap to 1 */ + page->num_db = page_size / db_size[type]; + page->use_cnt = 0; + page->bitmap = bitmap_alloc1(page->num_db); + if (!page->bitmap) + goto err_map; + + if (hns_roce_alloc_buf(&(page->buf), page_size, page_size)) + goto err; + + /* add the set ctx->db_list */ + page->prev = NULL; + page->next = ctx->db_list[type]; + ctx->db_list[type] = page; + if (page->next) + page->next->prev = page; + + return page; +err: + free(page->bitmap); + +err_map: + free(page); + +err_page: + return NULL; +} + +static void hns_roce_clear_db_page(struct hns_roce_db_page *page) +{ + assert(page); + + if (page->bitmap) + free(page->bitmap); + + hns_roce_free_buf(&(page->buf)); +} + +void *hns_roce_alloc_db(struct hns_roce_context *ctx, + enum hns_roce_db_type type) +{ + struct hns_roce_db_page *page; + void *db = NULL; + uint32_t npos; + + pthread_mutex_lock((pthread_mutex_t *)&ctx->db_list_mutex); + + for (page = ctx->db_list[type]; page != NULL; page = page->next) + if (page->use_cnt < page->num_db) + goto found; + + page = hns_roce_add_db_page(ctx, type); + if (!page) + goto out; + +found: + ++page->use_cnt; + + npos = bitmap_ffs(page->bitmap, 0, page->num_db); + bitmap_clear_bit(page->bitmap, npos); + db = page->buf.buf + npos * db_size[type]; + +out: + pthread_mutex_unlock((pthread_mutex_t *)&ctx->db_list_mutex); + + return db; +} + +void hns_roce_free_db(struct hns_roce_context *ctx, unsigned int *db, + enum hns_roce_db_type type) +{ + struct hns_roce_db_page *page; + uint32_t npos; + uint32_t page_size; + + pthread_mutex_lock((pthread_mutex_t *)&ctx->db_list_mutex); + + page_size = to_hr_dev(ctx->ibv_ctx.context.device)->page_size; + for (page = ctx->db_list[type]; page != NULL; page = page->next) + if (((uintptr_t)db & (~((uintptr_t)page_size - 1))) == + (uintptr_t)(page->buf.buf)) + goto found; + + goto out; + +found: + --page->use_cnt; + if (!page->use_cnt) { + if (page->prev) + page->prev->next = page->next; + else + ctx->db_list[type] = page->next; + + if (page->next) + page->next->prev = page->prev; + + hns_roce_clear_db_page(page); + free(page); + + goto out; + } + + npos = ((uintptr_t)db - (uintptr_t)page->buf.buf) / db_size[type]; + bitmap_set_bit(page->bitmap, npos); + +out: + pthread_mutex_unlock((pthread_mutex_t *)&ctx->db_list_mutex); +} diff --git a/providers/hns/hns_roce_u_db.h b/providers/hns/hns_roce_u_db.h index 76d13ce..b44e64d 100644 --- a/providers/hns/hns_roce_u_db.h +++ b/providers/hns/hns_roce_u_db.h @@ -51,4 +51,9 @@ static inline void hns_roce_write64(uint32_t val[2], *(volatile uint64_t *) (ctx->uar + offset) = HNS_ROCE_PAIR_TO_64(val); } +void *hns_roce_alloc_db(struct hns_roce_context *ctx, + enum hns_roce_db_type type); +void hns_roce_free_db(struct hns_roce_context *ctx, unsigned int *db, + enum hns_roce_db_type type); + #endif /* _HNS_ROCE_U_DB_H */ diff --git a/providers/hns/hns_roce_u_hw_v2.c b/providers/hns/hns_roce_u_hw_v2.c index 0da6694..b145b17 100644 --- a/providers/hns/hns_roce_u_hw_v2.c +++ b/providers/hns/hns_roce_u_hw_v2.c @@ -830,7 +830,10 @@ out: if (nreq) { qp->rq.head += nreq; - hns_roce_update_rq_db(ctx, qp->ibv_qp.qp_num, + if (qp->flags & HNS_ROCE_SUPPORT_RQ_RECORD_DB) + *qp->rdb = qp->rq.head & 0xffff; + else + hns_roce_update_rq_db(ctx, qp->ibv_qp.qp_num, qp->rq.head & ((qp->rq.wqe_cnt << 1) - 1)); } @@ -972,6 +975,10 @@ static int hns_roce_u_v2_destroy_qp(struct ibv_qp *ibqp) hns_roce_unlock_cqs(ibqp); pthread_mutex_unlock(&to_hr_ctx(ibqp->context)->qp_table_mutex); + if (qp->rq.max_gs) + hns_roce_free_db(to_hr_ctx(ibqp->context), qp->rdb, + HNS_ROCE_QP_TYPE_DB); + hns_roce_free_buf(&qp->buf); if (qp->rq_rinl_buf.wqe_list) { if (qp->rq_rinl_buf.wqe_list[0].sg_list) { diff --git a/providers/hns/hns_roce_u_hw_v2.h b/providers/hns/hns_roce_u_hw_v2.h index 061ae54..15ac0ca 100644 --- a/providers/hns/hns_roce_u_hw_v2.h +++ b/providers/hns/hns_roce_u_hw_v2.h @@ -40,6 +40,10 @@ #define HNS_ROCE_CMDSN_MASK 0x3 +enum { + HNS_ROCE_SUPPORT_RQ_RECORD_DB = 1 << 0, +}; + /* V2 REG DEFINITION */ #define ROCEE_VF_DB_CFG0_OFFSET 0x0230 diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c index 785a343..62097a1 100644 --- a/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c @@ -41,6 +41,7 @@ #include #include "hns_roce_u.h" #include "hns_roce_u_abi.h" +#include "hns_roce_u_db.h" #include "hns_roce_u_hw_v1.h" #include "hns_roce_u_hw_v2.h" @@ -514,8 +515,8 @@ struct ibv_qp *hns_roce_u_create_qp(struct ibv_pd *pd, { int ret; struct hns_roce_qp *qp = NULL; - struct hns_roce_create_qp cmd; - struct ib_uverbs_create_qp_resp resp; + struct hns_roce_create_qp cmd = {}; + struct hns_roce_create_qp_resp resp = {}; struct hns_roce_context *context = to_hr_ctx(pd->context); unsigned int sge_ex_count; @@ -567,6 +568,17 @@ struct ibv_qp *hns_roce_u_create_qp(struct ibv_pd *pd, goto err_free; } + if ((to_hr_dev(pd->context->device)->hw_version != HNS_ROCE_HW_VER1) && + attr->cap.max_recv_sge) { + qp->rdb = hns_roce_alloc_db(context, HNS_ROCE_QP_TYPE_DB); + if (!qp->rdb) + goto err_free; + + *(qp->rdb) = 0; + cmd.db_addr = (uintptr_t) qp->rdb; + } else + cmd.db_addr = 0; + cmd.buf_addr = (uintptr_t) qp->buf.buf; cmd.log_sq_stride = qp->sq.wqe_shift; for (cmd.log_sq_bb_count = 0; qp->sq.wqe_cnt > 1 << cmd.log_sq_bb_count; @@ -578,7 +590,7 @@ struct ibv_qp *hns_roce_u_create_qp(struct ibv_pd *pd, pthread_mutex_lock(&to_hr_ctx(pd->context)->qp_table_mutex); ret = ibv_cmd_create_qp(pd, &qp->ibv_qp, attr, &cmd.ibv_cmd, - sizeof(cmd), &resp, sizeof(resp)); + sizeof(cmd), &resp.base, sizeof(resp)); if (ret) { fprintf(stderr, "ibv_cmd_create_qp failed!\n"); goto err_rq_db; @@ -593,6 +605,7 @@ struct ibv_qp *hns_roce_u_create_qp(struct ibv_pd *pd, qp->rq.wqe_cnt = attr->cap.max_recv_wr; qp->rq.max_gs = attr->cap.max_recv_sge; + qp->flags = resp.cap_flags; /* adjust rq maxima to not exceed reported device maxima */ attr->cap.max_recv_wr = min(context->max_qp_wr, attr->cap.max_recv_wr); @@ -610,6 +623,9 @@ err_destroy: err_rq_db: pthread_mutex_unlock(&to_hr_ctx(pd->context)->qp_table_mutex); + if ((to_hr_dev(pd->context->device)->hw_version != HNS_ROCE_HW_VER1) && + attr->cap.max_recv_sge) + hns_roce_free_db(context, qp->rdb, HNS_ROCE_QP_TYPE_DB); err_free: free(qp->sq.wrid);