leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RDMA/core: Add an integrity MR pool support

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

Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Israel Rukshin
2019-06-11 18:52:49 +03:00
committed by Jason Gunthorpe
parent b9294f8b7c
commit 5a6781a558
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/infiniband/core/mr_pool.c
View File

@@ -42,14 +42,18 @@ void ib_mr_pool_put(struct ib_qp *qp, struct list_head *list, struct ib_mr *mr)
EXPORT_SYMBOL(ib_mr_pool_put); EXPORT_SYMBOL(ib_mr_pool_put);
int ib_mr_pool_init(struct ib_qp *qp, struct list_head *list, int nr, 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; struct ib_mr *mr;
unsigned long flags; unsigned long flags;
int ret, i; int ret, i;
for (i = 0; i < nr; i++) { for (i = 0; i < nr; i++) {
mr = ib_alloc_mr(qp->pd, type, max_num_sg); 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)) { if (IS_ERR(mr)) {
ret = PTR_ERR(mr); ret = PTR_ERR(mr);
goto out; goto out;

4
drivers/infiniband/core/rw.c
View File

@@ -719,7 +719,7 @@ int rdma_rw_init_mrs(struct ib_qp *qp, struct ib_qp_init_attr *attr)
if (nr_mrs) { if (nr_mrs) {
ret = ib_mr_pool_init(qp, &qp->rdma_mrs, nr_mrs, ret = ib_mr_pool_init(qp, &qp->rdma_mrs, nr_mrs,
IB_MR_TYPE_MEM_REG, IB_MR_TYPE_MEM_REG,
rdma_rw_fr_page_list_len(dev)); rdma_rw_fr_page_list_len(dev), 0);
if (ret) { if (ret) {
pr_err("%s: failed to allocated %d MRs\n", pr_err("%s: failed to allocated %d MRs\n",
__func__, nr_mrs); __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) { if (nr_sig_mrs) {
ret = ib_mr_pool_init(qp, &qp->sig_mrs, 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) { if (ret) {
pr_err("%s: failed to allocated %d SIG MRs\n", pr_err("%s: failed to allocated %d SIG MRs\n",
__func__, nr_sig_mrs); __func__, nr_sig_mrs);

2
drivers/nvme/host/rdma.c
View File

@@ -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, ret = ib_mr_pool_init(queue->qp, &queue->qp->rdma_mrs,
queue->queue_size, queue->queue_size,
IB_MR_TYPE_MEM_REG, IB_MR_TYPE_MEM_REG,
nvme_rdma_get_max_fr_pages(ibdev)); nvme_rdma_get_max_fr_pages(ibdev), 0);
if (ret) { if (ret) {
dev_err(queue->ctrl->ctrl.device, dev_err(queue->ctrl->ctrl.device,
"failed to initialize MR pool sized %d for QID %d\n", "failed to initialize MR pool sized %d for QID %d\n",

2
include/rdma/mr_pool.h
View File

@@ -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); 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, 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); void ib_mr_pool_destroy(struct ib_qp *qp, struct list_head *list);
#endif /* _RDMA_MR_POOL_H */ #endif /* _RDMA_MR_POOL_H */