Commit db4729a5 authored by Bob Pearson's avatar Bob Pearson Committed by Jason Gunthorpe
Browse files

RDMA/rxe: Move rxe_map_mr_sg to rxe_mr.c 

Move rxe_map_mr_sg() to rxe_mr.c where it makes a little more sense.

Link: https://lore.kernel.org/r/20230119235936.19728-3-rpearsonhpe@gmail.com


Signed-off-by: default avatarBob Pearson <rpearsonhpe@gmail.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent ade58da2

drivers/infiniband/sw/rxe/rxe_loc.h

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,8 @@ int rxe_mr_copy(struct rxe_mr *mr, u64 iova, void *addr, int length, 
		enum rxe_mr_copy_dir dir);

int copy_data(struct rxe_pd *pd, int access, struct rxe_dma_info *dma,

	      void *addr, int length, enum rxe_mr_copy_dir dir);

int rxe_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,

		  int sg_nents, unsigned int *sg_offset);

void *iova_to_vaddr(struct rxe_mr *mr, u64 iova, int length);

struct rxe_mr *lookup_mr(struct rxe_pd *pd, int access, u32 key,

			 enum rxe_mr_lookup_type type);

drivers/infiniband/sw/rxe/rxe_mr.c

+36 −0
Original line number Diff line number Diff line
@@ -223,6 +223,42 @@ int rxe_mr_init_fast(int max_pages, struct rxe_mr *mr) 
	return err;

}



static int rxe_set_page(struct ib_mr *ibmr, u64 addr)

{

	struct rxe_mr *mr = to_rmr(ibmr);

	struct rxe_map *map;

	struct rxe_phys_buf *buf;



	if (unlikely(mr->nbuf == mr->num_buf))

		return -ENOMEM;



	map = mr->map[mr->nbuf / RXE_BUF_PER_MAP];

	buf = &map->buf[mr->nbuf % RXE_BUF_PER_MAP];



	buf->addr = addr;

	buf->size = ibmr->page_size;

	mr->nbuf++;



	return 0;

}



int rxe_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg,

		  int sg_nents, unsigned int *sg_offset)

{

	struct rxe_mr *mr = to_rmr(ibmr);

	int n;



	mr->nbuf = 0;



	n = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, rxe_set_page);



	mr->page_shift = ilog2(ibmr->page_size);

	mr->page_mask = ibmr->page_size - 1;

	mr->offset = ibmr->iova & mr->page_mask;



	return n;

}



static void lookup_iova(struct rxe_mr *mr, u64 iova, int *m_out, int *n_out,

			size_t *offset_out)

{

drivers/infiniband/sw/rxe/rxe_verbs.c

+0 −36
Original line number Diff line number Diff line
@@ -948,42 +948,6 @@ static struct ib_mr *rxe_alloc_mr(struct ib_pd *ibpd, enum ib_mr_type mr_type, 
	return ERR_PTR(err);

}



static int rxe_set_page(struct ib_mr *ibmr, u64 addr)

{

	struct rxe_mr *mr = to_rmr(ibmr);

	struct rxe_map *map;

	struct rxe_phys_buf *buf;



	if (unlikely(mr->nbuf == mr->num_buf))

		return -ENOMEM;



	map = mr->map[mr->nbuf / RXE_BUF_PER_MAP];

	buf = &map->buf[mr->nbuf % RXE_BUF_PER_MAP];



	buf->addr = addr;

	buf->size = ibmr->page_size;

	mr->nbuf++;



	return 0;

}



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

			 int sg_nents, unsigned int *sg_offset)

{

	struct rxe_mr *mr = to_rmr(ibmr);

	int n;



	mr->nbuf = 0;



	n = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, rxe_set_page);



	mr->page_shift = ilog2(ibmr->page_size);

	mr->page_mask = ibmr->page_size - 1;

	mr->offset = ibmr->iova & mr->page_mask;



	return n;

}



static ssize_t parent_show(struct device *device,

			   struct device_attribute *attr, char *buf)

{