@@ -739,6 +739,7 @@ static int ib_uverbs_reg_mr(struct uverbs_attr_bundle *attrs)
mr->pd = pd;
mr->type = IB_MR_TYPE_MEM_REG;
mr->dm = NULL;
+ mr->sig_attrs = NULL;
mr->uobject = uobj;
atomic_inc(&pd->usecnt);
mr->res.type = RDMA_RESTRACK_MR;
@@ -1947,6 +1947,7 @@ int ib_dereg_mr(struct ib_mr *mr)
{
struct ib_pd *pd = mr->pd;
struct ib_dm *dm = mr->dm;
+ struct ib_sig_attrs *sig_attrs = mr->sig_attrs;
int ret;
rdma_restrack_del(&mr->res);
@@ -1955,6 +1956,7 @@ int ib_dereg_mr(struct ib_mr *mr)
atomic_dec(&pd->usecnt);
if (dm)
atomic_dec(&dm->usecnt);
+ kfree(sig_attrs);
}
return ret;
@@ -1996,6 +1998,7 @@ struct ib_mr *ib_alloc_mr(struct ib_pd *pd,
mr->res.type = RDMA_RESTRACK_MR;
rdma_restrack_kadd(&mr->res);
mr->type = mr_type;
+ mr->sig_attrs = NULL;
}
return mr;
@@ -2019,6 +2022,7 @@ struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd,
u32 max_num_meta_sg)
{
struct ib_mr *mr;
+ struct ib_sig_attrs *sig_attrs;
if (!pd->device->ops.alloc_mr_integrity ||
!pd->device->ops.map_mr_sg_pi)
@@ -2027,6 +2031,10 @@ struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd,
if (!max_num_meta_sg)
return ERR_PTR(-EINVAL);
+ sig_attrs = kzalloc(sizeof(struct ib_sig_attrs), GFP_KERNEL);
+ if (!sig_attrs)
+ return ERR_PTR(-ENOMEM);
+
mr = pd->device->ops.alloc_mr_integrity(pd, max_num_data_sg,
max_num_meta_sg);
if (!IS_ERR(mr)) {
@@ -2039,6 +2047,9 @@ struct ib_mr *ib_alloc_mr_integrity(struct ib_pd *pd,
mr->res.type = RDMA_RESTRACK_MR;
rdma_restrack_kadd(&mr->res);
mr->type = IB_MR_TYPE_PI;
+ mr->sig_attrs = sig_attrs;
+ } else {
+ kfree(sig_attrs);
}
return mr;
@@ -1707,7 +1707,7 @@ struct ib_mr {
};
struct ib_dm *dm;
-
+ struct ib_sig_attrs *sig_attrs; /* only for IB_MR_TYPE_PI MRs */
/*
* Implementation details of the RDMA core, don't use in drivers:
*/