Commit 43a474aa authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

IB/rdmavt, IB/hfi1, IB/qib: Make wc opcode translation driver dependent 



The work to create a completion helper moved the translation of send
wqe operations to completion opcodes to rdmvat.

This precludes having driver dependent operations.  Make the translation
driver dependent by doing the translation in the driver prior to the
rvt_qp_swqe_complete() call using restored translation tables.

Fixes: Commit f2dc9cdc ("IB/rdmavt: Add a send completion helper")
Fixes: Commit 0771da5a ("IB/hfi1,IB/qib: Use new send completion helper")
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 5a52a7ac

drivers/infiniband/hw/hfi1/rc.c

+8 −2
Original line number Diff line number Diff line
@@ -1034,7 +1034,10 @@ void hfi1_rc_send_complete(struct rvt_qp *qp, struct ib_header *hdr) 
		/* see post_send() */

		barrier();

		rvt_put_swqe(wqe);

		rvt_qp_swqe_complete(qp, wqe, IB_WC_SUCCESS);

		rvt_qp_swqe_complete(qp,

				     wqe,

				     ib_hfi1_wc_opcode[wqe->wr.opcode],

				     IB_WC_SUCCESS);

	}

	/*

	 * If we were waiting for sends to complete before re-sending,
@@ -1081,7 +1084,10 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
		qp->s_last = s_last;

		/* see post_send() */

		barrier();

		rvt_qp_swqe_complete(qp, wqe, IB_WC_SUCCESS);

		rvt_qp_swqe_complete(qp,

				     wqe,

				     ib_hfi1_wc_opcode[wqe->wr.opcode],

				     IB_WC_SUCCESS);

	} else {

		struct hfi1_pportdata *ppd = ppd_from_ibp(ibp);

drivers/infiniband/hw/hfi1/ruc.c

+4 −1
Original line number Diff line number Diff line
@@ -920,7 +920,10 @@ void hfi1_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe, 
	    qp->ibqp.qp_type == IB_QPT_GSI)

		atomic_dec(&ibah_to_rvtah(wqe->ud_wr.ah)->refcount);



	rvt_qp_swqe_complete(qp, wqe, status);

	rvt_qp_swqe_complete(qp,

			     wqe,

			     ib_hfi1_wc_opcode[wqe->wr.opcode],

			     status);



	if (qp->s_acked == old_last)

		qp->s_acked = last;

drivers/infiniband/hw/hfi1/verbs.c

+16 −0
Original line number Diff line number Diff line
@@ -296,6 +296,22 @@ static inline bool wss_exceeds_threshold(void) 
	return atomic_read(&wss.total_count) >= wss.threshold;

}



/*

 * Translate ib_wr_opcode into ib_wc_opcode.

 */

const enum ib_wc_opcode ib_hfi1_wc_opcode[] = {

	[IB_WR_RDMA_WRITE] = IB_WC_RDMA_WRITE,

	[IB_WR_RDMA_WRITE_WITH_IMM] = IB_WC_RDMA_WRITE,

	[IB_WR_SEND] = IB_WC_SEND,

	[IB_WR_SEND_WITH_IMM] = IB_WC_SEND,

	[IB_WR_RDMA_READ] = IB_WC_RDMA_READ,

	[IB_WR_ATOMIC_CMP_AND_SWP] = IB_WC_COMP_SWAP,

	[IB_WR_ATOMIC_FETCH_AND_ADD] = IB_WC_FETCH_ADD,

	[IB_WR_SEND_WITH_INV] = IB_WC_SEND,

	[IB_WR_LOCAL_INV] = IB_WC_LOCAL_INV,

	[IB_WR_REG_MR] = IB_WC_REG_MR

};



/*

 * Length of header by opcode, 0 --> not supported

 */

drivers/infiniband/hw/qib/qib_rc.c

+8 −2
Original line number Diff line number Diff line
@@ -938,7 +938,10 @@ void qib_rc_send_complete(struct rvt_qp *qp, struct ib_header *hdr) 
		/* see post_send() */

		barrier();

		rvt_put_swqe(wqe);

		rvt_qp_swqe_complete(qp, wqe, IB_WC_SUCCESS);

		rvt_qp_swqe_complete(qp,

				     wqe,

				     ib_qib_wc_opcode[wqe->wr.opcode],

				     IB_WC_SUCCESS);

	}

	/*

	 * If we were waiting for sends to complete before resending,
@@ -983,7 +986,10 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
		qp->s_last = s_last;

		/* see post_send() */

		barrier();

		rvt_qp_swqe_complete(qp, wqe, IB_WC_SUCCESS);

		rvt_qp_swqe_complete(qp,

				     wqe,

				     ib_qib_wc_opcode[wqe->wr.opcode],

				     IB_WC_SUCCESS);

	} else

		this_cpu_inc(*ibp->rvp.rc_delayed_comp);

drivers/infiniband/hw/qib/qib_ruc.c

+4 −1
Original line number Diff line number Diff line
@@ -769,7 +769,10 @@ void qib_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe, 
	    qp->ibqp.qp_type == IB_QPT_GSI)

		atomic_dec(&ibah_to_rvtah(wqe->ud_wr.ah)->refcount);



	rvt_qp_swqe_complete(qp, wqe, status);

	rvt_qp_swqe_complete(qp,

			     wqe,

			     ib_qib_wc_opcode[wqe->wr.opcode],

			     status);



	if (qp->s_acked == old_last)

		qp->s_acked = last;

CRA Git | Maintained and supported by SUSTech CRA and CCSE