Commit 4d50e084 authored by Gal Pressman's avatar Gal Pressman Committed by Jason Gunthorpe
Browse files

RDMA/efa: Use rdma block iterator in chunk list creation 



When creating the chunks list the rdma_for_each_block() iterator is used
in order to iterate over the payload in EFA_CHUNK_PAYLOAD_SIZE (device
defined) strides.

Reviewed-by: default avatarFiras JahJah <firasj@amazon.com>
Reviewed-by: default avatarYossi Leybovich <sleybo@amazon.com>
Reviewed-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarGal Pressman <galpress@amazon.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent e0e3f397

drivers/infiniband/hw/efa/efa_verbs.c

+11 −14
Original line number Diff line number Diff line
@@ -1085,14 +1085,14 @@ err: 
 */

static int pbl_chunk_list_create(struct efa_dev *dev, struct pbl_context *pbl)

{

	unsigned int entry, payloads_in_sg, chunk_list_size, chunk_idx, payload_idx;

	struct pbl_chunk_list *chunk_list = &pbl->phys.indirect.chunk_list;

	int page_cnt = pbl->phys.indirect.pbl_buf_size_in_pages;

	struct scatterlist *pages_sgl = pbl->phys.indirect.sgl;

	unsigned int chunk_list_size, chunk_idx, payload_idx;

	int sg_dma_cnt = pbl->phys.indirect.sg_dma_cnt;

	struct efa_com_ctrl_buff_info *ctrl_buf;

	u64 *cur_chunk_buf, *prev_chunk_buf;

	struct scatterlist *sg;

	struct ib_block_iter biter;

	dma_addr_t dma_addr;

	int i;
@@ -1126,12 +1126,10 @@ static int pbl_chunk_list_create(struct efa_dev *dev, struct pbl_context *pbl) 
	chunk_idx = 0;

	payload_idx = 0;

	cur_chunk_buf = chunk_list->chunks[0].buf;

	for_each_sg(pages_sgl, sg, sg_dma_cnt, entry) {

		payloads_in_sg = sg_dma_len(sg) >> EFA_CHUNK_PAYLOAD_SHIFT;

		for (i = 0; i < payloads_in_sg; i++) {

	rdma_for_each_block(pages_sgl, &biter, sg_dma_cnt,

			    EFA_CHUNK_PAYLOAD_SIZE) {

		cur_chunk_buf[payload_idx++] =

				(sg_dma_address(sg) & ~(EFA_CHUNK_PAYLOAD_SIZE - 1)) +

				(EFA_CHUNK_PAYLOAD_SIZE * i);

			rdma_block_iter_dma_address(&biter);



		if (payload_idx == EFA_PTRS_PER_CHUNK) {

			chunk_idx++;
@@ -1139,7 +1137,6 @@ static int pbl_chunk_list_create(struct efa_dev *dev, struct pbl_context *pbl) 
			payload_idx = 0;

		}

	}

	}



	/* map chunks to dma and fill chunks next ptrs */

	for (i = chunk_list_size - 1; i >= 0; i--) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE