[12/13] IB/core: add a MR pool for signature MRs

Commit Message

Christoph Hellwig Feb. 27, 2016, 6:10 p.m. UTC

Signed-off-by: Christoph Hellwig <[e-mail]>
---
 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(-)

Patch

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 */