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

!5097 [sync] PR-5078: RDMA/rxe: Return CQE error if invalid lkey was supplied 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5078 
 
PR sync from: Liu Jian <liujian56@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DWPOTCIQUERWOAUDZDQN5RVVF6CDYQN6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I956FT 
 
Link:https://gitee.com/openeuler/kernel/pulls/5097

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 6dd76248 cc393782

drivers/infiniband/sw/rxe/rxe_comp.c

+10 −6
Original line number Diff line number Diff line
@@ -346,12 +346,14 @@ static inline enum comp_state do_read(struct rxe_qp *qp, 
	ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,

			&wqe->dma, payload_addr(pkt),

			payload_size(pkt), to_mem_obj, NULL);

	if (ret)

	if (ret) {

		wqe->status = IB_WC_LOC_PROT_ERR;

		return COMPST_ERROR;

	}



	if (wqe->dma.resid == 0 && (pkt->mask & RXE_END_MASK))

		return COMPST_COMP_ACK;

	else



	return COMPST_UPDATE_COMP;

}
@@ -366,9 +368,11 @@ static inline enum comp_state do_atomic(struct rxe_qp *qp, 
	ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,

			&wqe->dma, &atomic_orig,

			sizeof(u64), to_mem_obj, NULL);

	if (ret)

	if (ret) {

		wqe->status = IB_WC_LOC_PROT_ERR;

		return COMPST_ERROR;

	else

	}



	return COMPST_COMP_ACK;

}