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

Commit 4d6f85c3 authored by Mike Marciniszyn's avatar Mike Marciniszyn Committed by Doug Ledford
Browse files

IB/rdmavt, IB/qib, IB/hfi1: Use new QP put get routines 



This improves readability and hides the reference count
mechanism from the client drivers.

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 4107b8a0

drivers/infiniband/hw/hfi1/qp.c

+4 −7
Original line number Diff line number Diff line
@@ -202,8 +202,7 @@ static void flush_iowait(struct rvt_qp *qp) 
	write_seqlock_irqsave(&dev->iowait_lock, flags);

	if (!list_empty(&priv->s_iowait.list)) {

		list_del_init(&priv->s_iowait.list);

		if (atomic_dec_and_test(&qp->refcount))

			wake_up(&qp->wait);

		rvt_put_qp(qp);

	}

	write_sequnlock_irqrestore(&dev->iowait_lock, flags);

}
@@ -503,8 +502,7 @@ void hfi1_qp_wakeup(struct rvt_qp *qp, u32 flag) 
	}

	spin_unlock_irqrestore(&qp->s_lock, flags);

	/* Notify hfi1_destroy_qp() if it is waiting. */

	if (atomic_dec_and_test(&qp->refcount))

		wake_up(&qp->wait);

	rvt_put_qp(qp);

}



static int iowait_sleep(
@@ -544,7 +542,7 @@ static int iowait_sleep( 
			qp->s_flags |= RVT_S_WAIT_DMA_DESC;

			list_add_tail(&priv->s_iowait.list, &sde->dmawait);

			trace_hfi1_qpsleep(qp, RVT_S_WAIT_DMA_DESC);

			atomic_inc(&qp->refcount);

			rvt_get_qp(qp);

		}

		write_sequnlock(&dev->iowait_lock);

		qp->s_flags &= ~RVT_S_BUSY;
@@ -963,8 +961,7 @@ void notify_error_qp(struct rvt_qp *qp) 
	if (!list_empty(&priv->s_iowait.list) && !(qp->s_flags & RVT_S_BUSY)) {

		qp->s_flags &= ~RVT_S_ANY_WAIT_IO;

		list_del_init(&priv->s_iowait.list);

		if (atomic_dec_and_test(&qp->refcount))

			wake_up(&qp->wait);

		rvt_put_qp(qp);

	}

	write_sequnlock(&dev->iowait_lock);

drivers/infiniband/hw/hfi1/rc.c

+4 −5
Original line number Diff line number Diff line
@@ -1389,7 +1389,7 @@ static int do_rc_ack(struct rvt_qp *qp, u32 aeth, u32 psn, int opcode, 
				restart_rc(qp, qp->s_last_psn + 1, 0);

				if (list_empty(&qp->rspwait)) {

					qp->r_flags |= RVT_R_RSP_SEND;

					atomic_inc(&qp->refcount);

					rvt_get_qp(qp);

					list_add_tail(&qp->rspwait,

						      &rcd->qp_wait_list);

				}
@@ -1573,7 +1573,7 @@ static void rdma_seq_err(struct rvt_qp *qp, struct hfi1_ibport *ibp, u32 psn, 
	restart_rc(qp, qp->s_last_psn + 1, 0);

	if (list_empty(&qp->rspwait)) {

		qp->r_flags |= RVT_R_RSP_SEND;

		atomic_inc(&qp->refcount);

		rvt_get_qp(qp);

		list_add_tail(&qp->rspwait, &rcd->qp_wait_list);

	}

}
@@ -1782,7 +1782,7 @@ static inline void rc_defered_ack(struct hfi1_ctxtdata *rcd, 
{

	if (list_empty(&qp->rspwait)) {

		qp->r_flags |= RVT_R_RSP_NAK;

		atomic_inc(&qp->refcount);

		rvt_get_qp(qp);

		list_add_tail(&qp->rspwait, &rcd->qp_wait_list);

	}

}
@@ -1796,8 +1796,7 @@ static inline void rc_cancel_ack(struct rvt_qp *qp) 
		return;

	list_del_init(&qp->rspwait);

	qp->r_flags &= ~RVT_R_RSP_NAK;

	if (atomic_dec_and_test(&qp->refcount))

		wake_up(&qp->wait);

	rvt_put_qp(qp);

}



/**

drivers/infiniband/hw/hfi1/verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int wait_kmem(struct hfi1_ibdev *dev, 
			qp->s_flags |= RVT_S_WAIT_KMEM;

			list_add_tail(&priv->s_iowait.list, &dev->memwait);

			trace_hfi1_qpsleep(qp, RVT_S_WAIT_KMEM);

			atomic_inc(&qp->refcount);

			rvt_get_qp(qp);

		}

		write_sequnlock(&dev->iowait_lock);

		qp->s_flags &= ~RVT_S_BUSY;
@@ -959,7 +959,7 @@ static int pio_wait(struct rvt_qp *qp, 
			was_empty = list_empty(&sc->piowait);

			list_add_tail(&priv->s_iowait.list, &sc->piowait);

			trace_hfi1_qpsleep(qp, RVT_S_WAIT_PIO);

			atomic_inc(&qp->refcount);

			rvt_get_qp(qp);

			/* counting: only call wantpiobuf_intr if first user */

			if (was_empty)

				hfi1_sc_wantpiobuf_intr(sc, 1);

drivers/infiniband/hw/hfi1/verbs_txreq.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ struct verbs_txreq *__get_txreq(struct hfi1_ibdev *dev, 
			qp->s_flags |= RVT_S_WAIT_TX;

			list_add_tail(&priv->s_iowait.list, &dev->txwait);

			trace_hfi1_qpsleep(qp, RVT_S_WAIT_TX);

			atomic_inc(&qp->refcount);

			rvt_get_qp(qp);

		}

		qp->s_flags &= ~RVT_S_BUSY;

	}

drivers/infiniband/hw/qib/qib_driver.c

+1 −2
Original line number Diff line number Diff line
@@ -588,8 +588,7 @@ u32 qib_kreceive(struct qib_ctxtdata *rcd, u32 *llic, u32 *npkts) 
				qib_schedule_send(qp);

			spin_unlock_irqrestore(&qp->s_lock, flags);

		}

		if (atomic_dec_and_test(&qp->refcount))

			wake_up(&qp->wait);

		rvt_put_qp(qp);

	}



bail: