Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754191AbcJ3VS5 (ORCPT ); Sun, 30 Oct 2016 17:18:57 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34895 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136AbcJ3VSz (ORCPT ); Sun, 30 Oct 2016 17:18:55 -0400 Subject: Re: [PATCH v4 10/10] IB/mlx5: Simplify completion into a wait_event To: Binoy Jayan , Doug Ledford , Sean Hefty , Hal Rosenstock References: <1477551554-30349-1-git-send-email-binoy.jayan@linaro.org> <1477551554-30349-11-git-send-email-binoy.jayan@linaro.org> Cc: Arnd Bergmann , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org From: Sagi Grimberg Message-ID: <8ceb7dbf-d242-1427-199a-b6ec82876f23@grimberg.me> Date: Sun, 30 Oct 2016 23:17:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <1477551554-30349-11-git-send-email-binoy.jayan@linaro.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2221 Lines: 68 On 27/10/16 09:59, Binoy Jayan wrote: > Convert the completion 'mlx5_ib_umr_context:done' to a wait_event as it > just waits for the return value to be filled. > > Signed-off-by: Binoy Jayan > --- > drivers/infiniband/hw/mlx5/mlx5_ib.h | 2 +- > drivers/infiniband/hw/mlx5/mr.c | 9 +++++---- > include/rdma/ib_verbs.h | 1 + > 3 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/infiniband/hw/mlx5/mlx5_ib.h b/drivers/infiniband/hw/mlx5/mlx5_ib.h > index de31b5f..cf496b5 100644 > --- a/drivers/infiniband/hw/mlx5/mlx5_ib.h > +++ b/drivers/infiniband/hw/mlx5/mlx5_ib.h > @@ -524,7 +524,7 @@ struct mlx5_ib_mw { > struct mlx5_ib_umr_context { > struct ib_cqe cqe; > enum ib_wc_status status; > - struct completion done; > + wait_queue_head_t wq; > }; > > struct umr_common { > diff --git a/drivers/infiniband/hw/mlx5/mr.c b/drivers/infiniband/hw/mlx5/mr.c > index dfaf6f6..49ff2af 100644 > --- a/drivers/infiniband/hw/mlx5/mr.c > +++ b/drivers/infiniband/hw/mlx5/mr.c > @@ -846,14 +846,14 @@ static void mlx5_ib_umr_done(struct ib_cq *cq, struct ib_wc *wc) > container_of(wc->wr_cqe, struct mlx5_ib_umr_context, cqe); > > context->status = wc->status; > - complete(&context->done); > + wake_up(&context->wq); > } > > static inline void mlx5_ib_init_umr_context(struct mlx5_ib_umr_context *context) > { > context->cqe.done = mlx5_ib_umr_done; > - context->status = -1; > - init_completion(&context->done); > + context->status = IB_WC_STATUS_NONE; > + init_waitqueue_head(&context->wq); > } > > static inline int mlx5_ib_post_send_wait(struct mlx5_ib_dev *dev, > @@ -873,7 +873,8 @@ static inline int mlx5_ib_post_send_wait(struct mlx5_ib_dev *dev, > if (err) { > mlx5_ib_warn(dev, "UMR post send failed, err %d\n", err); > } else { > - wait_for_completion(&umr_context.done); > + wait_event(umr_context.wq, > + umr_context.status != IB_WC_STATUS_NONE); How is this simpler? > enum ib_wc_status { > + IB_WC_STATUS_NONE = -1, > IB_WC_SUCCESS, > IB_WC_LOC_LEN_ERR, > IB_WC_LOC_QP_OP_ERR, > Huh? Where did this bogus status came from? IMHO, this is polluting the verbs interface for no good reason at all, sorry.