|
|
@@ -1924,23 +1924,19 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
|
|
|
offset_in_page((seg-1)->mr_offset + (seg-1)->mr_len))
|
|
|
break;
|
|
|
}
|
|
|
- dprintk("RPC: %s: Using frmr %p to map %d segments\n",
|
|
|
- __func__, mw, i);
|
|
|
+ dprintk("RPC: %s: Using frmr %p to map %d segments (%d bytes)\n",
|
|
|
+ __func__, mw, i, len);
|
|
|
|
|
|
frmr->fr_state = FRMR_IS_VALID;
|
|
|
|
|
|
memset(&fastreg_wr, 0, sizeof(fastreg_wr));
|
|
|
fastreg_wr.wr_id = (unsigned long)(void *)mw;
|
|
|
fastreg_wr.opcode = IB_WR_FAST_REG_MR;
|
|
|
- fastreg_wr.wr.fast_reg.iova_start = seg1->mr_dma;
|
|
|
+ fastreg_wr.wr.fast_reg.iova_start = seg1->mr_dma + pageoff;
|
|
|
fastreg_wr.wr.fast_reg.page_list = frmr->fr_pgl;
|
|
|
fastreg_wr.wr.fast_reg.page_list_len = page_no;
|
|
|
fastreg_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
|
|
|
- fastreg_wr.wr.fast_reg.length = page_no << PAGE_SHIFT;
|
|
|
- if (fastreg_wr.wr.fast_reg.length < len) {
|
|
|
- rc = -EIO;
|
|
|
- goto out_err;
|
|
|
- }
|
|
|
+ fastreg_wr.wr.fast_reg.length = len;
|
|
|
|
|
|
/* Bump the key */
|
|
|
key = (u8)(mr->rkey & 0x000000FF);
|