Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff2ba993 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Doug Ledford
Browse files

IB/core: Add passing an offset into the SG to ib_map_mr_sg 



Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarSteve Wise <swise@opengridcomputing.com>
Reviewed-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 0691a286

drivers/infiniband/core/verbs.c

+12 −12
Original line number Diff line number Diff line
@@ -1597,6 +1597,7 @@ EXPORT_SYMBOL(ib_set_vf_guid); 
 * @mr:            memory region

 * @sg:            dma mapped scatterlist

 * @sg_nents:      number of entries in sg

 * @sg_offset:     offset in bytes into sg

 * @page_size:     page vector desired page size

 *

 * Constraints:
@@ -1615,17 +1616,15 @@ EXPORT_SYMBOL(ib_set_vf_guid); 
 * After this completes successfully, the  memory region

 * is ready for registration.

 */

int ib_map_mr_sg(struct ib_mr *mr,

		 struct scatterlist *sg,

		 int sg_nents,

		 unsigned int page_size)

int ib_map_mr_sg(struct ib_mr *mr, struct scatterlist *sg, int sg_nents,

		unsigned int sg_offset, unsigned int page_size)

{

	if (unlikely(!mr->device->map_mr_sg))

		return -ENOSYS;



	mr->page_size = page_size;



	return mr->device->map_mr_sg(mr, sg, sg_nents);

	return mr->device->map_mr_sg(mr, sg, sg_nents, sg_offset);

}

EXPORT_SYMBOL(ib_map_mr_sg);
@@ -1635,6 +1634,7 @@ EXPORT_SYMBOL(ib_map_mr_sg); 
 * @mr:            memory region

 * @sgl:           dma mapped scatterlist

 * @sg_nents:      number of entries in sg

 * @sg_offset:     offset in bytes into sg

 * @set_page:      driver page assignment function pointer

 *

 * Core service helper for drivers to convert the largest
@@ -1645,10 +1645,8 @@ EXPORT_SYMBOL(ib_map_mr_sg); 
 * Returns the number of sg elements that were assigned to

 * a page vector.

 */

int ib_sg_to_pages(struct ib_mr *mr,

		   struct scatterlist *sgl,

		   int sg_nents,

		   int (*set_page)(struct ib_mr *, u64))

int ib_sg_to_pages(struct ib_mr *mr, struct scatterlist *sgl, int sg_nents,

		unsigned int sg_offset, int (*set_page)(struct ib_mr *, u64))

{

	struct scatterlist *sg;

	u64 last_end_dma_addr = 0;
@@ -1656,12 +1654,12 @@ int ib_sg_to_pages(struct ib_mr *mr, 
	u64 page_mask = ~((u64)mr->page_size - 1);

	int i, ret;



	mr->iova = sg_dma_address(&sgl[0]);

	mr->iova = sg_dma_address(&sgl[0]) + sg_offset;

	mr->length = 0;



	for_each_sg(sgl, sg, sg_nents, i) {

		u64 dma_addr = sg_dma_address(sg);

		unsigned int dma_len = sg_dma_len(sg);

		u64 dma_addr = sg_dma_address(sg) + sg_offset;

		unsigned int dma_len = sg_dma_len(sg) - sg_offset;

		u64 end_dma_addr = dma_addr + dma_len;

		u64 page_addr = dma_addr & page_mask;
@@ -1694,6 +1692,8 @@ int ib_sg_to_pages(struct ib_mr *mr, 
		mr->length += dma_len;

		last_end_dma_addr = end_dma_addr;

		last_page_off = end_dma_addr & ~page_mask;



		sg_offset = 0;

	}



	return i;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+3 −4
Original line number Diff line number Diff line
@@ -783,15 +783,14 @@ static int iwch_set_page(struct ib_mr *ibmr, u64 addr) 
	return 0;

}



static int iwch_map_mr_sg(struct ib_mr *ibmr,

			  struct scatterlist *sg,

			  int sg_nents)

static int iwch_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,

		int sg_nents, unsigned sg_offset)

{

	struct iwch_mr *mhp = to_iwch_mr(ibmr);



	mhp->npages = 0;



	return ib_sg_to_pages(ibmr, sg, sg_nents, iwch_set_page);

	return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, iwch_set_page);

}



static int iwch_destroy_qp(struct ib_qp *ib_qp)

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+2 −3
Original line number Diff line number Diff line
@@ -917,9 +917,8 @@ void c4iw_qp_rem_ref(struct ib_qp *qp); 
struct ib_mr *c4iw_alloc_mr(struct ib_pd *pd,

			    enum ib_mr_type mr_type,

			    u32 max_num_sg);

int c4iw_map_mr_sg(struct ib_mr *ibmr,

		   struct scatterlist *sg,

		   int sg_nents);

int c4iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,

		unsigned int sg_offset);

int c4iw_dealloc_mw(struct ib_mw *mw);

struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type,

			    struct ib_udata *udata);

drivers/infiniband/hw/cxgb4/mem.c

+3 −4
Original line number Diff line number Diff line
@@ -690,15 +690,14 @@ static int c4iw_set_page(struct ib_mr *ibmr, u64 addr) 
	return 0;

}



int c4iw_map_mr_sg(struct ib_mr *ibmr,

		   struct scatterlist *sg,

		   int sg_nents)

int c4iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,

		unsigned int sg_offset)

{

	struct c4iw_mr *mhp = to_c4iw_mr(ibmr);



	mhp->mpl_len = 0;



	return ib_sg_to_pages(ibmr, sg, sg_nents, c4iw_set_page);

	return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, c4iw_set_page);

}



int c4iw_dereg_mr(struct ib_mr *ib_mr)

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+3 −2
Original line number Diff line number Diff line
@@ -1573,12 +1573,13 @@ static int i40iw_set_page(struct ib_mr *ibmr, u64 addr) 
 * @sg: scatter gather list for fmr

 * @sg_nents: number of sg pages

 */

static int i40iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents)

static int i40iw_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,

			   int sg_nents, unsigned int sg_offset)

{

	struct i40iw_mr *iwmr = to_iwmr(ibmr);



	iwmr->npages = 0;

	return ib_sg_to_pages(ibmr, sg, sg_nents, i40iw_set_page);

	return ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, i40iw_set_page);

}



/**