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=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 653A9C3A5A2 for ; Tue, 10 Sep 2019 12:24:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 478B5208E4 for ; Tue, 10 Sep 2019 12:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391540AbfIJMYW (ORCPT ); Tue, 10 Sep 2019 08:24:22 -0400 Received: from szxga06-in.huawei.com ([45.249.212.32]:44132 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2390302AbfIJMYW (ORCPT ); Tue, 10 Sep 2019 08:24:22 -0400 Received: from DGGEMS410-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 624252D05724D93B9EE5; Tue, 10 Sep 2019 20:24:19 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by DGGEMS410-HUB.china.huawei.com (10.3.19.210) with Microsoft SMTP Server id 14.3.439.0; Tue, 10 Sep 2019 20:24:08 +0800 From: Weihang Li To: , CC: , Subject: [PATCH rdma-core 1/5] libhns: Add support of handling AH for hip08 Date: Tue, 10 Sep 2019 20:20:48 +0800 Message-ID: <1568118052-33380-2-git-send-email-liweihang@hisilicon.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1568118052-33380-1-git-send-email-liweihang@hisilicon.com> References: <1568118052-33380-1-git-send-email-liweihang@hisilicon.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.67.165.24] X-CFilter-Loop: Reflected Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Lijun Ou This patch achieves two verbs create_ah and destroy_ah to support allocation and destruction of Address Handle. Signed-off-by: Lijun Ou Signed-off-by: Weihang Li --- kernel-headers/rdma/hns-abi.h | 7 ++++++ providers/hns/hns_roce_u.c | 2 ++ providers/hns/hns_roce_u.h | 30 +++++++++++++++++++++++ providers/hns/hns_roce_u_abi.h | 3 ++- providers/hns/hns_roce_u_verbs.c | 53 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 94 insertions(+), 1 deletion(-) diff --git a/kernel-headers/rdma/hns-abi.h b/kernel-headers/rdma/hns-abi.h index eb76b38..5f9b178 100644 --- a/kernel-headers/rdma/hns-abi.h +++ b/kernel-headers/rdma/hns-abi.h @@ -80,4 +80,11 @@ struct hns_roce_ib_alloc_pd_resp { __u32 pdn; }; +struct hns_roce_ib_create_ah_resp { + __u8 dmac[6]; + __u16 vlan_id; + __u8 vlan_en; + __u8 reserved[7]; +}; + #endif /* HNS_ABI_USER_H */ diff --git a/providers/hns/hns_roce_u.c b/providers/hns/hns_roce_u.c index 5872599..8ba41de 100644 --- a/providers/hns/hns_roce_u.c +++ b/providers/hns/hns_roce_u.c @@ -81,6 +81,8 @@ static const struct verbs_context_ops hns_common_ops = { .modify_srq = hns_roce_u_modify_srq, .query_srq = hns_roce_u_query_srq, .destroy_srq = hns_roce_u_destroy_srq, + .create_ah = hns_roce_u_create_ah, + .destroy_ah = hns_roce_u_destroy_ah, }; static struct verbs_context *hns_roce_alloc_context(struct ibv_device *ibdev, diff --git a/providers/hns/hns_roce_u.h b/providers/hns/hns_roce_u.h index 23e0f13..45472fe 100644 --- a/providers/hns/hns_roce_u.h +++ b/providers/hns/hns_roce_u.h @@ -68,6 +68,8 @@ #define HNS_ROCE_TPTR_OFFSET 0x1000 #define HNS_ROCE_STATIC_RATE 3 /* Gbps */ +#define ETH_ALEN 6 + #define roce_get_field(origin, mask, shift) \ (((le32toh(origin)) & (mask)) >> (shift)) @@ -244,6 +246,25 @@ struct hns_roce_qp { unsigned long flags; }; +struct hns_roce_av { + uint8_t port; + uint8_t gid_index; + uint8_t static_rate; + uint8_t hop_limit; + uint32_t flowlabel; + uint8_t sl; + uint8_t tclass; + uint8_t dgid[HNS_ROCE_GID_SIZE]; + uint8_t mac[ETH_ALEN]; + uint16_t vlan_id; + uint8_t vlan_en; +}; + +struct hns_roce_ah { + struct ibv_ah ibv_ah; + struct hns_roce_av av; +}; + struct hns_roce_u_hw { uint32_t hw_version; struct verbs_context_ops hw_ops; @@ -280,6 +301,11 @@ static inline struct hns_roce_qp *to_hr_qp(struct ibv_qp *ibv_qp) return container_of(ibv_qp, struct hns_roce_qp, ibv_qp); } +static inline struct hns_roce_ah *to_hr_ah(struct ibv_ah *ibv_ah) +{ + return container_of(ibv_ah, struct hns_roce_ah, ibv_ah); +} + int hns_roce_u_query_device(struct ibv_context *context, struct ibv_device_attr *attr); int hns_roce_u_query_port(struct ibv_context *context, uint8_t port, @@ -319,6 +345,10 @@ struct ibv_qp *hns_roce_u_create_qp(struct ibv_pd *pd, int hns_roce_u_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr, int attr_mask, struct ibv_qp_init_attr *init_attr); +struct ibv_ah *hns_roce_u_create_ah(struct ibv_pd *pd, + struct ibv_ah_attr *attr); +int hns_roce_u_destroy_ah(struct ibv_ah *ah); + int hns_roce_alloc_buf(struct hns_roce_buf *buf, unsigned int size, int page_size); void hns_roce_free_buf(struct hns_roce_buf *buf); diff --git a/providers/hns/hns_roce_u_abi.h b/providers/hns/hns_roce_u_abi.h index 79fd7dd..029535e 100644 --- a/providers/hns/hns_roce_u_abi.h +++ b/providers/hns/hns_roce_u_abi.h @@ -48,5 +48,6 @@ DECLARE_DRV_CMD(hns_roce_alloc_ucontext, IB_USER_VERBS_CMD_GET_CONTEXT, DECLARE_DRV_CMD(hns_roce_create_srq, IB_USER_VERBS_CMD_CREATE_SRQ, hns_roce_ib_create_srq, hns_roce_ib_create_srq_resp); - +DECLARE_DRV_CMD(hns_roce_create_ah, IB_USER_VERBS_CMD_CREATE_AH, empty, + hns_roce_ib_create_ah_resp); #endif /* _HNS_ROCE_U_ABI_H */ diff --git a/providers/hns/hns_roce_u_verbs.c b/providers/hns/hns_roce_u_verbs.c index 9d222c0..0d10b1c 100644 --- a/providers/hns/hns_roce_u_verbs.c +++ b/providers/hns/hns_roce_u_verbs.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include "hns_roce_u.h" #include "hns_roce_u_abi.h" @@ -952,3 +953,55 @@ int hns_roce_u_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr, return ret; } + +struct ibv_ah *hns_roce_u_create_ah(struct ibv_pd *pd, struct ibv_ah_attr *attr) +{ + struct hns_roce_create_ah_resp resp = {}; + struct hns_roce_ah *ah; + int status; + + ah = calloc(1, sizeof(*ah)); + if (!ah) + return NULL; + + ah->av.port = attr->port_num; + ah->av.sl = attr->sl; + + if (attr->static_rate) + ah->av.static_rate = IBV_RATE_10_GBPS; + + if (attr->is_global) { + ah->av.gid_index = attr->grh.sgid_index; + ah->av.hop_limit = attr->grh.hop_limit; + ah->av.tclass = attr->grh.traffic_class; + ah->av.flowlabel = attr->grh.flow_label; + + memcpy(ah->av.dgid, attr->grh.dgid.raw, + ARRAY_SIZE(ah->av.dgid)); + } + + status = ibv_cmd_create_ah(pd, &ah->ibv_ah, attr, &resp.ibv_resp, + sizeof(resp)); + if (status) { + free(ah); + return NULL; + } + + memcpy(ah->av.mac, resp.dmac, ETH_ALEN); + ah->av.vlan_id = resp.vlan_id; + ah->av.vlan_en = resp.vlan_en; + return &ah->ibv_ah; +} + +int hns_roce_u_destroy_ah(struct ibv_ah *ah) +{ + int ret; + + ret = ibv_cmd_destroy_ah(ah); + if (ret) + return ret; + + free(to_hr_ah(ah)); + + return 0; +} -- 2.8.1