Commit db3ef0eb authored by Harish Chegondi's avatar Harish Chegondi Committed by Doug Ledford
Browse files

IB/qib: Use rdmavt version of post_send 



This patch removes the post_send and post_one_send from the qib driver.
The "posting" of sends will be done by rdmavt which will walk a WQE and
queue work. This patch will still provide the capability to schedule that
work as well as kick the progress. These are provided to the rdmavt layer.

Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarHarish Chegondi <harish.chegondi@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 4bb88e5f

drivers/infiniband/hw/qib/qib_driver.c

+4 −4
Original line number Diff line number Diff line
@@ -377,8 +377,8 @@ static u32 qib_rcv_hdrerr(struct qib_ctxtdata *rcd, struct qib_pportdata *ppd, 
			spin_lock(&qp->r_lock);



			/* Check for valid receive state. */

			if (!(ib_qib_state_ops[qp->state] &

			      QIB_PROCESS_RECV_OK)) {

			if (!(ib_rvt_state_ops[qp->state] &

			      RVT_PROCESS_RECV_OK)) {

				ibp->rvp.n_pkt_drops++;

				goto unlock;

			}
@@ -592,8 +592,8 @@ move_along: 


			qp->r_flags &= ~RVT_R_RSP_SEND;

			spin_lock_irqsave(&qp->s_lock, flags);

			if (ib_qib_state_ops[qp->state] &

					QIB_PROCESS_OR_FLUSH_SEND)

			if (ib_rvt_state_ops[qp->state] &

					RVT_PROCESS_OR_FLUSH_SEND)

				qib_schedule_send(qp);

			spin_unlock_irqrestore(&qp->s_lock, flags);

		}

drivers/infiniband/hw/qib/qib_qp.c

+6 −6
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ static void clear_mr_refs(struct rvt_qp *qp, int clr_sends) 


	if (clr_sends) {

		while (qp->s_last != qp->s_head) {

			struct rvt_swqe *wqe = get_swqe_ptr(qp, qp->s_last);

			struct rvt_swqe *wqe = rvt_get_swqe_ptr(qp, qp->s_last);

			unsigned i;



			for (i = 0; i < wqe->wr.num_sge; i++) {
@@ -521,7 +521,7 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
		  int attr_mask, struct ib_udata *udata)

{

	struct qib_ibdev *dev = to_idev(ibqp->device);

	struct rvt_qp *qp = to_iqp(ibqp);

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);

	struct qib_qp_priv *priv = qp->priv;

	enum ib_qp_state cur_state, new_state;

	struct ib_event ev;
@@ -809,7 +809,7 @@ bail: 
int qib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,

		 int attr_mask, struct ib_qp_init_attr *init_attr)

{

	struct rvt_qp *qp = to_iqp(ibqp);

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);



	attr->qp_state = qp->state;

	attr->cur_qp_state = attr->qp_state;
@@ -931,7 +931,7 @@ void *qp_priv_alloc(struct rvt_dev_info *rdi, struct rvt_qp *qp, gfp_t gfp) 
		return ERR_PTR(-ENOMEM);

	}

	init_waitqueue_head(&priv->wait_dma);

	INIT_WORK(&priv->s_work, qib_do_send);

	INIT_WORK(&priv->s_work, _qib_do_send);

	INIT_LIST_HEAD(&priv->iowait);



	return priv;
@@ -956,7 +956,7 @@ void qp_priv_free(struct rvt_dev_info *rdi, struct rvt_qp *qp) 
 */

int qib_destroy_qp(struct ib_qp *ibqp)

{

	struct rvt_qp *qp = to_iqp(ibqp);

	struct rvt_qp *qp = ibqp_to_rvtqp(ibqp);

	struct qib_ibdev *dev = to_idev(ibqp->device);

	struct qib_qp_priv *priv = qp->priv;
@@ -1095,7 +1095,7 @@ void qib_qp_iter_print(struct seq_file *s, struct qib_qp_iter *iter) 
	struct rvt_qp *qp = iter->qp;

	struct qib_qp_priv *priv = qp->priv;



	wqe = get_swqe_ptr(qp, qp->s_last);

	wqe = rvt_get_swqe_ptr(qp, qp->s_last);

	seq_printf(s,

		   "N %d QP%u %s %u %u %u f=%x %u %u %u %u %u PSN %x %x %x %x %x (%u %u %u %u %u %u) QP%u LID %x\n",

		   iter->n,

drivers/infiniband/hw/qib/qib_rc.c

+23 −23
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ static int qib_make_rc_ack(struct qib_ibdev *dev, struct rvt_qp *qp, 
	u32 bth2;



	/* Don't send an ACK if we aren't supposed to. */

	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))

		goto bail;



	/* header size in 32-bit words LRH+BTH = (8+12)/4. */
@@ -260,8 +260,8 @@ int qib_make_rc_req(struct rvt_qp *qp) 
	    qib_make_rc_ack(dev, qp, ohdr, pmtu))

		goto done;



	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_SEND_OK)) {

		if (!(ib_qib_state_ops[qp->state] & QIB_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_SEND_OK)) {

		if (!(ib_rvt_state_ops[qp->state] & RVT_FLUSH_SEND))

			goto bail;

		/* We are in the error state, flush the work request. */

		if (qp->s_last == qp->s_head)
@@ -271,7 +271,7 @@ int qib_make_rc_req(struct rvt_qp *qp) 
			qp->s_flags |= RVT_S_WAIT_DMA;

			goto bail;

		}

		wqe = get_swqe_ptr(qp, qp->s_last);

		wqe = rvt_get_swqe_ptr(qp, qp->s_last);

		qib_send_complete(qp, wqe, qp->s_last != qp->s_acked ?

			IB_WC_SUCCESS : IB_WC_WR_FLUSH_ERR);

		/* will get called again */
@@ -295,10 +295,10 @@ int qib_make_rc_req(struct rvt_qp *qp) 
	bth0 = 0;



	/* Send a request. */

	wqe = get_swqe_ptr(qp, qp->s_cur);

	wqe = rvt_get_swqe_ptr(qp, qp->s_cur);

	switch (qp->s_state) {

	default:

		if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_NEXT_SEND_OK))

		if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_NEXT_SEND_OK))

			goto bail;

		/*

		 * Resend an old request or start a new one.
@@ -666,7 +666,7 @@ void qib_send_rc_ack(struct rvt_qp *qp) 


	spin_lock_irqsave(&qp->s_lock, flags);



	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))

		goto unlock;



	/* Don't send ACK or NAK if a RDMA read or atomic is pending. */
