openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB: remove the write-only usecnt field from struct ib_mr 

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Bart Van Assche <bvanassche@sandisk.com>
Reviewed-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Christoph Hellwig 2015-12-23 19:12:54 +01:00 committed by Doug Ledford
parent 7cf9ff643b
commit ab67ed8de0
6 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/core/uverbs_cmd.c
View File

@ -993,7 +993,6 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
mr->pd = pd; mr->pd = pd;
mr->uobject = uobj; mr->uobject = uobj;
atomic_inc(&pd->usecnt); atomic_inc(&pd->usecnt);
atomic_set(&mr->usecnt, 0);
uobj->object = mr; uobj->object = mr;
ret = idr_add_uobj(&ib_uverbs_mr_idr, uobj); ret = idr_add_uobj(&ib_uverbs_mr_idr, uobj);
@ -1091,11 +1090,6 @@ ssize_t ib_uverbs_rereg_mr(struct ib_uverbs_file *file,
} }
} }
if (atomic_read(&mr->usecnt)) {
ret = -EBUSY;
goto put_uobj_pd;
}
old_pd = mr->pd; old_pd = mr->pd;
ret = mr->device->rereg_user_mr(mr, cmd.flags, cmd.start, ret = mr->device->rereg_user_mr(mr, cmd.flags, cmd.start,
cmd.length, cmd.hca_va, cmd.length, cmd.hca_va,

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

@ -1345,7 +1345,6 @@ struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags)
mr->pd = pd; mr->pd = pd;
mr->uobject = NULL; mr->uobject = NULL;
atomic_inc(&pd->usecnt); atomic_inc(&pd->usecnt);
atomic_set(&mr->usecnt, 0);
} }
return mr; return mr;
@ -1354,13 +1353,9 @@ EXPORT_SYMBOL(ib_get_dma_mr);
int ib_dereg_mr(struct ib_mr *mr) int ib_dereg_mr(struct ib_mr *mr)
{ {
struct ib_pd *pd; struct ib_pd *pd = mr->pd;
int ret; int ret;
if (atomic_read(&mr->usecnt))
return -EBUSY;
pd = mr->pd;
ret = mr->device->dereg_mr(mr); ret = mr->device->dereg_mr(mr);
if (!ret) if (!ret)
atomic_dec(&pd->usecnt); atomic_dec(&pd->usecnt);
@ -1396,7 +1391,6 @@ struct ib_mr *ib_alloc_mr(struct ib_pd *pd,
mr->pd = pd; mr->pd = pd;
mr->uobject = NULL; mr->uobject = NULL;
atomic_inc(&pd->usecnt); atomic_inc(&pd->usecnt);
atomic_set(&mr->usecnt, 0);
} }
return mr; return mr;

3
drivers/infiniband/hw/cxgb3/iwch_provider.c
View File

@ -458,9 +458,6 @@ static int iwch_dereg_mr(struct ib_mr *ib_mr)
u32 mmid; u32 mmid;
PDBG("%s ib_mr %p\n", __func__, ib_mr); PDBG("%s ib_mr %p\n", __func__, ib_mr);
/* There can be no memory windows */
if (atomic_read(&ib_mr->usecnt))
return -EINVAL;
mhp = to_iwch_mr(ib_mr); mhp = to_iwch_mr(ib_mr);
kfree(mhp->pages); kfree(mhp->pages);

3
drivers/infiniband/hw/cxgb4/mem.c
View File

@ -704,9 +704,6 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr)
u32 mmid; u32 mmid;
PDBG("%s ib_mr %p\n", __func__, ib_mr); PDBG("%s ib_mr %p\n", __func__, ib_mr);
/* There can be no memory windows */
if (atomic_read(&ib_mr->usecnt))
return -EINVAL;
mhp = to_c4iw_mr(ib_mr); mhp = to_c4iw_mr(ib_mr);
rhp = mhp->rhp; rhp = mhp->rhp;

1
drivers/staging/rdma/ehca/ehca_mrmw.c
View File

@ -1339,7 +1339,6 @@ int ehca_reg_internal_maxmr(
e_mr->ib.ib_mr.pd = &e_pd->ib_pd; e_mr->ib.ib_mr.pd = &e_pd->ib_pd;
e_mr->ib.ib_mr.uobject = NULL; e_mr->ib.ib_mr.uobject = NULL;
atomic_inc(&(e_pd->ib_pd.usecnt)); atomic_inc(&(e_pd->ib_pd.usecnt));
atomic_set(&(e_mr->ib.ib_mr.usecnt), 0);
*e_maxmr = e_mr; *e_maxmr = e_mr;
return 0; return 0;

1
include/rdma/ib_verbs.h
View File

@ -1414,7 +1414,6 @@ struct ib_mr {
u64 iova; u64 iova;
u32 length; u32 length;
unsigned int page_size; unsigned int page_size;
atomic_t usecnt; /* count number of MWs */
}; };
struct ib_mw { struct ib_mw {