From patchwork Wed Oct 26 08:01: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: 79349 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp279040qge; Wed, 26 Oct 2016 01:02:03 -0700 (PDT) X-Received: by 10.98.31.4 with SMTP id f4mr1773887pff.67.1477468923042; Wed, 26 Oct 2016 01:02:03 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a17si1277974pgi.123.2016.10.26.01.02.02; Wed, 26 Oct 2016 01:02:03 -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 S941196AbcJZICA (ORCPT + 27 others); Wed, 26 Oct 2016 04:02:00 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:34879 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932310AbcJZIBu (ORCPT ); Wed, 26 Oct 2016 04:01:50 -0400 Received: by mail-pf0-f182.google.com with SMTP id s8so135473999pfj.2 for ; Wed, 26 Oct 2016 01:01:50 -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=DAJ7N0BnIokvNncLV+rQYp1R1auKFr8cnrv/ZY1t9Ww=; b=azDO7xnVVlkzsE0qnQRuD5EukcwqzE97NtpD1NoR4Xk2QtW4Lle1PXdJ9aVVvrOyd0 fTNCpQLQLQfPBehOIOWjn3tx+y+VWQ2NMXCDfaEWULhEssOwwrmW66Jw+jBuyk1SjoAJ rXJV1emrTtAqT7de+9PaAc6BzkBXbbNPB+klY= 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=DAJ7N0BnIokvNncLV+rQYp1R1auKFr8cnrv/ZY1t9Ww=; b=GhQw+CPM4MK26TILux3sVdsSmxjEvz8DVQ9KgJzeRuW/zB3+B14rLsRMkRiZHViDpE L+h8o7zCQrLW7Ck/mQR6fNvvEgJSRDgpYwr7ITDbTec06IfCG68+JjEHE7tZ+zmQj46K ac6cSIVWZLouwgU7hAVN/HXsZDbaP59C70N8kdi3B/LOdCTFSxAyVT6Rflk56yCAXO8J JkCg57cPws3cPyRYocr99WLKKG1gBilBNH1VZ1CLbzuwnq93Xgvt2Lj54cPZWOk5Jq07 ZAeZXVjQlMJ8k6nAO2JVP5HHGJwPkj5I9lp+BKbqjqXGPwSi9KHcfkZZ8kBEy9cglTMY hFTA== X-Gm-Message-State: ABUngvfh1Tuoy13Wm/z8PZxqYim6Ma1FxZr8Ws1nvKW5C0a8FLP1O0+l1riabkQLiU0V2LbZ X-Received: by 10.99.154.2 with SMTP id o2mr1513342pge.19.1477468910077; Wed, 26 Oct 2016 01:01:50 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id 74sm2011923pfp.77.2016.10.26.01.01.47 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Oct 2016 01:01:49 -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 v3 9/9] IB/mlx5: Simplify completion into a wait_event Date: Wed, 26 Oct 2016 13:31:14 +0530 Message-Id: <1477468874-16328-10-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1477468874-16328-1-git-send-email-binoy.jayan@linaro.org> References: <1477468874-16328-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 | 7 ++++--- include/rdma/ib_verbs.h | 3 ++- 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 dcdcd19..af682c5 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 19c292a..5228459 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); + init_waitqueue_head(&context->wq); } static inline int mlx5_ib_post_send_wait(struct mlx5_ib_dev *dev, @@ -866,13 +866,14 @@ static inline int mlx5_ib_post_send_wait(struct mlx5_ib_dev *dev, mlx5_ib_init_umr_context(&umr_context); umrwr->wr.wr_cqe = &umr_context.cqe; + umr_context.status = IB_WC_STATUS_NONE; down(&umrc->sem); err = ib_post_send(umrc->qp, &umrwr->wr, &bad); 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..994d967 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -844,7 +844,8 @@ enum ib_wc_status { IB_WC_INV_EEC_STATE_ERR, IB_WC_FATAL_ERR, IB_WC_RESP_TIMEOUT_ERR, - IB_WC_GENERAL_ERR + IB_WC_GENERAL_ERR, + IB_WC_STATUS_NONE }; const char *__attribute_const__ ib_wc_status_msg(enum ib_wc_status status);