@@ -759,7 +759,7 @@ void qib_send_rc_ack(struct rvt_qp *qp) 
	goto done;



queue_ack:

	if (ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK) {

	if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {

		this_cpu_inc(*ibp->rvp.rc_qacks);

		qp->s_flags |= RVT_S_ACK_PENDING | RVT_S_RESP_PENDING;

		qp->s_nak_state = qp->r_nak_state;
@@ -786,7 +786,7 @@ done: 
static void reset_psn(struct rvt_qp *qp, u32 psn)

{

	u32 n = qp->s_acked;

	struct rvt_swqe *wqe = get_swqe_ptr(qp, n);

	struct rvt_swqe *wqe = rvt_get_swqe_ptr(qp, n);

	u32 opcode;



	qp->s_cur = n;
@@ -809,7 +809,7 @@ static void reset_psn(struct rvt_qp *qp, u32 psn) 
			n = 0;

		if (n == qp->s_tail)

			break;

		wqe = get_swqe_ptr(qp, n);

		wqe = rvt_get_swqe_ptr(qp, n);

		diff = qib_cmp24(psn, wqe->psn);

		if (diff < 0)

			break;
@@ -870,7 +870,7 @@ done: 
 */

static void qib_restart_rc(struct rvt_qp *qp, u32 psn, int wait)

{

	struct rvt_swqe *wqe = get_swqe_ptr(qp, qp->s_acked);

	struct rvt_swqe *wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	struct qib_ibport *ibp;



	if (qp->s_retry == 0) {
@@ -951,7 +951,7 @@ static void reset_sending_psn(struct rvt_qp *qp, u32 psn) 


	/* Find the work request corresponding to the given PSN. */

	for (;;) {

		wqe = get_swqe_ptr(qp, n);

		wqe = rvt_get_swqe_ptr(qp, n);

		if (qib_cmp24(psn, wqe->lpsn) <= 0) {

			if (wqe->wr.opcode == IB_WR_RDMA_READ)

				qp->s_sending_psn = wqe->lpsn + 1;
@@ -978,7 +978,7 @@ void qib_rc_send_complete(struct rvt_qp *qp, struct qib_ib_header *hdr) 
	u32 opcode;

	u32 psn;



	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_OR_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_OR_FLUSH_SEND))

		return;



	/* Find out where the BTH is */
@@ -1004,11 +1004,11 @@ void qib_rc_send_complete(struct rvt_qp *qp, struct qib_ib_header *hdr) 
	 */

	if ((psn & IB_BTH_REQ_ACK) && qp->s_acked != qp->s_tail &&

	    !(qp->s_flags & (RVT_S_TIMER | RVT_S_WAIT_RNR | RVT_S_WAIT_PSN)) &&

	    (ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))

	    (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))

		start_timer(qp);



	while (qp->s_last != qp->s_acked) {

		wqe = get_swqe_ptr(qp, qp->s_last);

		wqe = rvt_get_swqe_ptr(qp, qp->s_last);

		if (qib_cmp24(wqe->lpsn, qp->s_sending_psn) >= 0 &&

		    qib_cmp24(qp->s_sending_psn, qp->s_sending_hpsn) <= 0)

			break;
@@ -1101,7 +1101,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
		if (++qp->s_cur >= qp->s_size)

			qp->s_cur = 0;

		qp->s_acked = qp->s_cur;

		wqe = get_swqe_ptr(qp, qp->s_cur);

		wqe = rvt_get_swqe_ptr(qp, qp->s_cur);

		if (qp->s_acked != qp->s_tail) {

			qp->s_state = OP(SEND_LAST);

			qp->s_psn = wqe->psn;
@@ -1111,7 +1111,7 @@ static struct rvt_swqe *do_rc_completion(struct rvt_qp *qp, 
			qp->s_acked = 0;

		if (qp->state == IB_QPS_SQD && qp->s_acked == qp->s_cur)

			qp->s_draining = 0;

		wqe = get_swqe_ptr(qp, qp->s_acked);

		wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	}

	return wqe;

}
@@ -1152,7 +1152,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
	ack_psn = psn;

	if (aeth >> 29)

		ack_psn--;

	wqe = get_swqe_ptr(qp, qp->s_acked);

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	ibp = to_iport(qp->ibqp.device, qp->port_num);



	/*
@@ -1361,7 +1361,7 @@ static void rdma_seq_err(struct rvt_qp *qp, struct qib_ibport *ibp, u32 psn, 
		del_timer(&qp->s_timer);

	}



	wqe = get_swqe_ptr(qp, qp->s_acked);

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);



	while (qib_cmp24(psn, wqe->lpsn) > 0) {

		if (wqe->wr.opcode == IB_WR_RDMA_READ ||
@@ -1438,7 +1438,7 @@ static void qib_rc_rcv_resp(struct qib_ibport *ibp, 
	}



	spin_lock_irqsave(&qp->s_lock, flags);

	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK))

		goto ack_done;



	/* Ignore invalid responses. */
@@ -1469,7 +1469,7 @@ static void qib_rc_rcv_resp(struct qib_ibport *ibp, 


	if (unlikely(qp->s_acked == qp->s_tail))

		goto ack_done;

	wqe = get_swqe_ptr(qp, qp->s_acked);

	wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

	status = IB_WC_SUCCESS;



	switch (opcode) {
@@ -1488,7 +1488,7 @@ static void qib_rc_rcv_resp(struct qib_ibport *ibp, 
		    opcode != OP(RDMA_READ_RESPONSE_FIRST))

			goto ack_done;

		hdrsize += 4;

		wqe = get_swqe_ptr(qp, qp->s_acked);

		wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

		if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))

			goto ack_op_err;

		/*
@@ -1554,7 +1554,7 @@ read_middle: 
		 * have to be careful to copy the data to the right

		 * location.

		 */

		wqe = get_swqe_ptr(qp, qp->s_acked);

		wqe = rvt_get_swqe_ptr(qp, qp->s_acked);

		qp->s_rdma_read_len = restart_sge(&qp->s_rdma_read_sge,

						  wqe, psn, pmtu);

		goto read_last;

drivers/infiniband/hw/qib/qib_ruc.c

+20 −13
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ int qib_get_rwqe(struct rvt_qp *qp, int wr_id_only) 
	}



	spin_lock_irqsave(&rq->lock, flags);

	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK)) {

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK)) {

		ret = 0;

		goto unlock;

	}
@@ -379,7 +379,7 @@ static void qib_ruc_loopback(struct rvt_qp *sqp) 


	/* Return if we are already busy processing a work request. */

	if ((sqp->s_flags & (RVT_S_BUSY | RVT_S_ANY_WAIT)) ||

	    !(ib_qib_state_ops[sqp->state] & QIB_PROCESS_OR_FLUSH_SEND))

	    !(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_OR_FLUSH_SEND))

		goto unlock;



	sqp->s_flags |= RVT_S_BUSY;
