From patchwork Thu Oct 27 06:59:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 79617 Delivered-To: patch@linaro.org Received: by 10.80.142.83 with SMTP id 19csp479984edx; Thu, 27 Oct 2016 00:00:16 -0700 (PDT) X-Received: by 10.98.93.83 with SMTP id r80mr11523244pfb.17.1477551616769; Thu, 27 Oct 2016 00:00:16 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wp6si5248442pab.294.2016.10.27.00.00.15; Thu, 27 Oct 2016 00:00:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935212AbcJ0HAA (ORCPT + 27 others); Thu, 27 Oct 2016 03:00:00 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33440 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935081AbcJ0G7y (ORCPT ); Thu, 27 Oct 2016 02:59:54 -0400 Received: by mail-pf0-f170.google.com with SMTP id 197so11983761pfu.0 for ; Wed, 26 Oct 2016 23:59:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hKgqDrv4KKmsWIG6EgLP/EQNzOcV1G3+oCiQ7G2L1Tg=; b=Vnu7WgFNqKjO+eDjNpGSXVmkwkoIees22LxUqIDegwSX5z+wXfjHuvphb5z9trMao9 Zfyc0EuZ0oXlsetbkq39mkyexU/4nxCDunbSiMfrDp3IiY++gEhM6pNtOFWCaeoNhhGu 6gzWTGQVSfm9nXj3MhXwkGNvK6zBYXGmMMK58= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hKgqDrv4KKmsWIG6EgLP/EQNzOcV1G3+oCiQ7G2L1Tg=; b=DNoFWIQpMNDFld+InA495VqBxwpmr3fzExWQpQSPWVCpsVr8lv8Kf00WylCpbYFdko bymwQhhpiZcPzrncX9n/KkR9Ivg1iAhWOoZ139hp4SaF6G0BioC+yvMAs6RcRKuA6DcU 5jbDdHng0E2XVkIjX3pbtwKv2HhZxAnSnsB5U5kONOmi+mTFhYG6t+vYAjKelvv2/RT+ ZIY4DQ5pKUqqAzkTHs1YhbQTHVM+7GoL1tH/+vQdt60YYb6+qvHIouHJfotkuTQWSat7 b4o5CyofjVKNNtweLSAJv+byz67nyUQvYZ3d1o0rgvzNsI+rs8oITSPm4t4aU4XhAgnc iHOQ== X-Gm-Message-State: ABUngvcYd9BfjLLy4srfEhm67elqlkLdwIKlwYdUxePhwSEpBsORj4APcOhzqHR1uLokKMx7 X-Received: by 10.98.88.5 with SMTP id m5mr11747658pfb.9.1477551594048; Wed, 26 Oct 2016 23:59:54 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id w24sm8795544pfa.12.2016.10.26.23.59.51 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Oct 2016 23:59:53 -0700 (PDT) From: Binoy Jayan To: Doug Ledford , Sean Hefty , Hal Rosenstock Cc: Arnd Bergmann , linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Binoy Jayan Subject: [PATCH v4 10/10] IB/mlx5: Simplify completion into a wait_event Date: Thu, 27 Oct 2016 12:29:14 +0530 Message-Id: <1477551554-30349-11-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1477551554-30349-1-git-send-email-binoy.jayan@linaro.org> References: <1477551554-30349-1-git-send-email-binoy.jayan@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project 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); if (umr_context.status != IB_WC_SUCCESS) { mlx5_ib_warn(dev, "reg umr failed (%u)\n", umr_context.status); diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 5ad43a4..8b15b6f 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -823,6 +823,7 @@ struct ib_ah_attr { }; enum ib_wc_status { + IB_WC_STATUS_NONE = -1, IB_WC_SUCCESS, IB_WC_LOC_LEN_ERR, IB_WC_LOC_QP_OP_ERR,