Commit edd31551 authored by Parav Pandit's avatar Parav Pandit Committed by Doug Ledford
Browse files

IB: Correct MR length field to be 64-bit 



The ib_mr->length represents the length of the MR in bytes as per
the IBTA spec 1.3 section 11.2.10.3 (REGISTER PHYSICAL MEMORY REGION).

Currently ib_mr->length field is defined as only 32-bits field.
This might result into truncation and failed WRs of consumers who
registers more than 4GB bytes memory regions and whose WRs accessing
such MRs.

This patch makes the length 64-bit to avoid such truncation.

Cc: Sagi Grimberg <sagi@grimberg.me>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Faisal Latif <faisal.latif@intel.com>
Fixes: 4c67e2bf ("IB/core: Introduce new fast registration API")
Signed-off-by: default avatarIlya Lesokhin <ilyal@mellanox.com>
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 73827a60

drivers/infiniband/hw/nes/nes_verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -3232,7 +3232,7 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
					    mr->ibmr.iova);

			set_wqe_32bit_value(wqe->wqe_words,

					    NES_IWARP_SQ_FMR_WQE_LENGTH_LOW_IDX,

					    mr->ibmr.length);

					    lower_32_bits(mr->ibmr.length));

			set_wqe_32bit_value(wqe->wqe_words,

					    NES_IWARP_SQ_FMR_WQE_LENGTH_HIGH_IDX, 0);

			set_wqe_32bit_value(wqe->wqe_words,
@@ -3274,7 +3274,7 @@ static int nes_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
					    mr->npages * 8);



			nes_debug(NES_DBG_IW_TX, "SQ_REG_MR: iova_start: %llx, "

				  "length: %d, rkey: %0x, pgl_paddr: %llx, "

				  "length: %lld, rkey: %0x, pgl_paddr: %llx, "

				  "page_list_len: %u, wqe_misc: %x\n",

				  (unsigned long long) mr->ibmr.iova,

				  mr->ibmr.length,

drivers/infiniband/ulp/iser/iser_memory.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static void iser_dump_page_vec(struct iser_page_vec *page_vec) 
{

	int i;



	iser_err("page vec npages %d data length %d\n",

	iser_err("page vec npages %d data length %lld\n",

		 page_vec->npages, page_vec->fake_mr.length);

	for (i = 0; i < page_vec->npages; i++)

		iser_err("vec[%d]: %llx\n", i, page_vec->pages[i]);

include/rdma/ib_verbs.h

+1 −1
Original line number Diff line number Diff line
@@ -1739,7 +1739,7 @@ struct ib_mr { 
	u32		   lkey;

	u32		   rkey;

	u64		   iova;

	u32		   length;

	u64		   length;

	unsigned int	   page_size;

	bool		   need_inval;

	union {

net/sunrpc/xprtrdma/frwr_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ frwr_op_map(struct rpcrdma_xprt *r_xprt, struct rpcrdma_mr_seg *seg, 
	if (unlikely(n != mw->mw_nents))

		goto out_mapmr_err;



	dprintk("RPC:       %s: Using frmr %p to map %u segments (%u bytes)\n",

	dprintk("RPC:       %s: Using frmr %p to map %u segments (%llu bytes)\n",

		__func__, frmr, mw->mw_nents, mr->length);



	key = (u8)(mr->rkey & 0x000000FF);

CRA Git | Maintained and supported by SUSTech CRA and CCSE