Commit 2090f5d3 authored by Zhengchao Shao's avatar Zhengchao Shao Committed by huwentao0417
Browse files

RDMA/hns: Fix return value in hns_roce_map_mr_sg 

mainline inclusion
from mainline-v6.10-rc1
commit 203b70fda63425a4eb29f03f9074859afe821a39
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9SONH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/commit/?id=203b70fda63425a4eb29f03f9074859afe821a39



--------------------------------

As described in the ib_map_mr_sg function comment, it returns the number
of sg elements that were mapped to the memory region. However,
hns_roce_map_mr_sg returns the number of pages required for mapping the
DMA area. Fix it.

Fixes: 9b2cf76c ("RDMA/hns: Optimize PBL buffer allocation process")
Signed-off-by: default avatarZhengchao Shao <shaozhengchao@huawei.com>
Link: https://lore.kernel.org/r/20240411033851.2884771-1-shaozhengchao@huawei.com


Reviewed-by: default avatarJunxian Huang <huangjunxian6@hisilicon.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarhuwentao0417 <huwentao19@h-partners.com>
parent d11117b8

drivers/infiniband/hw/hns/hns_roce_mr.c

+7 −8
Original line number Diff line number Diff line
@@ -450,18 +450,18 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, 
	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_mr *mr = to_hr_mr(ibmr);

	struct hns_roce_mtr *mtr = &mr->pbl_mtr;

	int ret = 0;

	int ret, sg_num = 0;



	mr->npages = 0;

	mr->page_list = kvcalloc(mr->pbl_mtr.hem_cfg.buf_pg_count,

				 sizeof(dma_addr_t), GFP_KERNEL);

	if (!mr->page_list)

		return ret;

		return sg_num;



	ret = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, hns_roce_set_page);

	if (ret < 1) {

	sg_num = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset, hns_roce_set_page);

	if (sg_num < 1) {

		ibdev_err(ibdev, "failed to store sg pages %u %u, cnt = %d.\n",

			  mr->npages, mr->pbl_mtr.hem_cfg.buf_pg_count, ret);

			  mr->npages, mr->pbl_mtr.hem_cfg.buf_pg_count, sg_num);

		goto err_page_list;

	}
@@ -472,17 +472,16 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, 
	ret = hns_roce_mtr_map(hr_dev, mtr, mr->page_list, mr->npages);

	if (ret) {

		ibdev_err(ibdev, "failed to map sg mtr, ret = %d.\n", ret);

		ret = 0;

		sg_num = 0;

	} else {

		mr->pbl_mtr.hem_cfg.buf_pg_shift = (u32)ilog2(ibmr->page_size);

		ret = mr->npages;

	}



err_page_list:

	kvfree(mr->page_list);

	mr->page_list = NULL;



	return ret;

	return sg_num;

}



static void hns_roce_mw_free(struct hns_roce_dev *hr_dev,