From patchwork Sat Feb 27 18:10:30 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 8444921 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E25A1C0553 for ; Sat, 27 Feb 2016 18:10:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1937A203EC for ; Sat, 27 Feb 2016 18:10:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 277C2203C3 for ; Sat, 27 Feb 2016 18:10:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1945967AbcB0SKp (ORCPT ); Sat, 27 Feb 2016 13:10:45 -0500 Received: from casper.infradead.org ([85.118.1.10]:60851 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756709AbcB0SKo (ORCPT ); Sat, 27 Feb 2016 13:10:44 -0500 Received: from [83.175.99.196] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.85 #2 (Red Hat Linux)) id 1aZjKF-0006wy-3j; Sat, 27 Feb 2016 18:10:43 +0000 From: Christoph Hellwig To: linux-rdma@vger.kernel.org Cc: swise@opengridcomputing.com, sagig@mellanox.com, target-devel@vger.kernel.org Subject: [PATCH 12/13] IB/core: add a MR pool for signature MRs Date: Sat, 27 Feb 2016 19:10:30 +0100 Message-Id: <1456596631-19418-13-git-send-email-hch@lst.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456596631-19418-1-git-send-email-hch@lst.de> References: <1456596631-19418-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Christoph Hellwig --- drivers/infiniband/core/mr_pool.c | 4 +++- drivers/infiniband/core/rw.c | 13 +++++++++++++ drivers/infiniband/core/verbs.c | 1 + include/rdma/ib_verbs.h | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/infiniband/core/mr_pool.c b/drivers/infiniband/core/mr_pool.c index b1eb27a..9751bb1 100644 --- a/drivers/infiniband/core/mr_pool.c +++ b/drivers/infiniband/core/mr_pool.c @@ -20,8 +20,10 @@ struct ib_mr *ib_mr_pool_get(struct ib_qp *qp, struct list_head *list) spin_lock_irqsave(&qp->mr_lock, flags); mr = list_first_entry_or_null(list, struct ib_mr, qp_entry); - if (mr) + if (mr) { + list_del(&mr->qp_entry); qp->mrs_used++; + } spin_unlock_irqrestore(&qp->mr_lock, flags); return mr; diff --git a/drivers/infiniband/core/rw.c b/drivers/infiniband/core/rw.c index 69c3ca5..00af4ce 100644 --- a/drivers/infiniband/core/rw.c +++ b/drivers/infiniband/core/rw.c @@ -384,10 +384,23 @@ int rdma_rw_init_mrs(struct ib_qp *qp, struct ib_qp_init_attr *attr) dev->attrs.max_fast_reg_page_list_len); } + if (attr->create_flags & IB_QP_CREATE_SIGNATURE_EN) { + ret = ib_mr_pool_init(qp, &qp->sig_mrs, + attr->cap.max_rdma_ctxs, IB_MR_TYPE_SIGNATURE, + 2); + if (ret) + goto out_free_rdma_mrs; + } + + return 0; + +out_free_rdma_mrs: + ib_mr_pool_destroy(qp, &qp->rdma_mrs); return ret; } void rdma_rw_cleanup_mrs(struct ib_qp *qp) { + ib_mr_pool_destroy(qp, &qp->sig_mrs); ib_mr_pool_destroy(qp, &qp->rdma_mrs); } diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index 1ef3a1a..c5034af 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -776,6 +776,7 @@ struct ib_qp *ib_create_qp(struct ib_pd *pd, qp->mrs_used = 0; spin_lock_init(&qp->mr_lock); INIT_LIST_HEAD(&qp->rdma_mrs); + INIT_LIST_HEAD(&qp->sig_mrs); if (qp_init_attr->qp_type == IB_QPT_XRC_TGT) return ib_create_xrc_qp(qp, qp_init_attr); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 035585a..00af0a7 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -1422,6 +1422,7 @@ struct ib_qp { spinlock_t mr_lock; struct list_head rdma_mrs; + struct list_head sig_mrs; int mrs_used; /* count times opened, mcast attaches, flow attaches */