On Sat, Feb 6, 2016 at 2:43 AM, Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx> wrote:
> From: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxxxxxx>
>
> Add provider-specific drain_sq/drain_rq functions for providers needing
> special drain logic.
>
> Add static functions __ib_drain_sq() and __ib_drain_rq() which post noop
> WRs to the SQ or RQ and block until their completions are processed.
> This ensures the applications completions have all been processed.
>
> Add API functions ib_drain_sq(), ib_drain_rq(), and ib_drain_qp().
>
> Reviewed-by: Chuck Lever <chuck.lever@xxxxxxxxxx>
> Signed-off-by: Steve Wise <swise@xxxxxxxxxxxxxxxxxxxxx>
> ---
> drivers/infiniband/core/verbs.c | 144 ++++++++++++++++++++++++++++++++++++++++
> include/rdma/ib_verbs.h | 5 ++
> 2 files changed, 149 insertions(+)
>
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index 5af6d02..aed521e 100644
> --- a/drivers/infiniband/core/verbs.c
> +++ b/drivers/infiniband/core/verbs.c
> @@ -1657,3 +1657,147 @@ next_page:
> 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);
> +}
> +
> +static void wait_for_drain(struct ib_cq *cq, struct completion *c)
> +{
> + if (cq->poll_ctx == IB_POLL_DIRECT)
> + do
> + ib_process_cq_direct(cq, 1024);
> + while (!wait_for_completion_timeout(c, msecs_to_jiffies(100)));
> + else
> + wait_for_completion(c);
> +}
> +
> +/*
> + * 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;
> +
> + 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 QP: %d\n", ret);
> + return;
> + }
Should it query qp-state and then modify if needed? I am not liking the
the extra step which is highly unlikely in a normal usage conditions?
especially for a shared CQ it is really redundant.
> +
> + ret = ib_post_send(qp, &swr, &bad_swr);
> + if (ret) {
> + WARN_ONCE(ret, "failed to drain send queue: %d\n", ret);
> + return;
> + }
> +
> + wait_for_drain(qp->send_cq, &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;
> +
> + 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 QP: %d\n", ret);
> + return;
> + }
> +
> + ret = ib_post_recv(qp, &rwr, &bad_rwr);
> + if (ret) {
> + WARN_ONCE(ret, "failed to drain send queue: %d\n", ret);
> + return;
> + }
> +
> + wait_for_drain(qp->recv_cq, &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 consumer must ensure there is room in the CQ and SQ
> + * for a drain work requests. Also the consumer must allocate the
> + * CQ using ib_alloc_cq(). It is up to the consumer to handle concurrency
> + * issues if the CQs are using the IB_POLL_DIRECT polling context.
> + */
> +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 consumer must ensure there is room in the CQ and RQ
> + * for a drain work requests. Also the consumer must allocate the
> + * CQ using ib_alloc_cq(). It is up to the consumer to handle concurrency
> + * issues if the CQs are using the IB_POLL_DIRECT polling context.
> + */
> +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 consumer must ensure there is room in the CQ(s), SQ, and RQ
> + * for a drain work requests. Also the consumer must allocate the
> + * CQ using ib_alloc_cq(). It is up to the consumer to handle concurrency
> + * issues if the CQs are using the IB_POLL_DIRECT polling context.
> + */
> +void ib_drain_qp(struct ib_qp *qp)
> +{
> + ib_drain_sq(qp);
> + ib_drain_rq(qp);
> +}
> +EXPORT_SYMBOL(ib_drain_qp);
> diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
> index 284b00c..68b7e97 100644
> --- a/include/rdma/ib_verbs.h
> +++ b/include/rdma/ib_verbs.h
> @@ -1846,6 +1846,8 @@ struct ib_device {
> int (*check_mr_status)(struct ib_mr *mr, u32 check_mask,
> struct ib_mr_status *mr_status);
> void (*disassociate_ucontext)(struct ib_ucontext *ibcontext);
> + void (*drain_rq)(struct ib_qp *qp);
> + void (*drain_sq)(struct ib_qp *qp);
>
> struct ib_dma_mapping_ops *dma_ops;
>
> @@ -3094,4 +3096,7 @@ int ib_sg_to_pages(struct ib_mr *mr,
> int sg_nents,
> int (*set_page)(struct ib_mr *, u64));
>
> +void ib_drain_rq(struct ib_qp *qp);
> +void ib_drain_sq(struct ib_qp *qp);
> +void ib_drain_qp(struct ib_qp *qp);
> #endif /* IB_VERBS_H */
> --
> 2.7.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
