RDMA/cxgb3: Use for_each_sg_dma_page iterator on umem SGL (b44e47eb) · Commits · 戴 / test

drivers/infiniband/hw/cxgb3/iwch_provider.c

+12 −17

Original line number	Diff line number	Diff line
		@@ -516,14 +516,13 @@ static struct ib_mr iwch_reg_user_mr(struct ib_pd pd, u64 start, u64 length,
		u64 virt, int acc, struct ib_udata *udata)
		{
		__be64 *pages;
		int shift, n, len;
		int i, k, entry;
		int shift, n, i;
		int err = 0;
		struct iwch_dev *rhp;
		struct iwch_pd *php;
		struct iwch_mr *mhp;
		struct iwch_reg_user_mr_resp uresp;
		struct scatterlist *sg;
		struct sg_dma_page_iter sg_iter;
		pr_debug("%s ib_pd %p\n", __func__, pd);

		php = to_iwch_pd(pd);
		@@ -541,7 +540,7 @@ static struct ib_mr iwch_reg_user_mr(struct ib_pd pd, u64 start, u64 length,
		return ERR_PTR(err);
		}

		shift = mhp->umem->page_shift;
		shift = PAGE_SHIFT;

		n = mhp->umem->nmap;

		@@ -557,11 +556,8 @@ static struct ib_mr iwch_reg_user_mr(struct ib_pd pd, u64 start, u64 length,

		i = n = 0;

		for_each_sg(mhp->umem->sg_head.sgl, sg, mhp->umem->nmap, entry) {
		len = sg_dma_len(sg) >> shift;
		for (k = 0; k < len; ++k) {
		pages[i++] = cpu_to_be64(sg_dma_address(sg) +
		(k << shift));
		for_each_sg_dma_page(mhp->umem->sg_head.sgl, &sg_iter, mhp->umem->nmap, 0) {
		pages[i++] = cpu_to_be64(sg_page_iter_dma_address(&sg_iter));
		if (i == PAGE_SIZE / sizeof *pages) {
		err = iwch_write_pbl(mhp, pages, i, n);
		if (err)
		@@ -570,7 +566,6 @@ static struct ib_mr iwch_reg_user_mr(struct ib_pd pd, u64 start, u64 length,
		i = 0;
		}
		}
		}

		if (i)
		err = iwch_write_pbl(mhp, pages, i, n);