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

!2346 RDMA/irdma: Prevent zero-length STAG registration 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O6RB3CY3MPBC6TI2BXP6L5ITIZZMBWHG/ 
 
https://gitee.com/src-openeuler/kernel/issues/I7YFVN 
 
Link:https://gitee.com/openeuler/kernel/pulls/2346

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 0e80669c e5ce8667

drivers/infiniband/hw/i40iw/i40iw_ctrl.c

+6 −0
Original line number Diff line number Diff line
@@ -2945,6 +2945,9 @@ static enum i40iw_status_code i40iw_sc_alloc_stag( 
	u64 header;

	enum i40iw_page_size page_size;



	if (!info->total_len && !info->all_memory)

		return -EINVAL;



	page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K;

	cqp = dev->cqp;

	wqe = i40iw_sc_cqp_get_next_send_wqe(cqp, scratch);
@@ -3003,6 +3006,9 @@ static enum i40iw_status_code i40iw_sc_mr_reg_non_shared( 
	u8 addr_type;

	enum i40iw_page_size page_size;



	if (!info->total_len && !info->all_memory)

		return -EINVAL;



	page_size = (info->page_size == 0x200000) ? I40IW_PAGE_SIZE_2M : I40IW_PAGE_SIZE_4K;

	if (info->access_rights & (I40IW_ACCESS_FLAGS_REMOTEREAD_ONLY |

				   I40IW_ACCESS_FLAGS_REMOTEWRITE_ONLY))

drivers/infiniband/hw/i40iw/i40iw_type.h

+2 −0
Original line number Diff line number Diff line
@@ -779,6 +779,7 @@ struct i40iw_allocate_stag_info { 
	bool use_hmc_fcn_index;

	u8 hmc_fcn_index;

	bool use_pf_rid;

	bool all_memory;

};



struct i40iw_reg_ns_stag_info {
@@ -797,6 +798,7 @@ struct i40iw_reg_ns_stag_info { 
	bool use_hmc_fcn_index;

	u8 hmc_fcn_index;

	bool use_pf_rid;

	bool all_memory;

};



struct i40iw_fast_reg_stag_info {

drivers/infiniband/hw/i40iw/i40iw_verbs.c

+8 −2
Original line number Diff line number Diff line
@@ -1603,7 +1603,8 @@ static int i40iw_handle_q_mem(struct i40iw_device *iwdev, 
static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr)

{

	struct i40iw_allocate_stag_info *info;

	struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd);

	struct ib_pd *pd = iwmr->ibmr.pd;

	struct i40iw_pd *iwpd = to_iwpd(pd);

	enum i40iw_status_code status;

	int err = 0;

	struct i40iw_cqp_request *cqp_request;
@@ -1620,6 +1621,7 @@ static int i40iw_hw_alloc_stag(struct i40iw_device *iwdev, struct i40iw_mr *iwmr 
	info->stag_idx = iwmr->stag >> I40IW_CQPSQ_STAG_IDX_SHIFT;

	info->pd_id = iwpd->sc_pd.pd_id;

	info->total_len = iwmr->length;

	info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY;

	info->remote_access = true;

	cqp_info->cqp_cmd = OP_ALLOC_STAG;

	cqp_info->post_sq = 1;
@@ -1673,6 +1675,8 @@ static struct ib_mr *i40iw_alloc_mr(struct ib_pd *pd, 
	iwmr->type = IW_MEMREG_TYPE_MEM;

	palloc = &iwpbl->pble_alloc;

	iwmr->page_cnt = max_num_sg;

	/* Use system PAGE_SIZE as the sg page sizes are unknown at this point */

	iwmr->length = max_num_sg * PAGE_SIZE;

	mutex_lock(&iwdev->pbl_mutex);

	status = i40iw_get_pble(&iwdev->sc_dev, iwdev->pble_rsrc, palloc, iwmr->page_cnt);

	mutex_unlock(&iwdev->pbl_mutex);
@@ -1769,7 +1773,8 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, 
{

	struct i40iw_pbl *iwpbl = &iwmr->iwpbl;

	struct i40iw_reg_ns_stag_info *stag_info;

	struct i40iw_pd *iwpd = to_iwpd(iwmr->ibmr.pd);

	struct ib_pd *pd = iwmr->ibmr.pd;

	struct i40iw_pd *iwpd = to_iwpd(pd);

	struct i40iw_pble_alloc *palloc = &iwpbl->pble_alloc;

	enum i40iw_status_code status;

	int err = 0;
@@ -1789,6 +1794,7 @@ static int i40iw_hwreg_mr(struct i40iw_device *iwdev, 
	stag_info->total_len = iwmr->length;

	stag_info->access_rights = access;

	stag_info->pd_id = iwpd->sc_pd.pd_id;

	stag_info->all_memory = pd->flags & IB_PD_UNSAFE_GLOBAL_RKEY;

	stag_info->addr_type = I40IW_ADDR_TYPE_VA_BASED;

	stag_info->page_size = iwmr->page_size;