Merge branches 'ib_core', 'ib_ipoib', 'srpt', 'drain-cq-v4' and 'net/9p' into k.o/for-4.6 (76b06402) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/infiniband/core/verbs.c

+164 −0

Original line number	Diff line number	Diff line
		@@ -1657,3 +1657,167 @@ int ib_sg_to_pages(struct ib_mr *mr,
		return i;
		}
		EXPORT_SYMBOL(ib_sg_to_pages);

		struct ib_drain_cqe {
		struct ib_cqe cqe;
		struct completion done;
		};

		static void ib_drain_qp_done(struct ib_cq cq, struct ib_wc wc)
		{
		struct ib_drain_cqe *cqe = container_of(wc->wr_cqe, struct ib_drain_cqe,
		cqe);

		complete(&cqe->done);
		}

		/*
		* Post a WR and block until its completion is reaped for the SQ.
		*/
		static void __ib_drain_sq(struct ib_qp *qp)
		{
		struct ib_qp_attr attr = { .qp_state = IB_QPS_ERR };
		struct ib_drain_cqe sdrain;
		struct ib_send_wr swr = {}, *bad_swr;
		int ret;

		if (qp->send_cq->poll_ctx == IB_POLL_DIRECT) {
		WARN_ONCE(qp->send_cq->poll_ctx == IB_POLL_DIRECT,
		"IB_POLL_DIRECT poll_ctx not supported for drain\n");
		return;
		}

		swr.wr_cqe = &sdrain.cqe;
		sdrain.cqe.done = ib_drain_qp_done;
		init_completion(&sdrain.done);

		ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
		if (ret) {
		WARN_ONCE(ret, "failed to drain send queue: %d\n", ret);
		return;
		}

		ret = ib_post_send(qp, &swr, &bad_swr);
		if (ret) {
		WARN_ONCE(ret, "failed to drain send queue: %d\n", ret);
		return;
		}

		wait_for_completion(&sdrain.done);
		}

		/*
		* Post a WR and block until its completion is reaped for the RQ.
		*/
		static void __ib_drain_rq(struct ib_qp *qp)
		{
		struct ib_qp_attr attr = { .qp_state = IB_QPS_ERR };
		struct ib_drain_cqe rdrain;
		struct ib_recv_wr rwr = {}, *bad_rwr;
		int ret;

		if (qp->recv_cq->poll_ctx == IB_POLL_DIRECT) {
		WARN_ONCE(qp->recv_cq->poll_ctx == IB_POLL_DIRECT,
		"IB_POLL_DIRECT poll_ctx not supported for drain\n");
		return;
		}

		rwr.wr_cqe = &rdrain.cqe;
		rdrain.cqe.done = ib_drain_qp_done;
		init_completion(&rdrain.done);

		ret = ib_modify_qp(qp, &attr, IB_QP_STATE);
		if (ret) {
		WARN_ONCE(ret, "failed to drain recv queue: %d\n", ret);
		return;
		}

		ret = ib_post_recv(qp, &rwr, &bad_rwr);
		if (ret) {
		WARN_ONCE(ret, "failed to drain recv queue: %d\n", ret);
		return;
		}

		wait_for_completion(&rdrain.done);
		}

		/**
		* ib_drain_sq() - Block until all SQ CQEs have been consumed by the
		* application.
		* @qp: queue pair to drain
		*
		* If the device has a provider-specific drain function, then
		* call that. Otherwise call the generic drain function
		* __ib_drain_sq().
		*
		* The caller must:
		*
		* ensure there is room in the CQ and SQ for the drain work request and
		* completion.
		*
		* allocate the CQ using ib_alloc_cq() and the CQ poll context cannot be
		* IB_POLL_DIRECT.
		*
		* ensure that there are no other contexts that are posting WRs concurrently.
		* Otherwise the drain is not guaranteed.
		*/
		void ib_drain_sq(struct ib_qp *qp)
		{
		if (qp->device->drain_sq)
		qp->device->drain_sq(qp);
		else
		__ib_drain_sq(qp);
		}
		EXPORT_SYMBOL(ib_drain_sq);

		/**
		* ib_drain_rq() - Block until all RQ CQEs have been consumed by the
		* application.
		* @qp: queue pair to drain
		*
		* If the device has a provider-specific drain function, then
		* call that. Otherwise call the generic drain function
		* __ib_drain_rq().
		*
		* The caller must:
		*
		* ensure there is room in the CQ and RQ for the drain work request and
		* completion.
		*
		* allocate the CQ using ib_alloc_cq() and the CQ poll context cannot be
		* IB_POLL_DIRECT.
		*
		* ensure that there are no other contexts that are posting WRs concurrently.
		* Otherwise the drain is not guaranteed.
		*/
		void ib_drain_rq(struct ib_qp *qp)
		{
		if (qp->device->drain_rq)
		qp->device->drain_rq(qp);
		else
		__ib_drain_rq(qp);
		}
		EXPORT_SYMBOL(ib_drain_rq);

		/**
		* ib_drain_qp() - Block until all CQEs have been consumed by the
		* application on both the RQ and SQ.
		* @qp: queue pair to drain
		*
		* The caller must:
		*
		* ensure there is room in the CQ(s), SQ, and RQ for drain work requests
		* and completions.
		*
		* allocate the CQs using ib_alloc_cq() and the CQ poll context cannot be
		* IB_POLL_DIRECT.
		*
		* ensure that there are no other contexts that are posting WRs concurrently.
		* Otherwise the drain is not guaranteed.
		*/
		void ib_drain_qp(struct ib_qp *qp)
		{
		ib_drain_sq(qp);
		ib_drain_rq(qp);
		}
		EXPORT_SYMBOL(ib_drain_qp);

