IB/ipath: Fix RC and UC error handling (53dc1ca1) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/infiniband/hw/ipath/ipath_qp.c

+8 −46

Original line number	Original line	Diff line number	Diff line
	@@ -374,13 +374,14 @@ static void ipath_reset_qp(struct ipath_qp *qp, enum ib_qp_type type)
	}		}

	/**		/**
	* ipath_error_qp - put a QP into an error state		* ipath_error_qp - put a QP into the error state
	* @qp: the QP to put into an error state		* @qp: the QP to put into the error state
	* @err: the receive completion error to signal if a RWQE is active		* @err: the receive completion error to signal if a RWQE is active
	*		*
	* Flushes both send and receive work queues.		* Flushes both send and receive work queues.
	* Returns true if last WQE event should be generated.		* Returns true if last WQE event should be generated.
	* The QP s_lock should be held and interrupts disabled.		* The QP s_lock should be held and interrupts disabled.
			* If we are already in error state, just return.
	*/		*/

	int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)		int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
	@@ -389,8 +390,10 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
	struct ib_wc wc;		struct ib_wc wc;
	int ret = 0;		int ret = 0;

	ipath_dbg("QP%d/%d in error state (%d)\n",		if (qp->state == IB_QPS_ERR)
	qp->ibqp.qp_num, qp->remote_qpn, err);		goto bail;

			qp->state = IB_QPS_ERR;

	spin_lock(&dev->pending_lock);		spin_lock(&dev->pending_lock);
	if (!list_empty(&qp->timerwait))		if (!list_empty(&qp->timerwait))
	@@ -460,6 +463,7 @@ int ipath_error_qp(struct ipath_qp *qp, enum ib_wc_status err)
	} else if (qp->ibqp.event_handler)		} else if (qp->ibqp.event_handler)
	ret = 1;		ret = 1;

			bail:
	return ret;		return ret;
	}		}

	@@ -1025,48 +1029,6 @@ int ipath_init_qp_table(struct ipath_ibdev *idev, int size)
	return ret;		return ret;
	}		}

	/**
	* ipath_sqerror_qp - put a QP's send queue into an error state
	* @qp: QP who's send queue will be put into an error state
	* @wc: the WC responsible for putting the QP in this state
	*
	* Flushes the send work queue.
	* The QP s_lock should be held and interrupts disabled.
	*/

	void ipath_sqerror_qp(struct ipath_qp qp, struct ib_wc wc)
	{
	struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
	struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);

	ipath_dbg("Send queue error on QP%d/%d: err: %d\n",
	qp->ibqp.qp_num, qp->remote_qpn, wc->status);

	spin_lock(&dev->pending_lock);
	if (!list_empty(&qp->timerwait))
	list_del_init(&qp->timerwait);
	if (!list_empty(&qp->piowait))
	list_del_init(&qp->piowait);
	spin_unlock(&dev->pending_lock);

	ipath_cq_enter(to_icq(qp->ibqp.send_cq), wc, 1);
	if (++qp->s_last >= qp->s_size)
	qp->s_last = 0;

	wc->status = IB_WC_WR_FLUSH_ERR;

	while (qp->s_last != qp->s_head) {
	wqe = get_swqe_ptr(qp, qp->s_last);
	wc->wr_id = wqe->wr.wr_id;
	wc->opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
	ipath_cq_enter(to_icq(qp->ibqp.send_cq), wc, 1);
	if (++qp->s_last >= qp->s_size)
	qp->s_last = 0;
	}
	qp->s_cur = qp->s_tail = qp->s_head;
	qp->state = IB_QPS_SQE;
	}

	/**		/**
	* ipath_get_credit - flush the send work queue of a QP		* ipath_get_credit - flush the send work queue of a QP
	* @qp: the qp who's send work queue to flush		* @qp: the qp who's send work queue to flush

drivers/infiniband/hw/ipath/ipath_rc.c

+41 −86

Original line number	Original line	Diff line number	Diff line
	@@ -771,27 +771,14 @@ static void reset_psn(struct ipath_qp *qp, u32 psn)
	*		*
	* The QP s_lock should be held and interrupts disabled.		* The QP s_lock should be held and interrupts disabled.
	*/		*/
	void ipath_restart_rc(struct ipath_qp qp, u32 psn, struct ib_wc wc)		void ipath_restart_rc(struct ipath_qp *qp, u32 psn)
	{		{
	struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);		struct ipath_swqe *wqe = get_swqe_ptr(qp, qp->s_last);
	struct ipath_ibdev *dev;		struct ipath_ibdev *dev;

	if (qp->s_retry == 0) {		if (qp->s_retry == 0) {
	wc->wr_id = wqe->wr.wr_id;		ipath_send_complete(qp, wqe, IB_WC_RETRY_EXC_ERR);
	wc->status = IB_WC_RETRY_EXC_ERR;		ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
	wc->opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
	wc->vendor_err = 0;
	wc->byte_len = 0;
	wc->qp = &qp->ibqp;
	wc->imm_data = 0;
	wc->src_qp = qp->remote_qpn;
	wc->wc_flags = 0;
	wc->pkey_index = 0;
	wc->slid = qp->remote_ah_attr.dlid;
	wc->sl = qp->remote_ah_attr.sl;
	wc->dlid_path_bits = 0;
	wc->port_num = 0;
	ipath_sqerror_qp(qp, wc);
	goto bail;		goto bail;
	}		}
	qp->s_retry--;		qp->s_retry--;
	@@ -804,6 +791,8 @@ void ipath_restart_rc(struct ipath_qp qp, u32 psn, struct ib_wc wc)
	spin_lock(&dev->pending_lock);		spin_lock(&dev->pending_lock);
	if (!list_empty(&qp->timerwait))		if (!list_empty(&qp->timerwait))
	list_del_init(&qp->timerwait);		list_del_init(&qp->timerwait);
			if (!list_empty(&qp->piowait))
			list_del_init(&qp->piowait);
	spin_unlock(&dev->pending_lock);		spin_unlock(&dev->pending_lock);

	if (wqe->wr.opcode == IB_WR_RDMA_READ)		if (wqe->wr.opcode == IB_WR_RDMA_READ)
	@@ -845,6 +834,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
	{		{
	struct ipath_ibdev *dev = to_idev(qp->ibqp.device);		struct ipath_ibdev *dev = to_idev(qp->ibqp.device);
	struct ib_wc wc;		struct ib_wc wc;
			enum ib_wc_status status;
	struct ipath_swqe *wqe;		struct ipath_swqe *wqe;
	int ret = 0;		int ret = 0;
	u32 ack_psn;		u32 ack_psn;
	@@ -909,7 +899,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
	*/		*/
	update_last_psn(qp, wqe->psn - 1);		update_last_psn(qp, wqe->psn - 1);
	/* Retry this request. */		/* Retry this request. */
	ipath_restart_rc(qp, wqe->psn, &wc);		ipath_restart_rc(qp, wqe->psn);
	/*		/*
	* No need to process the ACK/NAK since we are		* No need to process the ACK/NAK since we are
	* restarting an earlier request.		* restarting an earlier request.
	@@ -937,20 +927,15 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
	/* Post a send completion queue entry if requested. */		/* Post a send completion queue entry if requested. */
	if (!(qp->s_flags & IPATH_S_SIGNAL_REQ_WR) \|\|		if (!(qp->s_flags & IPATH_S_SIGNAL_REQ_WR) \|\|
	(wqe->wr.send_flags & IB_SEND_SIGNALED)) {		(wqe->wr.send_flags & IB_SEND_SIGNALED)) {
			memset(&wc, 0, sizeof wc);
	wc.wr_id = wqe->wr.wr_id;		wc.wr_id = wqe->wr.wr_id;
	wc.status = IB_WC_SUCCESS;		wc.status = IB_WC_SUCCESS;
	wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];		wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
	wc.vendor_err = 0;
	wc.byte_len = wqe->length;		wc.byte_len = wqe->length;
	wc.imm_data = 0;
	wc.qp = &qp->ibqp;		wc.qp = &qp->ibqp;
	wc.src_qp = qp->remote_qpn;		wc.src_qp = qp->remote_qpn;
	wc.wc_flags = 0;
	wc.pkey_index = 0;
	wc.slid = qp->remote_ah_attr.dlid;		wc.slid = qp->remote_ah_attr.dlid;
	wc.sl = qp->remote_ah_attr.sl;		wc.sl = qp->remote_ah_attr.sl;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 0);		ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 0);
	}		}
	qp->s_retry = qp->s_retry_cnt;		qp->s_retry = qp->s_retry_cnt;
	@@ -1012,7 +997,7 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
	if (qp->s_last == qp->s_tail)		if (qp->s_last == qp->s_tail)
	goto bail;		goto bail;
	if (qp->s_rnr_retry == 0) {		if (qp->s_rnr_retry == 0) {
	wc.status = IB_WC_RNR_RETRY_EXC_ERR;		status = IB_WC_RNR_RETRY_EXC_ERR;
	goto class_b;		goto class_b;
	}		}
	if (qp->s_rnr_retry_cnt < 7)		if (qp->s_rnr_retry_cnt < 7)
	@@ -1050,37 +1035,25 @@ static int do_rc_ack(struct ipath_qp *qp, u32 aeth, u32 psn, int opcode,
	* RDMA READ response which terminates the RDMA		* RDMA READ response which terminates the RDMA
	* READ.		* READ.
	*/		*/
	ipath_restart_rc(qp, psn, &wc);		ipath_restart_rc(qp, psn);
	break;		break;

	case 1: /* Invalid Request */		case 1: /* Invalid Request */
	wc.status = IB_WC_REM_INV_REQ_ERR;		status = IB_WC_REM_INV_REQ_ERR;
	dev->n_other_naks++;		dev->n_other_naks++;
	goto class_b;		goto class_b;

	case 2: /* Remote Access Error */		case 2: /* Remote Access Error */
	wc.status = IB_WC_REM_ACCESS_ERR;		status = IB_WC_REM_ACCESS_ERR;
	dev->n_other_naks++;		dev->n_other_naks++;
	goto class_b;		goto class_b;

	case 3: /* Remote Operation Error */		case 3: /* Remote Operation Error */
	wc.status = IB_WC_REM_OP_ERR;		status = IB_WC_REM_OP_ERR;
	dev->n_other_naks++;		dev->n_other_naks++;
	class_b:		class_b:
	wc.wr_id = wqe->wr.wr_id;		ipath_send_complete(qp, wqe, status);
	wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];		ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
	wc.vendor_err = 0;
	wc.byte_len = 0;
	wc.qp = &qp->ibqp;
	wc.imm_data = 0;
	wc.src_qp = qp->remote_qpn;
	wc.wc_flags = 0;
	wc.pkey_index = 0;
	wc.slid = qp->remote_ah_attr.dlid;
	wc.sl = qp->remote_ah_attr.sl;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	ipath_sqerror_qp(qp, &wc);
	break;		break;

	default:		default:
	@@ -1126,8 +1099,8 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
	int header_in_data)		int header_in_data)
	{		{
	struct ipath_swqe *wqe;		struct ipath_swqe *wqe;
			enum ib_wc_status status;
	unsigned long flags;		unsigned long flags;
	struct ib_wc wc;
	int diff;		int diff;
	u32 pad;		u32 pad;
	u32 aeth;		u32 aeth;
	@@ -1159,6 +1132,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
	if (unlikely(qp->s_last == qp->s_tail))		if (unlikely(qp->s_last == qp->s_tail))
	goto ack_done;		goto ack_done;
	wqe = get_swqe_ptr(qp, qp->s_last);		wqe = get_swqe_ptr(qp, qp->s_last);
			status = IB_WC_SUCCESS;

	switch (opcode) {		switch (opcode) {
	case OP(ACKNOWLEDGE):		case OP(ACKNOWLEDGE):
	@@ -1200,7 +1174,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
	/* no AETH, no ACK */		/* no AETH, no ACK */
	if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {		if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {
	dev->n_rdma_seq++;		dev->n_rdma_seq++;
	ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);		ipath_restart_rc(qp, qp->s_last_psn + 1);
	goto ack_done;		goto ack_done;
	}		}
	if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))		if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))
	@@ -1261,7 +1235,7 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
	/* ACKs READ req. */		/* ACKs READ req. */
	if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {		if (unlikely(ipath_cmp24(psn, qp->s_last_psn + 1))) {
	dev->n_rdma_seq++;		dev->n_rdma_seq++;
	ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);		ipath_restart_rc(qp, qp->s_last_psn + 1);
	goto ack_done;		goto ack_done;
	}		}
	if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))		if (unlikely(wqe->wr.opcode != IB_WR_RDMA_READ))
	@@ -1291,31 +1265,16 @@ static inline void ipath_rc_rcv_resp(struct ipath_ibdev *dev,
	goto ack_done;		goto ack_done;
	}		}

	ack_done:
	spin_unlock_irqrestore(&qp->s_lock, flags);
	goto bail;

	ack_op_err:		ack_op_err:
	wc.status = IB_WC_LOC_QP_OP_ERR;		status = IB_WC_LOC_QP_OP_ERR;
	goto ack_err;		goto ack_err;

	ack_len_err:		ack_len_err:
	wc.status = IB_WC_LOC_LEN_ERR;		status = IB_WC_LOC_LEN_ERR;
	ack_err:		ack_err:
	wc.wr_id = wqe->wr.wr_id;		ipath_send_complete(qp, wqe, status);
	wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];		ipath_error_qp(qp, IB_WC_WR_FLUSH_ERR);
	wc.vendor_err = 0;		ack_done:
	wc.byte_len = 0;
	wc.imm_data = 0;
	wc.qp = &qp->ibqp;
	wc.src_qp = qp->remote_qpn;
	wc.wc_flags = 0;
	wc.pkey_index = 0;
	wc.slid = qp->remote_ah_attr.dlid;
	wc.sl = qp->remote_ah_attr.sl;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	ipath_sqerror_qp(qp, &wc);
	spin_unlock_irqrestore(&qp->s_lock, flags);		spin_unlock_irqrestore(&qp->s_lock, flags);
	bail:		bail:
	return;		return;
	@@ -1523,13 +1482,12 @@ static inline int ipath_rc_rcv_error(struct ipath_ibdev *dev,
	return 0;		return 0;
	}		}

	static void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err)		void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err)
	{		{
	unsigned long flags;		unsigned long flags;
	int lastwqe;		int lastwqe;

	spin_lock_irqsave(&qp->s_lock, flags);		spin_lock_irqsave(&qp->s_lock, flags);
	qp->state = IB_QPS_ERR;
	lastwqe = ipath_error_qp(qp, err);		lastwqe = ipath_error_qp(qp, err);
	spin_unlock_irqrestore(&qp->s_lock, flags);		spin_unlock_irqrestore(&qp->s_lock, flags);

	@@ -1643,11 +1601,7 @@ void ipath_rc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,
	opcode == OP(SEND_LAST) \|\|		opcode == OP(SEND_LAST) \|\|
	opcode == OP(SEND_LAST_WITH_IMMEDIATE))		opcode == OP(SEND_LAST_WITH_IMMEDIATE))
	break;		break;
	nack_inv:		goto nack_inv;
	ipath_rc_error(qp, IB_WC_REM_INV_REQ_ERR);
	qp->r_nak_state = IB_NAK_INVALID_REQUEST;
	qp->r_ack_psn = qp->r_psn;
	goto send_ack;

	case OP(RDMA_WRITE_FIRST):		case OP(RDMA_WRITE_FIRST):
	case OP(RDMA_WRITE_MIDDLE):		case OP(RDMA_WRITE_MIDDLE):
	@@ -1673,18 +1627,13 @@ void ipath_rc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,
	break;		break;
	}		}

	wc.imm_data = 0;		memset(&wc, 0, sizeof wc);
	wc.wc_flags = 0;

	/* OK, process the packet. */		/* OK, process the packet. */
	switch (opcode) {		switch (opcode) {
	case OP(SEND_FIRST):		case OP(SEND_FIRST):
	if (!ipath_get_rwqe(qp, 0)) {		if (!ipath_get_rwqe(qp, 0))
	rnr_nak:		goto rnr_nak;
	qp->r_nak_state = IB_RNR_NAK \| qp->r_min_rnr_timer;
	qp->r_ack_psn = qp->r_psn;
	goto send_ack;
	}
	qp->r_rcv_len = 0;		qp->r_rcv_len = 0;
	/* FALLTHROUGH */		/* FALLTHROUGH */
	case OP(SEND_MIDDLE):		case OP(SEND_MIDDLE):
	@@ -1751,14 +1700,10 @@ void ipath_rc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,
	wc.opcode = IB_WC_RECV_RDMA_WITH_IMM;		wc.opcode = IB_WC_RECV_RDMA_WITH_IMM;
	else		else
	wc.opcode = IB_WC_RECV;		wc.opcode = IB_WC_RECV;
	wc.vendor_err = 0;
	wc.qp = &qp->ibqp;		wc.qp = &qp->ibqp;
	wc.src_qp = qp->remote_qpn;		wc.src_qp = qp->remote_qpn;
	wc.pkey_index = 0;
	wc.slid = qp->remote_ah_attr.dlid;		wc.slid = qp->remote_ah_attr.dlid;
	wc.sl = qp->remote_ah_attr.sl;		wc.sl = qp->remote_ah_attr.sl;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	/* Signal completion event if the solicited bit is set. */		/* Signal completion event if the solicited bit is set. */
	ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,		ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
	(ohdr->bth[0] &		(ohdr->bth[0] &
	@@ -1951,11 +1896,21 @@ void ipath_rc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,
	goto send_ack;		goto send_ack;
	goto done;		goto done;

			rnr_nak:
			qp->r_nak_state = IB_RNR_NAK \| qp->r_min_rnr_timer;
			qp->r_ack_psn = qp->r_psn;
			goto send_ack;

			nack_inv:
			ipath_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
			qp->r_nak_state = IB_NAK_INVALID_REQUEST;
			qp->r_ack_psn = qp->r_psn;
			goto send_ack;

	nack_acc:		nack_acc:
	ipath_rc_error(qp, IB_WC_REM_ACCESS_ERR);		ipath_rc_error(qp, IB_WC_LOC_PROT_ERR);
	qp->r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR;		qp->r_nak_state = IB_NAK_REMOTE_ACCESS_ERROR;
	qp->r_ack_psn = qp->r_psn;		qp->r_ack_psn = qp->r_psn;

	send_ack:		send_ack:
	send_rc_ack(qp);		send_rc_ack(qp);

drivers/infiniband/hw/ipath/ipath_ruc.c

+79 −86

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2006, 2007 QLogic Corporation. All rights reserved.		* Copyright (c) 2006, 2007, 2008 QLogic Corporation. All rights reserved.
	* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.		* Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
	*		*
	* This software is available to you under a choice of one of two		* This software is available to you under a choice of one of two
	@@ -140,20 +140,11 @@ int ipath_init_sge(struct ipath_qp qp, struct ipath_rwqe wqe,
	goto bail;		goto bail;

	bad_lkey:		bad_lkey:
			memset(&wc, 0, sizeof(wc));
	wc.wr_id = wqe->wr_id;		wc.wr_id = wqe->wr_id;
	wc.status = IB_WC_LOC_PROT_ERR;		wc.status = IB_WC_LOC_PROT_ERR;
	wc.opcode = IB_WC_RECV;		wc.opcode = IB_WC_RECV;
	wc.vendor_err = 0;
	wc.byte_len = 0;
	wc.imm_data = 0;
	wc.qp = &qp->ibqp;		wc.qp = &qp->ibqp;
	wc.src_qp = 0;
	wc.wc_flags = 0;
	wc.pkey_index = 0;
	wc.slid = 0;
	wc.sl = 0;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	/* Signal solicited completion event. */		/* Signal solicited completion event. */
	ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1);		ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc, 1);
	ret = 0;		ret = 0;
	@@ -270,6 +261,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
	struct ib_wc wc;		struct ib_wc wc;
	u64 sdata;		u64 sdata;
	atomic64_t *maddr;		atomic64_t *maddr;
			enum ib_wc_status send_status;

	qp = ipath_lookup_qpn(&dev->qp_table, sqp->remote_qpn);		qp = ipath_lookup_qpn(&dev->qp_table, sqp->remote_qpn);
	if (!qp) {		if (!qp) {
	@@ -300,8 +292,8 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
	wqe = get_swqe_ptr(sqp, sqp->s_last);		wqe = get_swqe_ptr(sqp, sqp->s_last);
	spin_unlock_irqrestore(&sqp->s_lock, flags);		spin_unlock_irqrestore(&sqp->s_lock, flags);

	wc.wc_flags = 0;		memset(&wc, 0, sizeof wc);
	wc.imm_data = 0;		send_status = IB_WC_SUCCESS;

	sqp->s_sge.sge = wqe->sg_list[0];		sqp->s_sge.sge = wqe->sg_list[0];
	sqp->s_sge.sg_list = wqe->sg_list + 1;		sqp->s_sge.sg_list = wqe->sg_list + 1;
	@@ -313,75 +305,33 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
	wc.imm_data = wqe->wr.ex.imm_data;		wc.imm_data = wqe->wr.ex.imm_data;
	/* FALLTHROUGH */		/* FALLTHROUGH */
	case IB_WR_SEND:		case IB_WR_SEND:
	if (!ipath_get_rwqe(qp, 0)) {		if (!ipath_get_rwqe(qp, 0))
	rnr_nak:		goto rnr_nak;
	/* Handle RNR NAK */
	if (qp->ibqp.qp_type == IB_QPT_UC)
	goto send_comp;
	if (sqp->s_rnr_retry == 0) {
	wc.status = IB_WC_RNR_RETRY_EXC_ERR;
	goto err;
	}
	if (sqp->s_rnr_retry_cnt < 7)
	sqp->s_rnr_retry--;
	dev->n_rnr_naks++;
	sqp->s_rnr_timeout =
	ib_ipath_rnr_table[qp->r_min_rnr_timer];
	ipath_insert_rnr_queue(sqp);
	goto done;
	}
	break;		break;

	case IB_WR_RDMA_WRITE_WITH_IMM:		case IB_WR_RDMA_WRITE_WITH_IMM:
	if (unlikely(!(qp->qp_access_flags &		if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_WRITE)))
	IB_ACCESS_REMOTE_WRITE))) {		goto inv_err;
	wc.status = IB_WC_REM_INV_REQ_ERR;
	goto err;
	}
	wc.wc_flags = IB_WC_WITH_IMM;		wc.wc_flags = IB_WC_WITH_IMM;
	wc.imm_data = wqe->wr.ex.imm_data;		wc.imm_data = wqe->wr.ex.imm_data;
	if (!ipath_get_rwqe(qp, 1))		if (!ipath_get_rwqe(qp, 1))
	goto rnr_nak;		goto rnr_nak;
	/* FALLTHROUGH */		/* FALLTHROUGH */
	case IB_WR_RDMA_WRITE:		case IB_WR_RDMA_WRITE:
	if (unlikely(!(qp->qp_access_flags &		if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_WRITE)))
	IB_ACCESS_REMOTE_WRITE))) {		goto inv_err;
	wc.status = IB_WC_REM_INV_REQ_ERR;
	goto err;
	}
	if (wqe->length == 0)		if (wqe->length == 0)
	break;		break;
	if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge, wqe->length,		if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge, wqe->length,
	wqe->wr.wr.rdma.remote_addr,		wqe->wr.wr.rdma.remote_addr,
	wqe->wr.wr.rdma.rkey,		wqe->wr.wr.rdma.rkey,
	IB_ACCESS_REMOTE_WRITE))) {		IB_ACCESS_REMOTE_WRITE)))
	acc_err:		goto acc_err;
	wc.status = IB_WC_REM_ACCESS_ERR;
	err:
	wc.wr_id = wqe->wr.wr_id;
	wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
	wc.vendor_err = 0;
	wc.byte_len = 0;
	wc.qp = &sqp->ibqp;
	wc.src_qp = sqp->remote_qpn;
	wc.pkey_index = 0;
	wc.slid = sqp->remote_ah_attr.dlid;
	wc.sl = sqp->remote_ah_attr.sl;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	spin_lock_irqsave(&sqp->s_lock, flags);
	ipath_sqerror_qp(sqp, &wc);
	spin_unlock_irqrestore(&sqp->s_lock, flags);
	goto done;
	}
	break;		break;

	case IB_WR_RDMA_READ:		case IB_WR_RDMA_READ:
	if (unlikely(!(qp->qp_access_flags &		if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_READ)))
	IB_ACCESS_REMOTE_READ))) {		goto inv_err;
	wc.status = IB_WC_REM_INV_REQ_ERR;
	goto err;
	}
	if (unlikely(!ipath_rkey_ok(qp, &sqp->s_sge, wqe->length,		if (unlikely(!ipath_rkey_ok(qp, &sqp->s_sge, wqe->length,
	wqe->wr.wr.rdma.remote_addr,		wqe->wr.wr.rdma.remote_addr,
	wqe->wr.wr.rdma.rkey,		wqe->wr.wr.rdma.rkey,
	@@ -394,11 +344,8 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)

	case IB_WR_ATOMIC_CMP_AND_SWP:		case IB_WR_ATOMIC_CMP_AND_SWP:
	case IB_WR_ATOMIC_FETCH_AND_ADD:		case IB_WR_ATOMIC_FETCH_AND_ADD:
	if (unlikely(!(qp->qp_access_flags &		if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC)))
	IB_ACCESS_REMOTE_ATOMIC))) {		goto inv_err;
	wc.status = IB_WC_REM_INV_REQ_ERR;
	goto err;
	}
	if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge, sizeof(u64),		if (unlikely(!ipath_rkey_ok(qp, &qp->r_sge, sizeof(u64),
	wqe->wr.wr.atomic.remote_addr,		wqe->wr.wr.atomic.remote_addr,
	wqe->wr.wr.atomic.rkey,		wqe->wr.wr.atomic.rkey,
	@@ -415,7 +362,8 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
	goto send_comp;		goto send_comp;

	default:		default:
	goto done;		send_status = IB_WC_LOC_QP_OP_ERR;
			goto serr;
	}		}

	sge = &sqp->s_sge.sge;		sge = &sqp->s_sge.sge;
	@@ -458,14 +406,11 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
	wc.opcode = IB_WC_RECV;		wc.opcode = IB_WC_RECV;
	wc.wr_id = qp->r_wr_id;		wc.wr_id = qp->r_wr_id;
	wc.status = IB_WC_SUCCESS;		wc.status = IB_WC_SUCCESS;
	wc.vendor_err = 0;
	wc.byte_len = wqe->length;		wc.byte_len = wqe->length;
	wc.qp = &qp->ibqp;		wc.qp = &qp->ibqp;
	wc.src_qp = qp->remote_qpn;		wc.src_qp = qp->remote_qpn;
	wc.pkey_index = 0;
	wc.slid = qp->remote_ah_attr.dlid;		wc.slid = qp->remote_ah_attr.dlid;
	wc.sl = qp->remote_ah_attr.sl;		wc.sl = qp->remote_ah_attr.sl;
	wc.dlid_path_bits = 0;
	wc.port_num = 1;		wc.port_num = 1;
	/* Signal completion event if the solicited bit is set. */		/* Signal completion event if the solicited bit is set. */
	ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,		ipath_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
	@@ -473,9 +418,63 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)

	send_comp:		send_comp:
	sqp->s_rnr_retry = sqp->s_rnr_retry_cnt;		sqp->s_rnr_retry = sqp->s_rnr_retry_cnt;
	ipath_send_complete(sqp, wqe, IB_WC_SUCCESS);		ipath_send_complete(sqp, wqe, send_status);
	goto again;		goto again;

			rnr_nak:
			/* Handle RNR NAK */
			if (qp->ibqp.qp_type == IB_QPT_UC)
			goto send_comp;
			/*
			* Note: we don't need the s_lock held since the BUSY flag
			* makes this single threaded.
			*/
			if (sqp->s_rnr_retry == 0) {
			send_status = IB_WC_RNR_RETRY_EXC_ERR;
			goto serr;
			}
			if (sqp->s_rnr_retry_cnt < 7)
			sqp->s_rnr_retry--;
			spin_lock_irqsave(&sqp->s_lock, flags);
			if (!(ib_ipath_state_ops[sqp->state] & IPATH_PROCESS_RECV_OK))
			goto unlock;
			dev->n_rnr_naks++;
			sqp->s_rnr_timeout = ib_ipath_rnr_table[qp->r_min_rnr_timer];
			ipath_insert_rnr_queue(sqp);
			goto unlock;

			inv_err:
			send_status = IB_WC_REM_INV_REQ_ERR;
			wc.status = IB_WC_LOC_QP_OP_ERR;
			goto err;

			acc_err:
			send_status = IB_WC_REM_ACCESS_ERR;
			wc.status = IB_WC_LOC_PROT_ERR;
			err:
			/* responder goes to error state */
			ipath_rc_error(qp, wc.status);

			serr:
			spin_lock_irqsave(&sqp->s_lock, flags);
			ipath_send_complete(sqp, wqe, send_status);
			if (sqp->ibqp.qp_type == IB_QPT_RC) {
			int lastwqe = ipath_error_qp(sqp, IB_WC_WR_FLUSH_ERR);

			sqp->s_flags &= ~IPATH_S_BUSY;
			spin_unlock_irqrestore(&sqp->s_lock, flags);
			if (lastwqe) {
			struct ib_event ev;

			ev.device = sqp->ibqp.device;
			ev.element.qp = &sqp->ibqp;
			ev.event = IB_EVENT_QP_LAST_WQE_REACHED;
			sqp->ibqp.event_handler(&ev, sqp->ibqp.qp_context);
			}
			goto done;
			}
			unlock:
			spin_unlock_irqrestore(&sqp->s_lock, flags);
	done:		done:
	if (atomic_dec_and_test(&qp->refcount))		if (atomic_dec_and_test(&qp->refcount))
	wake_up(&qp->wait);		wake_up(&qp->wait);
	@@ -651,21 +650,15 @@ void ipath_send_complete(struct ipath_qp qp, struct ipath_swqe wqe,
	status != IB_WC_SUCCESS) {		status != IB_WC_SUCCESS) {
	struct ib_wc wc;		struct ib_wc wc;

			memset(&wc, 0, sizeof wc);
	wc.wr_id = wqe->wr.wr_id;		wc.wr_id = wqe->wr.wr_id;
	wc.status = status;		wc.status = status;
	wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];		wc.opcode = ib_ipath_wc_opcode[wqe->wr.opcode];
	wc.vendor_err = 0;
	wc.byte_len = wqe->length;
	wc.imm_data = 0;
	wc.qp = &qp->ibqp;		wc.qp = &qp->ibqp;
	wc.src_qp = 0;		if (status == IB_WC_SUCCESS)
	wc.wc_flags = 0;		wc.byte_len = wqe->length;
	wc.pkey_index = 0;		ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc,
	wc.slid = 0;		status != IB_WC_SUCCESS);
	wc.sl = 0;
	wc.dlid_path_bits = 0;
	wc.port_num = 0;
	ipath_cq_enter(to_icq(qp->ibqp.send_cq), &wc, 0);
	}		}

	spin_lock_irqsave(&qp->s_lock, flags);		spin_lock_irqsave(&qp->s_lock, flags);

