Unverified Commit e0dc5e14 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13161 Some patches of RDMA from Linux to olk-6.6 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chengchang Tang <tangchengchang@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/L6N2L6VEEUJYNTGLPNCNTB3YW5LE6REX/ 
From: Xinghai Cen <cenxinghai@h-partners.com>

Some patches of RDMA from Linux to olk-6.6

Junxian Huang (2):
  RDMA/hns: Fix out-of-order issue of requester when setting FENCE
  RDMA/hns: Fix NULL pointer derefernce in hns_roce_map_mr_sg()


-- 
2.33.0
 
https://gitee.com/openeuler/kernel/issues/IB30V8 
 
Link:https://gitee.com/openeuler/kernel/pulls/13161

 

Reviewed-by: default avatarChengchang Tang <tangchengchang@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents e57f091d b6bd907b

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+1 −1
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static inline int set_rc_wqe(struct hns_roce_qp *qp, 
	if (WARN_ON(ret))

		return ret;



	hr_reg_write(rc_sq_wqe, RC_SEND_WQE_FENCE,

	hr_reg_write(rc_sq_wqe, RC_SEND_WQE_SO,

		     (wr->send_flags & IB_SEND_FENCE) ? 1 : 0);



	hr_reg_write(rc_sq_wqe, RC_SEND_WQE_SE,

drivers/infiniband/hw/hns/hns_roce_hw_v2.h

+1 −0
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ struct hns_roce_v2_rc_send_wqe { 
#define RC_SEND_WQE_OWNER RC_SEND_WQE_FIELD_LOC(7, 7)

#define RC_SEND_WQE_CQE RC_SEND_WQE_FIELD_LOC(8, 8)

#define RC_SEND_WQE_FENCE RC_SEND_WQE_FIELD_LOC(9, 9)

#define RC_SEND_WQE_SO RC_SEND_WQE_FIELD_LOC(10, 10)

#define RC_SEND_WQE_SE RC_SEND_WQE_FIELD_LOC(11, 11)

#define RC_SEND_WQE_INLINE RC_SEND_WQE_FIELD_LOC(12, 12)

#define RC_SEND_WQE_WQE_INDEX RC_SEND_WQE_FIELD_LOC(30, 15)

drivers/infiniband/hw/hns/hns_roce_mr.c

+4 −3
Original line number Diff line number Diff line
@@ -453,15 +453,16 @@ static int hns_roce_set_page(struct ib_mr *ibmr, u64 addr) 
}



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

		       unsigned int *sg_offset)

		       unsigned int *sg_offset_p)

{

	unsigned int sg_offset = sg_offset_p ? *sg_offset_p : 0;

	struct hns_roce_dev *hr_dev = to_hr_dev(ibmr->device);

	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, sg_num = 0;



	if (!IS_ALIGNED(*sg_offset, HNS_ROCE_FRMR_ALIGN_SIZE) ||

	if (!IS_ALIGNED(sg_offset, HNS_ROCE_FRMR_ALIGN_SIZE) ||

	    ibmr->page_size < HNS_HW_PAGE_SIZE ||

	    ibmr->page_size > HNS_HW_MAX_PAGE_SIZE)

		return sg_num;
@@ -472,7 +473,7 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents, 
	if (!mr->page_list)

		return sg_num;



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

	sg_num = ib_sg_to_pages(ibmr, sg, sg_nents, sg_offset_p, 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, sg_num);