drivers/infiniband/hw/cxgb4/cq.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -815,8 +815,15 @@ static int c4iw_poll_cq_one(struct c4iw_cq chp, struct ib_wc wc)
		}
		}
		out:
		if (wq)
		if (wq) {
		if (unlikely(qhp->attr.state != C4IW_QP_STATE_RTS)) {
		if (t4_sq_empty(wq))
		complete(&qhp->sq_drained);
		if (t4_rq_empty(wq))
		complete(&qhp->rq_drained);
		}
		spin_unlock(&qhp->lock);
		}
		return ret;
		}

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -476,6 +476,8 @@ struct c4iw_qp {
		wait_queue_head_t wait;
		struct timer_list timer;
		int sq_sig_all;
		struct completion rq_drained;
		struct completion sq_drained;
		};

		static inline struct c4iw_qp to_c4iw_qp(struct ib_qp ibqp)
		@@ -1016,6 +1018,8 @@ extern int c4iw_wr_log;
		extern int db_fc_threshold;
		extern int db_coalescing_threshold;
		extern int use_dsgl;
		void c4iw_drain_rq(struct ib_qp *qp);
		void c4iw_drain_sq(struct ib_qp *qp);


		#endif

drivers/infiniband/hw/cxgb4/provider.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -564,6 +564,8 @@ int c4iw_register_device(struct c4iw_dev *dev)
		dev->ibdev.get_protocol_stats = c4iw_get_mib;
		dev->ibdev.uverbs_abi_ver = C4IW_UVERBS_ABI_VERSION;
		dev->ibdev.get_port_immutable = c4iw_port_immutable;
		dev->ibdev.drain_sq = c4iw_drain_sq;
		dev->ibdev.drain_rq = c4iw_drain_rq;

		dev->ibdev.iwcm = kmalloc(sizeof(struct iw_cm_verbs), GFP_KERNEL);
		if (!dev->ibdev.iwcm)

drivers/infiniband/hw/cxgb4/qp.c

+16 −0

Original line number	Diff line number	Diff line
		@@ -1697,6 +1697,8 @@ struct ib_qp c4iw_create_qp(struct ib_pd pd, struct ib_qp_init_attr *attrs,
		qhp->attr.max_ird = 0;
		qhp->sq_sig_all = attrs->sq_sig_type == IB_SIGNAL_ALL_WR;
		spin_lock_init(&qhp->lock);
		init_completion(&qhp->sq_drained);
		init_completion(&qhp->rq_drained);
		mutex_init(&qhp->mutex);
		init_waitqueue_head(&qhp->wait);
		atomic_set(&qhp->refcnt, 1);
		@@ -1888,3 +1890,17 @@ int c4iw_ib_query_qp(struct ib_qp ibqp, struct ib_qp_attr attr,
		init_attr->sq_sig_type = qhp->sq_sig_all ? IB_SIGNAL_ALL_WR : 0;
		return 0;
		}

		void c4iw_drain_sq(struct ib_qp *ibqp)
		{
		struct c4iw_qp *qp = to_c4iw_qp(ibqp);

		wait_for_completion(&qp->sq_drained);
		}

		void c4iw_drain_rq(struct ib_qp *ibqp)
		{
		struct c4iw_qp *qp = to_c4iw_qp(ibqp);

		wait_for_completion(&qp->rq_drained);
		}