| Message ID | 14-v1-00f59ce24f1f+19f50-umem_1_jgg@nvidia.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | RDMA: Improve use of umem in DMA drivers | expand |
On Wed, Sep 2, 2020 at 8:46 AM Jason Gunthorpe <jgg@nvidia.com> wrote: > > This function should be used to get the offset from the first DMA block. > > The few places using this without a DMA iterator are calling it to work > around the lack of setting sgl->offset when the umem is created. > > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> > --- > drivers/infiniband/core/umem.c | 2 +- > drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- > drivers/infiniband/hw/qedr/verbs.c | 2 +- > drivers/infiniband/sw/rdmavt/mr.c | 2 +- > drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- > include/rdma/ib_umem.h | 9 ++++++--- > 6 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c > index 49d6ddc37b6fde..c840115b8c0945 100644 > --- a/drivers/infiniband/core/umem.c > +++ b/drivers/infiniband/core/umem.c > @@ -369,7 +369,7 @@ int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offset, > } > > ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->sg_nents, dst, length, > - offset + ib_umem_offset(umem)); > + offset + ib_umem_dma_offset(umem, PAGE_SIZE)); > > if (ret < 0) > return ret; > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > index 1fb8da6d613674..f22532fbc364fe 100644 > --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > @@ -870,7 +870,7 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, > goto umem_err; > > mr->hwmr.pbe_size = PAGE_SIZE; > - mr->hwmr.fbo = ib_umem_offset(mr->umem); > + mr->hwmr.fbo = ib_umem_dma_offset(mr->umem, PAGE_SIZE); > mr->hwmr.va = usr_addr; > mr->hwmr.len = len; > mr->hwmr.remote_wr = (acc & IB_ACCESS_REMOTE_WRITE) ? 1 : 0; > diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c > index 278b48443aedba..daac742e71044d 100644 > --- a/drivers/infiniband/hw/qedr/verbs.c > +++ b/drivers/infiniband/hw/qedr/verbs.c > @@ -2878,7 +2878,7 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, > mr->hw_mr.pbl_two_level = mr->info.pbl_info.two_layered; > mr->hw_mr.pbl_page_size_log = ilog2(mr->info.pbl_info.pbl_size); > mr->hw_mr.page_size_log = PAGE_SHIFT; > - mr->hw_mr.fbo = ib_umem_offset(mr->umem); > + mr->hw_mr.fbo = ib_umem_dma_offset(mr->umem, PAGE_SIZE); > mr->hw_mr.length = len; > mr->hw_mr.vaddr = usr_addr; > mr->hw_mr.zbva = false; > diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c > index 2f7c25fea44a9d..04f7dc0ce9e44d 100644 > --- a/drivers/infiniband/sw/rdmavt/mr.c > +++ b/drivers/infiniband/sw/rdmavt/mr.c > @@ -404,7 +404,7 @@ struct ib_mr *rvt_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, > mr->mr.user_base = start; > mr->mr.iova = virt_addr; > mr->mr.length = length; > - mr->mr.offset = ib_umem_offset(umem); > + mr->mr.offset = ib_umem_dma_offset(umem, PAGE_SIZE); > mr->mr.access_flags = mr_access_flags; > mr->umem = umem; > > diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c > index 708e2dff5eaa70..8f60dc9dee8658 100644 > --- a/drivers/infiniband/sw/rxe/rxe_mr.c > +++ b/drivers/infiniband/sw/rxe/rxe_mr.c > @@ -196,7 +196,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, > mem->length = length; > mem->iova = iova; > mem->va = start; > - mem->offset = ib_umem_offset(umem); > + mem->offset = ib_umem_dma_offset(umem, PAGE_SIZE); Thanks, Zhu Yanjun > mem->state = RXE_MEM_STATE_VALID; > mem->type = RXE_MEM_TYPE_MR; > > diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h > index 4bac6e29f030c2..5e709b2c251644 100644 > --- a/include/rdma/ib_umem.h > +++ b/include/rdma/ib_umem.h > @@ -27,10 +27,13 @@ struct ib_umem { > unsigned int sg_nents; > }; > > -/* Returns the offset of the umem start relative to the first page. */ > -static inline int ib_umem_offset(struct ib_umem *umem) > +/* > + * Returns the offset of the umem start relative to the first DMA block returned > + * by rdma_umem_for_each_dma_block(). > + */ > +static inline int ib_umem_dma_offset(struct ib_umem *umem, unsigned long pgsz) > { > - return umem->address & ~PAGE_MASK; > + return umem->address & (pgsz - 1); > } > > static inline size_t ib_umem_num_dma_blocks(struct ib_umem *umem, > -- > 2.28.0 >
> From: Jason Gunthorpe <jgg@nvidia.com> > Sent: Wednesday, September 2, 2020 3:44 AM > This function should be used to get the offset from the first DMA block. > > The few places using this without a DMA iterator are calling it to work around > the lack of setting sgl->offset when the umem is created. > > Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> > --- > drivers/infiniband/core/umem.c | 2 +- > drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- > drivers/infiniband/hw/qedr/verbs.c | 2 +- > drivers/infiniband/sw/rdmavt/mr.c | 2 +- > drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- > include/rdma/ib_umem.h | 9 ++++++--- > 6 files changed, 11 insertions(+), 8 deletions(-) > > diff --git a/drivers/infiniband/core/umem.c > b/drivers/infiniband/core/umem.c index 49d6ddc37b6fde..c840115b8c0945 > 100644 > --- a/drivers/infiniband/core/umem.c > +++ b/drivers/infiniband/core/umem.c > @@ -369,7 +369,7 @@ int ib_umem_copy_from(void *dst, struct ib_umem > *umem, size_t offset, > } > > ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->sg_nents, > dst, length, > - offset + ib_umem_offset(umem)); > + offset + ib_umem_dma_offset(umem, > PAGE_SIZE)); > > if (ret < 0) > return ret; > diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > index 1fb8da6d613674..f22532fbc364fe 100644 > --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c > @@ -870,7 +870,7 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd > *ibpd, u64 start, u64 len, > goto umem_err; > > mr->hwmr.pbe_size = PAGE_SIZE; > - mr->hwmr.fbo = ib_umem_offset(mr->umem); > + mr->hwmr.fbo = ib_umem_dma_offset(mr->umem, PAGE_SIZE); > mr->hwmr.va = usr_addr; > mr->hwmr.len = len; > mr->hwmr.remote_wr = (acc & IB_ACCESS_REMOTE_WRITE) ? 1 : 0; > diff --git a/drivers/infiniband/hw/qedr/verbs.c > b/drivers/infiniband/hw/qedr/verbs.c > index 278b48443aedba..daac742e71044d 100644 > --- a/drivers/infiniband/hw/qedr/verbs.c > +++ b/drivers/infiniband/hw/qedr/verbs.c > @@ -2878,7 +2878,7 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd > *ibpd, u64 start, u64 len, > mr->hw_mr.pbl_two_level = mr->info.pbl_info.two_layered; > mr->hw_mr.pbl_page_size_log = ilog2(mr->info.pbl_info.pbl_size); > mr->hw_mr.page_size_log = PAGE_SHIFT; > - mr->hw_mr.fbo = ib_umem_offset(mr->umem); > + mr->hw_mr.fbo = ib_umem_dma_offset(mr->umem, PAGE_SIZE); > mr->hw_mr.length = len; > mr->hw_mr.vaddr = usr_addr; > mr->hw_mr.zbva = false; Thanks, Acked-by: Michal Kalderon <michal.kalderon@marvell.com> > diff --git a/drivers/infiniband/sw/rdmavt/mr.c > b/drivers/infiniband/sw/rdmavt/mr.c > index 2f7c25fea44a9d..04f7dc0ce9e44d 100644 > --- a/drivers/infiniband/sw/rdmavt/mr.c > +++ b/drivers/infiniband/sw/rdmavt/mr.c > @@ -404,7 +404,7 @@ struct ib_mr *rvt_reg_user_mr(struct ib_pd *pd, u64 > start, u64 length, > mr->mr.user_base = start; > mr->mr.iova = virt_addr; > mr->mr.length = length; > - mr->mr.offset = ib_umem_offset(umem); > + mr->mr.offset = ib_umem_dma_offset(umem, PAGE_SIZE); > mr->mr.access_flags = mr_access_flags; > mr->umem = umem; > > diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c > b/drivers/infiniband/sw/rxe/rxe_mr.c > index 708e2dff5eaa70..8f60dc9dee8658 100644 > --- a/drivers/infiniband/sw/rxe/rxe_mr.c > +++ b/drivers/infiniband/sw/rxe/rxe_mr.c > @@ -196,7 +196,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, > mem->length = length; > mem->iova = iova; > mem->va = start; > - mem->offset = ib_umem_offset(umem); > + mem->offset = ib_umem_dma_offset(umem, PAGE_SIZE); > mem->state = RXE_MEM_STATE_VALID; > mem->type = RXE_MEM_TYPE_MR; > > diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h index > 4bac6e29f030c2..5e709b2c251644 100644 > --- a/include/rdma/ib_umem.h > +++ b/include/rdma/ib_umem.h > @@ -27,10 +27,13 @@ struct ib_umem { > unsigned int sg_nents; > }; > > -/* Returns the offset of the umem start relative to the first page. */ -static > inline int ib_umem_offset(struct ib_umem *umem) > +/* > + * Returns the offset of the umem start relative to the first DMA block > +returned > + * by rdma_umem_for_each_dma_block(). > + */ > +static inline int ib_umem_dma_offset(struct ib_umem *umem, unsigned > +long pgsz) > { > - return umem->address & ~PAGE_MASK; > + return umem->address & (pgsz - 1); > } > > static inline size_t ib_umem_num_dma_blocks(struct ib_umem *umem, > -- > 2.28.0
On Tue, Sep 01, 2020 at 09:43:42PM -0300, Jason Gunthorpe wrote: > +/* > + * Returns the offset of the umem start relative to the first DMA block returned > + * by rdma_umem_for_each_dma_block(). > + */ > +static inline int ib_umem_dma_offset(struct ib_umem *umem, unsigned long pgsz) > { > - return umem->address & ~PAGE_MASK; > + return umem->address & (pgsz - 1); > } Actually on greater reflection this is wrong if pgsz > PAGE_SIZE, as umem->address has nothing to do with the SGL, and certainly doesn't reflect to anything in DMA drivers. It should be IOVA. I'm going to drop this patch. It looks like the only two drivers that use this should be using IOVA anyhow: diff --git a/drivers/infiniband/hw/ocrdma/ocrdma.h b/drivers/infiniband/hw/ocrdma/ocrdma.h index fcfe0e82197a24..5eb61c1100900d 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma.h +++ b/drivers/infiniband/hw/ocrdma/ocrdma.h @@ -185,7 +185,6 @@ struct ocrdma_hw_mr { u32 num_pbes; u32 pbl_size; u32 pbe_size; - u64 fbo; u64 va; }; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c index e07bf0b2209a4c..18ed658f8dba10 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c @@ -1962,6 +1962,7 @@ static int ocrdma_mbx_reg_mr(struct ocrdma_dev *dev, struct ocrdma_hw_mr *hwmr, int i; struct ocrdma_reg_nsmr *cmd; struct ocrdma_reg_nsmr_rsp *rsp; + u64 fbo = hwmr->va & (hwmr->pbe_size - 1); cmd = ocrdma_init_emb_mqe(OCRDMA_CMD_REGISTER_NSMR, sizeof(*cmd)); if (!cmd) @@ -1987,8 +1988,8 @@ static int ocrdma_mbx_reg_mr(struct ocrdma_dev *dev, struct ocrdma_hw_mr *hwmr, OCRDMA_REG_NSMR_HPAGE_SIZE_SHIFT; cmd->totlen_low = hwmr->len; cmd->totlen_high = upper_32_bits(hwmr->len); - cmd->fbo_low = (u32) (hwmr->fbo & 0xffffffff); - cmd->fbo_high = (u32) upper_32_bits(hwmr->fbo); + cmd->fbo_low = (u32) (fbo & 0xffffffff); + cmd->fbo_high = (u32) upper_32_bits(fbo); cmd->va_loaddr = (u32) hwmr->va; cmd->va_hiaddr = (u32) upper_32_bits(hwmr->va); diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index c1751c9a0f625c..354814b2978d51 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -878,7 +878,6 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, goto umem_err; mr->hwmr.pbe_size = PAGE_SIZE; - mr->hwmr.fbo = ib_umem_offset(mr->umem); mr->hwmr.va = usr_addr; mr->hwmr.len = len; mr->hwmr.remote_wr = (acc & IB_ACCESS_REMOTE_WRITE) ? 1 : 0; diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c index 0bdfa300865d57..b7ef05618993c4 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c @@ -2888,10 +2888,8 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, mr->hw_mr.pbl_two_level = mr->info.pbl_info.two_layered; mr->hw_mr.pbl_page_size_log = ilog2(mr->info.pbl_info.pbl_size); mr->hw_mr.page_size_log = PAGE_SHIFT; - mr->hw_mr.fbo = ib_umem_offset(mr->umem); mr->hw_mr.length = len; mr->hw_mr.vaddr = usr_addr; - mr->hw_mr.zbva = false; mr->hw_mr.phy_mr = false; mr->hw_mr.dma_mr = false; @@ -2984,10 +2982,8 @@ static struct qedr_mr *__qedr_alloc_mr(struct ib_pd *ibpd, mr->hw_mr.pbl_ptr = 0; mr->hw_mr.pbl_two_level = mr->info.pbl_info.two_layered; mr->hw_mr.pbl_page_size_log = ilog2(mr->info.pbl_info.pbl_size); - mr->hw_mr.fbo = 0; mr->hw_mr.length = 0; mr->hw_mr.vaddr = 0; - mr->hw_mr.zbva = false; mr->hw_mr.phy_mr = true; mr->hw_mr.dma_mr = false; diff --git a/drivers/net/ethernet/qlogic/qed/qed_rdma.c b/drivers/net/ethernet/qlogic/qed/qed_rdma.c index 03894584415df7..0df6e058775292 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_rdma.c +++ b/drivers/net/ethernet/qlogic/qed/qed_rdma.c @@ -1521,7 +1521,7 @@ qed_rdma_register_tid(void *rdma_cxt, params->pbl_two_level); SET_FIELD(flags, RDMA_REGISTER_TID_RAMROD_DATA_ZERO_BASED, - params->zbva); + false); SET_FIELD(flags, RDMA_REGISTER_TID_RAMROD_DATA_PHY_MR, params->phy_mr); @@ -1583,15 +1583,7 @@ qed_rdma_register_tid(void *rdma_cxt, p_ramrod->pd = cpu_to_le16(params->pd); p_ramrod->length_hi = (u8)(params->length >> 32); p_ramrod->length_lo = DMA_LO_LE(params->length); - if (params->zbva) { - /* Lower 32 bits of the registered MR address. - * In case of zero based MR, will hold FBO - */ - p_ramrod->va.hi = 0; - p_ramrod->va.lo = cpu_to_le32(params->fbo); - } else { - DMA_REGPAIR_LE(p_ramrod->va, params->vaddr); - } + DMA_REGPAIR_LE(p_ramrod->va, params->vaddr); DMA_REGPAIR_LE(p_ramrod->pbl_base, params->pbl_ptr); /* DIF */ diff --git a/include/linux/qed/qed_rdma_if.h b/include/linux/qed/qed_rdma_if.h index f464d85e88a410..aeb242cefebfa8 100644 --- a/include/linux/qed/qed_rdma_if.h +++ b/include/linux/qed/qed_rdma_if.h @@ -242,10 +242,8 @@ struct qed_rdma_register_tid_in_params { bool pbl_two_level; u8 pbl_page_size_log; u8 page_size_log; - u32 fbo; u64 length; u64 vaddr; - bool zbva; bool phy_mr; bool dma_mr;
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 49d6ddc37b6fde..c840115b8c0945 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c @@ -369,7 +369,7 @@ int ib_umem_copy_from(void *dst, struct ib_umem *umem, size_t offset, } ret = sg_pcopy_to_buffer(umem->sg_head.sgl, umem->sg_nents, dst, length, - offset + ib_umem_offset(umem)); + offset + ib_umem_dma_offset(umem, PAGE_SIZE)); if (ret < 0) return ret; diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c index 1fb8da6d613674..f22532fbc364fe 100644 --- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c @@ -870,7 +870,7 @@ struct ib_mr *ocrdma_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, goto umem_err; mr->hwmr.pbe_size = PAGE_SIZE; - mr->hwmr.fbo = ib_umem_offset(mr->umem); + mr->hwmr.fbo = ib_umem_dma_offset(mr->umem, PAGE_SIZE); mr->hwmr.va = usr_addr; mr->hwmr.len = len; mr->hwmr.remote_wr = (acc & IB_ACCESS_REMOTE_WRITE) ? 1 : 0; diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c index 278b48443aedba..daac742e71044d 100644 --- a/drivers/infiniband/hw/qedr/verbs.c +++ b/drivers/infiniband/hw/qedr/verbs.c @@ -2878,7 +2878,7 @@ struct ib_mr *qedr_reg_user_mr(struct ib_pd *ibpd, u64 start, u64 len, mr->hw_mr.pbl_two_level = mr->info.pbl_info.two_layered; mr->hw_mr.pbl_page_size_log = ilog2(mr->info.pbl_info.pbl_size); mr->hw_mr.page_size_log = PAGE_SHIFT; - mr->hw_mr.fbo = ib_umem_offset(mr->umem); + mr->hw_mr.fbo = ib_umem_dma_offset(mr->umem, PAGE_SIZE); mr->hw_mr.length = len; mr->hw_mr.vaddr = usr_addr; mr->hw_mr.zbva = false; diff --git a/drivers/infiniband/sw/rdmavt/mr.c b/drivers/infiniband/sw/rdmavt/mr.c index 2f7c25fea44a9d..04f7dc0ce9e44d 100644 --- a/drivers/infiniband/sw/rdmavt/mr.c +++ b/drivers/infiniband/sw/rdmavt/mr.c @@ -404,7 +404,7 @@ struct ib_mr *rvt_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, mr->mr.user_base = start; mr->mr.iova = virt_addr; mr->mr.length = length; - mr->mr.offset = ib_umem_offset(umem); + mr->mr.offset = ib_umem_dma_offset(umem, PAGE_SIZE); mr->mr.access_flags = mr_access_flags; mr->umem = umem; diff --git a/drivers/infiniband/sw/rxe/rxe_mr.c b/drivers/infiniband/sw/rxe/rxe_mr.c index 708e2dff5eaa70..8f60dc9dee8658 100644 --- a/drivers/infiniband/sw/rxe/rxe_mr.c +++ b/drivers/infiniband/sw/rxe/rxe_mr.c @@ -196,7 +196,7 @@ int rxe_mem_init_user(struct rxe_pd *pd, u64 start, mem->length = length; mem->iova = iova; mem->va = start; - mem->offset = ib_umem_offset(umem); + mem->offset = ib_umem_dma_offset(umem, PAGE_SIZE); mem->state = RXE_MEM_STATE_VALID; mem->type = RXE_MEM_TYPE_MR; diff --git a/include/rdma/ib_umem.h b/include/rdma/ib_umem.h index 4bac6e29f030c2..5e709b2c251644 100644 --- a/include/rdma/ib_umem.h +++ b/include/rdma/ib_umem.h @@ -27,10 +27,13 @@ struct ib_umem { unsigned int sg_nents; }; -/* Returns the offset of the umem start relative to the first page. */ -static inline int ib_umem_offset(struct ib_umem *umem) +/* + * Returns the offset of the umem start relative to the first DMA block returned + * by rdma_umem_for_each_dma_block(). + */ +static inline int ib_umem_dma_offset(struct ib_umem *umem, unsigned long pgsz) { - return umem->address & ~PAGE_MASK; + return umem->address & (pgsz - 1); } static inline size_t ib_umem_num_dma_blocks(struct ib_umem *umem,
This function should be used to get the offset from the first DMA block. The few places using this without a DMA iterator are calling it to work around the lack of setting sgl->offset when the umem is created. Signed-off-by: Jason Gunthorpe <jgg@nvidia.com> --- drivers/infiniband/core/umem.c | 2 +- drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 2 +- drivers/infiniband/hw/qedr/verbs.c | 2 +- drivers/infiniband/sw/rdmavt/mr.c | 2 +- drivers/infiniband/sw/rxe/rxe_mr.c | 2 +- include/rdma/ib_umem.h | 9 ++++++--- 6 files changed, 11 insertions(+), 8 deletions(-)