mr->lkey = mr->ibmr.lkey = lkey;
mr->rkey = mr->ibmr.rkey = rkey;
+ mr->ibmr.page_size = PAGE_SIZE;
+ mr->page_mask = PAGE_MASK;
+ mr->page_shift = PAGE_SHIFT;
mr->state = RXE_MR_STATE_INVALID;
}
goto err_release_umem;
}
- mr->page_shift = PAGE_SHIFT;
- mr->page_mask = PAGE_SIZE - 1;
-
num_buf = 0;
map = mr->map;
if (length > 0) {
goto err_release_umem;
}
buf->addr = (uintptr_t)vaddr;
- buf->size = PAGE_SIZE;
+ buf->size = mr_page_size(mr);
num_buf++;
buf++;
mr->umem = umem;
mr->access = access;
- mr->offset = ib_umem_offset(umem);
+ mr->page_offset = ib_umem_offset(umem);
mr->state = RXE_MR_STATE_VALID;
mr->ibmr.type = IB_MR_TYPE_USER;
- mr->ibmr.page_size = PAGE_SIZE;
return 0;
int sg_nents, unsigned int *sg_offset)
{
struct rxe_mr *mr = to_rmr(ibmr);
- int n;
-
- mr->nbuf = 0;
+ unsigned int page_size = mr_page_size(mr);
- n = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, rxe_set_page);
+ mr->page_shift = ilog2(page_size);
+ mr->page_mask = ~((u64)page_size - 1);
+ mr->page_offset = ibmr->iova & (page_size - 1);
- mr->page_shift = ilog2(ibmr->page_size);
- mr->page_mask = ibmr->page_size - 1;
- mr->offset = ibmr->iova & mr->page_mask;
+ mr->nbuf = 0;
- return n;
+ return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, rxe_set_page);
}
static void lookup_iova(struct rxe_mr *mr, u64 iova, int *m_out, int *n_out,
size_t *offset_out)
{
- size_t offset = iova - mr->ibmr.iova + mr->offset;
+ size_t offset = iova - mr->ibmr.iova + mr->page_offset;
int map_index;
int buf_index;
u64 length;
if (likely(mr->page_shift)) {
- *offset_out = offset & mr->page_mask;
+ *offset_out = offset & (mr_page_size(mr) - 1);
offset >>= mr->page_shift;
*n_out = offset & mr->map_mask;
*m_out = offset >> mr->map_shift;
if (mr->ibmr.type == IB_MR_TYPE_DMA)
return -EFAULT;
- offset = (iova - mr->ibmr.iova + mr->offset) & mr->page_mask;
+ offset = (iova - mr->ibmr.iova + mr->page_offset) & mr->page_mask;
while (length > 0) {
u8 *va;
int bytes;