Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a6781a5 authored by Israel Rukshin's avatar Israel Rukshin Committed by Jason Gunthorpe
Browse files

RDMA/core: Add an integrity MR pool support 



This is a preparation for adding new signature API to the rw-API.

Signed-off-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent b9294f8b

drivers/infiniband/core/mr_pool.c

+6 −2
Original line number Diff line number Diff line
@@ -42,13 +42,17 @@ void ib_mr_pool_put(struct ib_qp *qp, struct list_head *list, struct ib_mr *mr) 
EXPORT_SYMBOL(ib_mr_pool_put);



int ib_mr_pool_init(struct ib_qp *qp, struct list_head *list, int nr,

		enum ib_mr_type type, u32 max_num_sg)

		enum ib_mr_type type, u32 max_num_sg, u32 max_num_meta_sg)

{

	struct ib_mr *mr;

	unsigned long flags;

	int ret, i;



	for (i = 0; i < nr; i++) {

		if (type == IB_MR_TYPE_INTEGRITY)

			mr = ib_alloc_mr_integrity(qp->pd, max_num_sg,

						   max_num_meta_sg);

		else

			mr = ib_alloc_mr(qp->pd, type, max_num_sg);

		if (IS_ERR(mr)) {

			ret = PTR_ERR(mr);

drivers/infiniband/core/rw.c

+2 −2
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ int rdma_rw_init_mrs(struct ib_qp *qp, struct ib_qp_init_attr *attr) 
	if (nr_mrs) {

		ret = ib_mr_pool_init(qp, &qp->rdma_mrs, nr_mrs,

				IB_MR_TYPE_MEM_REG,

				rdma_rw_fr_page_list_len(dev));

				rdma_rw_fr_page_list_len(dev), 0);

		if (ret) {

			pr_err("%s: failed to allocated %d MRs\n",

				__func__, nr_mrs);
@@ -729,7 +729,7 @@ int rdma_rw_init_mrs(struct ib_qp *qp, struct ib_qp_init_attr *attr) 


	if (nr_sig_mrs) {

		ret = ib_mr_pool_init(qp, &qp->sig_mrs, nr_sig_mrs,

				IB_MR_TYPE_SIGNATURE, 2);

				IB_MR_TYPE_SIGNATURE, 2, 0);

		if (ret) {

			pr_err("%s: failed to allocated %d SIG MRs\n",

				__func__, nr_sig_mrs);

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ static int nvme_rdma_create_queue_ib(struct nvme_rdma_queue *queue) 
	ret = ib_mr_pool_init(queue->qp, &queue->qp->rdma_mrs,

			      queue->queue_size,

			      IB_MR_TYPE_MEM_REG,

			      nvme_rdma_get_max_fr_pages(ibdev));

			      nvme_rdma_get_max_fr_pages(ibdev), 0);

	if (ret) {

		dev_err(queue->ctrl->ctrl.device,

			"failed to initialize MR pool sized %d for QID %d\n",

include/rdma/mr_pool.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct ib_mr *ib_mr_pool_get(struct ib_qp *qp, struct list_head *list); 
void ib_mr_pool_put(struct ib_qp *qp, struct list_head *list, struct ib_mr *mr);



int ib_mr_pool_init(struct ib_qp *qp, struct list_head *list, int nr,

		enum ib_mr_type type, u32 max_num_sg);

		enum ib_mr_type type, u32 max_num_sg, u32 max_num_meta_sg);

void ib_mr_pool_destroy(struct ib_qp *qp, struct list_head *list);



#endif /* _RDMA_MR_POOL_H */