From patchwork Wed Oct 26 08:01:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 79348 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp279036qge; Wed, 26 Oct 2016 01:02:02 -0700 (PDT) X-Received: by 10.98.97.71 with SMTP id v68mr1744907pfb.133.1477468922695; Wed, 26 Oct 2016 01:02:02 -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:02 -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 S936596AbcJZIBu (ORCPT + 27 others); Wed, 26 Oct 2016 04:01:50 -0400 Received: from mail-pf0-f170.google.com ([209.85.192.170]:33203 "EHLO mail-pf0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933970AbcJZIBl (ORCPT ); Wed, 26 Oct 2016 04:01:41 -0400 Received: by mail-pf0-f170.google.com with SMTP id 197so11525555pfu.0 for ; Wed, 26 Oct 2016 01:01:41 -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=epAyb03vYV6/PTK9Z2HkGubJvDcD5fz+vivFnvUvZRE=; b=Fqtgp5+SU+EpuSL5hGC7a92iyUU7oQPcuyEajSWr2ZpyBNXQzUnawqbfwomc8ifMyJ r5S3B2nEXMHb+ZEV1sHQrQwgYVdd1HEx52JD+aFWN4dVEA8ep4UDNYsQ69/J/uGcjSXZ YnESgpA3/q3vb1wmMo6LvmN0fnfd2Bg1fLpl0= 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=epAyb03vYV6/PTK9Z2HkGubJvDcD5fz+vivFnvUvZRE=; b=PNmeC3U8m351Z9LV3SILiLKrXUN9qDPhm5nXp0Soh2jpokIJFggckTqEXnSibsg9Uy agiW1ctmfng255aGK/bMFTwvPScgmbvrPwRYctz871BWXu3aWlWqxNnlCoUfxlvn8A5Q eE0dInb4g76lt/oSJFBrhvF00zH+EsDdlpjwPEGopdQdWaFtyBKZSciYrbVfg83NSW2k GO5XzumZp/hCDNCRqN61xUWGq6PsesIdTH/SregJHU61GwnPxj6LiwY+hAVNY/d9lIer PY0wpVaGCxbGhjJZ/4M+rChRaQN2JyM1o7i51FpIMXJ8zOC7zRk787zhXpZXFxilZmw6 UgvQ== X-Gm-Message-State: ABUngvdiiXmcLnIRhL45mM/r8N3Gk8F1MYNl0HGk2YRLSIErm0DzFl/QqdEbvZxAedxC5Hyy X-Received: by 10.98.133.141 with SMTP id m13mr1748437pfk.147.1477468900823; Wed, 26 Oct 2016 01:01:40 -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.37 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 26 Oct 2016 01:01:40 -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 6/9] IB/hns: Replace counting semaphore event_sem with wait_event Date: Wed, 26 Oct 2016 13:31:11 +0530 Message-Id: <1477468874-16328-7-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 Counting semaphores are going away in the future, so replace the semaphore mthca_cmd::event_sem with a conditional wait_event. Signed-off-by: Binoy Jayan --- drivers/infiniband/hw/hns/hns_roce_cmd.c | 44 ++++++++++++++++++++--------- drivers/infiniband/hw/hns/hns_roce_device.h | 2 +- 2 files changed, 31 insertions(+), 15 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/hns/hns_roce_cmd.c b/drivers/infiniband/hw/hns/hns_roce_cmd.c index 51a0675..e3025ff 100644 --- a/drivers/infiniband/hw/hns/hns_roce_cmd.c +++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c @@ -189,6 +189,32 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status, complete(&context->done); } +static inline struct hns_roce_cmd_context * +hns_roce_try_get_context(struct hns_roce_cmdq *cmd) +{ + struct hns_roce_cmd_context *context = NULL; + spin_lock(&cmd->context_lock); + + if (cmd->free_head < 0) + goto out; + + context = &cmd->context[cmd->free_head]; + context->token += cmd->token_mask + 1; + cmd->free_head = context->next; +out: + spin_unlock(&cmd->context_lock); + return context; +} + +/* wait for and acquire a free context */ +static inline struct hns_roce_cmd_context * +hns_roce_get_free_context(struct hns_roce_cmdq *cmd) +{ + struct hns_roce_cmd_context *context; + wait_event(cmd->wq, (context = hns_roce_try_get_context(cmd))); + return context; +} + /* this should be called with "use_events" */ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, u64 out_param, unsigned long in_modifier, @@ -200,13 +226,7 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, struct hns_roce_cmd_context *context; int ret = 0; - spin_lock(&cmd->context_lock); - WARN_ON(cmd->free_head < 0); - context = &cmd->context[cmd->free_head]; - context->token += cmd->token_mask + 1; - cmd->free_head = context->next; - spin_unlock(&cmd->context_lock); - + context = hns_roce_get_free_context(cmd); init_completion(&context->done); ret = hns_roce_cmd_mbox_post_hw(hr_dev, in_param, out_param, @@ -238,6 +258,7 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, context->next = cmd->free_head; cmd->free_head = context - cmd->context; spin_unlock(&cmd->context_lock); + wake_up(&cmd->wq); return ret; } @@ -248,10 +269,8 @@ static int hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, { int ret = 0; - down(&hr_dev->cmd.event_sem); ret = __hns_roce_cmd_mbox_wait(hr_dev, in_param, out_param, in_modifier, op_modifier, op, timeout); - up(&hr_dev->cmd.event_sem); return ret; } @@ -313,7 +332,7 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev) hr_cmd->context[hr_cmd->max_cmds - 1].next = -1; hr_cmd->free_head = 0; - sema_init(&hr_cmd->event_sem, hr_cmd->max_cmds); + init_waitqueue_head(&hr_cmd->wq); spin_lock_init(&hr_cmd->context_lock); hr_cmd->token_mask = CMD_TOKEN_MASK; @@ -325,12 +344,9 @@ int hns_roce_cmd_use_events(struct hns_roce_dev *hr_dev) void hns_roce_cmd_use_polling(struct hns_roce_dev *hr_dev) { struct hns_roce_cmdq *hr_cmd = &hr_dev->cmd; - int i; hr_cmd->use_events = 0; - - for (i = 0; i < hr_cmd->max_cmds; ++i) - down(&hr_cmd->event_sem); + hr_cmd->free_head = -1; kfree(hr_cmd->context); } diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h index 2afe075..ac95f52 100644 --- a/drivers/infiniband/hw/hns/hns_roce_device.h +++ b/drivers/infiniband/hw/hns/hns_roce_device.h @@ -364,7 +364,7 @@ struct hns_roce_cmdq { * Event mode: cmd register mutex protection, * ensure to not exceed max_cmds and user use limit region */ - struct semaphore event_sem; + wait_queue_head_t wq; int max_cmds; spinlock_t context_lock; int free_head;