From patchwork Fri Apr 21 18:57:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devesh Sharma X-Patchwork-Id: 9693545 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 63D4D6038D for ; Fri, 21 Apr 2017 18:59:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 56E532863D for ; Fri, 21 Apr 2017 18:59:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A53A28660; Fri, 21 Apr 2017 18:59:41 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 AC3432863D for ; Fri, 21 Apr 2017 18:59:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424137AbdDUS7j (ORCPT ); Fri, 21 Apr 2017 14:59:39 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:37371 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424324AbdDUS5o (ORCPT ); Fri, 21 Apr 2017 14:57:44 -0400 Received: by mail-wm0-f50.google.com with SMTP id m123so24153037wma.0 for ; Fri, 21 Apr 2017 11:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=lhzTHIcfr0lx6ba5FY9ddbG/TXPhoDlfTYzVDfYpgsM=; b=B3cobysr0s8QqhUlkrZIS1xCg3VxWoab57v01Q3/adSDlRo9tKk0tM3URH/tALDmc2 mrtiFKsdk+LBd88l+x0mrCzwT641kjtEKoRQSDWYz4WSaSSA7/IM552oPCFDnIyJVlWz IfeHsZ+zupNfHbLh72NUadGX8bK8lR8d68lLk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lhzTHIcfr0lx6ba5FY9ddbG/TXPhoDlfTYzVDfYpgsM=; b=d4Rdc2tfOISGfm58JhSYkOztSX6uT+DVlT5SLckQ+aTFI6YqzxTQ/fTEgRtRwF8z7h TAE5P63yXdUkM3XV562aA6ozA9TetvTZi30eBJ4aWYCAvEAIXHIPz5tvJKKiBDAQbDrB DeUe0+zZKyQnmy5YdNwK7pfe9snbRfd7z9g3mSYjeOC3C74YUWNHzrxF6qDuOt8OrO1c Rv53C8a0Xj3Ts1eokpYKCturn7YW+xRZDKbFp7I7r38CqU5tSD52qROgaY7DZhU7Ubf/ e4ZQKF0kLY4LqgfepSOvPxI/sqW3FYaqcZskTGri8WE61OlaV4Mke/Mrvgu01PFRImDL UtqQ== X-Gm-Message-State: AN3rC/73CDHF+5/hNkoI6nwu25yzq46FXYuvh4oUiOfkfkBFxWFFydcu P0U87BXF9pjcmJ+zWk8= X-Received: by 10.28.21.203 with SMTP id 194mr100001wmv.55.1492801062594; Fri, 21 Apr 2017 11:57:42 -0700 (PDT) Received: from neo00-el73.iig.avagotech.net ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id e12sm12622588wrc.43.2017.04.21.11.57.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 21 Apr 2017 11:57:41 -0700 (PDT) From: Devesh Sharma To: linux-rdma@vger.kernel.org Subject: [RESEND rdma-core v4 7/8] libbnxt_re: Enable polling for UD completions Date: Fri, 21 Apr 2017 14:57:11 -0400 Message-Id: <1492801032-17587-8-git-send-email-devesh.sharma@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1492801032-17587-1-git-send-email-devesh.sharma@broadcom.com> References: <1492801032-17587-1-git-send-email-devesh.sharma@broadcom.com> 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 adds support to allow polling of send and recv completions for a UD qp. Signed-off-by: Sriharsha Basavapatna Signed-off-by: Somnath Kotur Signed-off-by: Selvin Xavier Signed-off-by: Devesh Sharma --- providers/bnxt_re/bnxt_re-abi.h | 6 ++++++ providers/bnxt_re/verbs.c | 43 +++++++++++++++++++++++++++-------------- 2 files changed, 35 insertions(+), 14 deletions(-) diff --git a/providers/bnxt_re/bnxt_re-abi.h b/providers/bnxt_re/bnxt_re-abi.h index 36b74cd..db11322 100644 --- a/providers/bnxt_re/bnxt_re-abi.h +++ b/providers/bnxt_re/bnxt_re-abi.h @@ -174,6 +174,12 @@ enum bnxt_re_ud_flags_mask { BNXT_RE_UD_FLAGS_ROCE_IPV6 = 0x03 }; +enum bnxt_re_ud_cqe_mask { + BNXT_RE_UD_CQE_MAC_MASK = 0xFFFFFFFFFFFFULL, + BNXT_RE_UD_CQE_SRCQPLO_MASK = 0xFFFF, + BNXT_RE_UD_CQE_SRCQPLO_SHIFT = 0x30 +}; + enum bnxt_re_shpg_offt { BNXT_RE_SHPG_BEG_RESV_OFFT = 0x00, BNXT_RE_SHPG_AVID_OFFT = 0x10, diff --git a/providers/bnxt_re/verbs.c b/providers/bnxt_re/verbs.c index 54c8906..1f8ff8e 100644 --- a/providers/bnxt_re/verbs.c +++ b/providers/bnxt_re/verbs.c @@ -338,10 +338,8 @@ static uint8_t bnxt_re_poll_scqe(struct bnxt_re_qp *qp, struct ibv_wc *ibvwc, return pcqe; } -static int bnxt_re_poll_err_rcqe(struct bnxt_re_qp *qp, - struct ibv_wc *ibvwc, - struct bnxt_re_bcqe *hdr, - struct bnxt_re_rc_cqe *rcqe) +static int bnxt_re_poll_err_rcqe(struct bnxt_re_qp *qp, struct ibv_wc *ibvwc, + struct bnxt_re_bcqe *hdr, void *cqe) { struct bnxt_re_queue *rq = qp->rqq; struct bnxt_re_wrid *rwrid; @@ -366,6 +364,10 @@ static int bnxt_re_poll_err_rcqe(struct bnxt_re_qp *qp, ibvwc->qp_num = qp->qpid; ibvwc->opcode = IBV_WC_RECV; ibvwc->byte_len = 0; + ibvwc->wc_flags = 0; + if (qp->qptyp == IBV_QPT_UD) + ibvwc->src_qp = 0; + bnxt_re_incr_head(qp->rqq); if (qp->qpst != IBV_QPS_ERR) qp->qpst = IBV_QPS_ERR; @@ -377,16 +379,32 @@ static int bnxt_re_poll_err_rcqe(struct bnxt_re_qp *qp, return 1; } +static void bnxt_re_fill_ud_cqe(struct ibv_wc *ibvwc, + struct bnxt_re_bcqe *hdr, void *cqe) +{ + struct bnxt_re_ud_cqe *ucqe = cqe; + uint32_t qpid; + + qpid = ((le32toh(hdr->qphi_rwrid) >> BNXT_RE_BCQE_SRCQP_SHIFT) & + BNXT_RE_BCQE_SRCQP_SHIFT) << 0x10; /* higher 8 bits of 24 */ + qpid |= (le64toh(ucqe->qplo_mac) >> BNXT_RE_UD_CQE_SRCQPLO_SHIFT) & + BNXT_RE_UD_CQE_SRCQPLO_MASK; /*lower 16 of 24 */ + ibvwc->src_qp = qpid; + ibvwc->wc_flags |= IBV_WC_GRH; + /*IB-stack ABI in user do not ask for MAC to be reported. */ +} + static void bnxt_re_poll_success_rcqe(struct bnxt_re_qp *qp, struct ibv_wc *ibvwc, - struct bnxt_re_bcqe *hdr, - struct bnxt_re_rc_cqe *rcqe) + struct bnxt_re_bcqe *hdr, void *cqe) { struct bnxt_re_queue *rq = qp->rqq; struct bnxt_re_wrid *rwrid; + struct bnxt_re_rc_cqe *rcqe; uint32_t head = rq->head; uint8_t flags, is_imm, is_rdma; + rcqe = cqe; rwrid = &qp->rwrid[head]; ibvwc->status = IBV_WC_SUCCESS; @@ -409,6 +427,9 @@ static void bnxt_re_poll_success_rcqe(struct bnxt_re_qp *qp, ibvwc->opcode = IBV_WC_RECV_RDMA_WITH_IMM; } + if (qp->qptyp == IBV_QPT_UD) + bnxt_re_fill_ud_cqe(ibvwc, hdr, cqe); + bnxt_re_incr_head(rq); } @@ -416,19 +437,17 @@ static uint8_t bnxt_re_poll_rcqe(struct bnxt_re_qp *qp, struct ibv_wc *ibvwc, void *cqe, int *cnt) { struct bnxt_re_bcqe *hdr; - struct bnxt_re_rc_cqe *rcqe; uint8_t status, pcqe = false; - rcqe = cqe; hdr = cqe + sizeof(struct bnxt_re_rc_cqe); status = (le32toh(hdr->flg_st_typ_ph) >> BNXT_RE_BCQE_STATUS_SHIFT) & BNXT_RE_BCQE_STATUS_MASK; *cnt = 1; if (status == BNXT_RE_RSP_ST_OK) - bnxt_re_poll_success_rcqe(qp, ibvwc, hdr, rcqe); + bnxt_re_poll_success_rcqe(qp, ibvwc, hdr, cqe); else - *cnt = bnxt_re_poll_err_rcqe(qp, ibvwc, hdr, rcqe); + *cnt = bnxt_re_poll_err_rcqe(qp, ibvwc, hdr, cqe); return pcqe; } @@ -486,9 +505,6 @@ static int bnxt_re_poll_one(struct bnxt_re_cq *cq, int nwc, struct ibv_wc *wc) (uintptr_t)le64toh(scqe->qp_handle); if (!qp) break; /*stale cqe. should be rung.*/ - if (qp->qptyp == IBV_QPT_UD) - goto bail; /* TODO: Add UD poll */ - pcqe = bnxt_re_poll_scqe(qp, wc, cqe, &cnt); break; case BNXT_RE_WC_TYPE_RECV_RC: @@ -503,7 +519,6 @@ static int bnxt_re_poll_one(struct bnxt_re_cq *cq, int nwc, struct ibv_wc *wc) goto bail; /*TODO: Add SRQ poll */ pcqe = bnxt_re_poll_rcqe(qp, wc, cqe, &cnt); - /* TODO: Process UD rcqe */ break; case BNXT_RE_WC_TYPE_RECV_RAW: break;