Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2df0c83 authored by Jianxin Xiong's avatar Jianxin Xiong Committed by Doug Ledford
Browse files

IB/hfi1: Handle send with invalidate opcode in the RC recv path 



As part of enabling extended memory management support, add the processing
of the RC send with invalidate.

Reviewed-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJianxin Xiong <jianxin.xiong@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent d9f87239

drivers/infiniband/hw/hfi1/rc.c

+15 −1
Original line number Diff line number Diff line
@@ -2098,6 +2098,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 
	unsigned long flags;

	int ret, is_fecn = 0;

	int copy_last = 0;

	u32 rkey;



	bth0 = be32_to_cpu(ohdr->bth[0]);

	if (hfi1_ruc_check_hdr(ibp, hdr, rcv_flags & HFI1_HAS_GRH, qp, bth0))
@@ -2137,7 +2138,8 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 
	case OP(SEND_MIDDLE):

		if (opcode == OP(SEND_MIDDLE) ||

		    opcode == OP(SEND_LAST) ||

		    opcode == OP(SEND_LAST_WITH_IMMEDIATE))

		    opcode == OP(SEND_LAST_WITH_IMMEDIATE) ||

		    opcode == OP(SEND_LAST_WITH_INVALIDATE))

			break;

		goto nack_inv;
@@ -2153,6 +2155,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 
		if (opcode == OP(SEND_MIDDLE) ||

		    opcode == OP(SEND_LAST) ||

		    opcode == OP(SEND_LAST_WITH_IMMEDIATE) ||

		    opcode == OP(SEND_LAST_WITH_INVALIDATE) ||

		    opcode == OP(RDMA_WRITE_MIDDLE) ||

		    opcode == OP(RDMA_WRITE_LAST) ||

		    opcode == OP(RDMA_WRITE_LAST_WITH_IMMEDIATE))
@@ -2201,6 +2204,7 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 


	case OP(SEND_ONLY):

	case OP(SEND_ONLY_WITH_IMMEDIATE):

	case OP(SEND_ONLY_WITH_INVALIDATE):

		ret = hfi1_rvt_get_rwqe(qp, 0);

		if (ret < 0)

			goto nack_op_err;
@@ -2209,12 +2213,22 @@ void hfi1_rc_rcv(struct hfi1_packet *packet) 
		qp->r_rcv_len = 0;

		if (opcode == OP(SEND_ONLY))

			goto no_immediate_data;

		if (opcode == OP(SEND_ONLY_WITH_INVALIDATE))

			goto send_last_inv;

		/* FALLTHROUGH for SEND_ONLY_WITH_IMMEDIATE */

	case OP(SEND_LAST_WITH_IMMEDIATE):

send_last_imm:

		wc.ex.imm_data = ohdr->u.imm_data;

		wc.wc_flags = IB_WC_WITH_IMM;

		goto send_last;

	case OP(SEND_LAST_WITH_INVALIDATE):

send_last_inv:

		rkey = be32_to_cpu(ohdr->u.ieth);

		if (rvt_invalidate_rkey(qp, rkey))

			goto no_immediate_data;

		wc.ex.invalidate_rkey = rkey;

		wc.wc_flags = IB_WC_WITH_INVALIDATE;

		goto send_last;

	case OP(RDMA_WRITE_LAST):

		copy_last = ibpd_to_rvtpd(qp->ibqp.pd)->user;

		/* fall through */

drivers/infiniband/hw/hfi1/verbs.c

+2 −0
Original line number Diff line number Diff line
@@ -378,6 +378,8 @@ static const opcode_handler opcode_handler_tbl[256] = { 
	[IB_OPCODE_RC_ATOMIC_ACKNOWLEDGE]             = &hfi1_rc_rcv,

	[IB_OPCODE_RC_COMPARE_SWAP]                   = &hfi1_rc_rcv,

	[IB_OPCODE_RC_FETCH_ADD]                      = &hfi1_rc_rcv,

	[IB_OPCODE_RC_SEND_LAST_WITH_INVALIDATE]      = &hfi1_rc_rcv,

	[IB_OPCODE_RC_SEND_ONLY_WITH_INVALIDATE]      = &hfi1_rc_rcv,

	/* UC */

	[IB_OPCODE_UC_SEND_FIRST]                     = &hfi1_uc_rcv,

	[IB_OPCODE_UC_SEND_MIDDLE]                    = &hfi1_uc_rcv,