drivers/infiniband/hw/ipath/ipath_verbs.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -744,12 +744,10 @@ static void ipath_ib_timer(struct ipath_ibdev *dev)

	/* XXX What if timer fires again while this is running? */		/* XXX What if timer fires again while this is running? */
	for (qp = resend; qp != NULL; qp = qp->timer_next) {		for (qp = resend; qp != NULL; qp = qp->timer_next) {
	struct ib_wc wc;

	spin_lock_irqsave(&qp->s_lock, flags);		spin_lock_irqsave(&qp->s_lock, flags);
	if (qp->s_last != qp->s_tail && qp->state == IB_QPS_RTS) {		if (qp->s_last != qp->s_tail && qp->state == IB_QPS_RTS) {
	dev->n_timeouts++;		dev->n_timeouts++;
	ipath_restart_rc(qp, qp->s_last_psn + 1, &wc);		ipath_restart_rc(qp, qp->s_last_psn + 1);
	}		}
	spin_unlock_irqrestore(&qp->s_lock, flags);		spin_unlock_irqrestore(&qp->s_lock, flags);

drivers/infiniband/hw/ipath/ipath_verbs.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -710,8 +710,6 @@ void ipath_free_all_qps(struct ipath_qp_table *qpt);

	int ipath_init_qp_table(struct ipath_ibdev *idev, int size);		int ipath_init_qp_table(struct ipath_ibdev *idev, int size);

	void ipath_sqerror_qp(struct ipath_qp qp, struct ib_wc wc);

	void ipath_get_credit(struct ipath_qp *qp, u32 aeth);		void ipath_get_credit(struct ipath_qp *qp, u32 aeth);

	unsigned ipath_ib_rate_to_mult(enum ib_rate rate);		unsigned ipath_ib_rate_to_mult(enum ib_rate rate);
	@@ -729,7 +727,9 @@ void ipath_uc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,
	void ipath_rc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,		void ipath_rc_rcv(struct ipath_ibdev dev, struct ipath_ib_header hdr,
	int has_grh, void data, u32 tlen, struct ipath_qp qp);		int has_grh, void data, u32 tlen, struct ipath_qp qp);

	void ipath_restart_rc(struct ipath_qp qp, u32 psn, struct ib_wc wc);		void ipath_restart_rc(struct ipath_qp *qp, u32 psn);

			void ipath_rc_error(struct ipath_qp *qp, enum ib_wc_status err);

	int ipath_post_ud_send(struct ipath_qp qp, struct ib_send_wr wr);		int ipath_post_ud_send(struct ipath_qp qp, struct ib_send_wr wr);