@@ -387,11 +387,11 @@ static void qib_ruc_loopback(struct rvt_qp *sqp) 
again:

	if (sqp->s_last == sqp->s_head)

		goto clr_busy;

	wqe = get_swqe_ptr(sqp, sqp->s_last);

	wqe = rvt_get_swqe_ptr(sqp, sqp->s_last);



	/* Return if it is not OK to start a new work reqeust. */

	if (!(ib_qib_state_ops[sqp->state] & QIB_PROCESS_NEXT_SEND_OK)) {

		if (!(ib_qib_state_ops[sqp->state] & QIB_FLUSH_SEND))

	if (!(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_NEXT_SEND_OK)) {

		if (!(ib_rvt_state_ops[sqp->state] & RVT_FLUSH_SEND))

			goto clr_busy;

		/* We are in the error state, flush the work request. */

		send_status = IB_WC_WR_FLUSH_ERR;
@@ -409,7 +409,7 @@ again: 
	}

	spin_unlock_irqrestore(&sqp->s_lock, flags);



	if (!qp || !(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK) ||

	if (!qp || !(ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) ||

	    qp->ibqp.qp_type != sqp->ibqp.qp_type) {

		ibp->rvp.n_pkt_drops++;

		/*
@@ -590,7 +590,7 @@ rnr_nak: 
	if (sqp->s_rnr_retry_cnt < 7)

		sqp->s_rnr_retry--;

	spin_lock_irqsave(&sqp->s_lock, flags);

	if (!(ib_qib_state_ops[sqp->state] & QIB_PROCESS_RECV_OK))

	if (!(ib_rvt_state_ops[sqp->state] & RVT_PROCESS_RECV_OK))

		goto clr_busy;

	sqp->s_flags |= RVT_S_WAIT_RNR;

	sqp->s_timer.function = qib_rc_rnr_retry;
@@ -711,19 +711,26 @@ void qib_make_ruc_header(struct rvt_qp *qp, struct qib_other_headers *ohdr, 
	this_cpu_inc(ibp->pmastats->n_unicast_xmit);

}



void _qib_do_send(struct work_struct *work)

{

	struct qib_qp_priv *priv = container_of(work, struct qib_qp_priv,

						s_work);

	struct rvt_qp *qp = priv->owner;



	qib_do_send(qp);

}



/**

 * qib_do_send - perform a send on a QP

 * @work: contains a pointer to the QP

 * @qp: pointer to the QP

 *

 * Process entries in the send work queue until credit or queue is

 * exhausted.  Only allow one CPU to send a packet per QP (tasklet).

 * Otherwise, two threads could send packets out of order.

 */

void qib_do_send(struct work_struct *work)

void qib_do_send(struct rvt_qp *qp)

{

	struct qib_qp_priv *priv = container_of(work, struct qib_qp_priv,

						s_work);

	struct rvt_qp *qp = priv->owner;

	struct qib_qp_priv *priv = qp->priv;

	struct qib_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num);

	struct qib_pportdata *ppd = ppd_from_ibp(ibp);

	int (*make_req)(struct rvt_qp *qp);
@@ -780,7 +787,7 @@ void qib_send_complete(struct rvt_qp *qp, struct rvt_swqe *wqe, 
	u32 old_last, last;

	unsigned i;



	if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_OR_FLUSH_SEND))

	if (!(ib_rvt_state_ops[qp->state] & RVT_PROCESS_OR_FLUSH_SEND))

		return;



	for (i = 0; i < wqe->wr.num_sge; i++) {

drivers/infiniband/hw/qib/qib_sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -672,7 +672,7 @@ unmap: 
	spin_lock(&qp->s_lock);

	if (qp->ibqp.qp_type == IB_QPT_RC) {

		/* XXX what about error sending RDMA read responses? */

		if (ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK)

		if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK)

			qib_error_qp(qp, IB_WC_GENERAL_ERR);

	} else if (qp->s_wqe)

		qib_send_complete(qp, qp->s_wqe, IB_WC_GENERAL_ERR);
@@ -685,7 +685,7 @@ busy: 
	qp = tx->qp;

	priv = qp->priv;

	spin_lock(&qp->s_lock);

	if (ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK) {

	if (ib_rvt_state_ops[qp->state] & RVT_PROCESS_RECV_OK) {

		struct qib_ibdev *dev;



		/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE