From patchwork Tue Oct 25 12:01:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Binoy Jayan X-Patchwork-Id: 79158 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3072131qge; Tue, 25 Oct 2016 05:02:52 -0700 (PDT) X-Received: by 10.98.141.19 with SMTP id z19mr38962839pfd.105.1477396972276; Tue, 25 Oct 2016 05:02:52 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u71si14105402pgd.117.2016.10.25.05.02.51; Tue, 25 Oct 2016 05:02:52 -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 S1758904AbcJYMCc (ORCPT + 27 others); Tue, 25 Oct 2016 08:02:32 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34016 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758869AbcJYMC1 (ORCPT ); Tue, 25 Oct 2016 08:02:27 -0400 Received: by mail-pf0-f171.google.com with SMTP id n85so2146745pfi.1 for ; Tue, 25 Oct 2016 05:02:26 -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=YvuEFnWhiVnasn4+odqoUA5JcoV9Q/UTSgWgYuYxhlU=; b=PbeLY4rEZo+BuWFGFgCG/m41x5PW88vHrZpadFJILYQ9e1PXdZ990ihJzR+hcne8bR TmfwOiomDGMpXDnWJI/VaP1WUZJB7GVoStxMabL2JTWNgPjx/1DsPd1IB6KuSxDgNX+0 nmCw1gP/7nInh4YqODU4bT5Iww6fXspYmfpcM= 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=YvuEFnWhiVnasn4+odqoUA5JcoV9Q/UTSgWgYuYxhlU=; b=ZlkGzwe4mNYYMV8gFbU+aKDsB/2tV6AiT+2kP63Tv2ZbY6t2bQt6a3vVT980C5a5QF hTddZBLhzEJbnFQzanfmGNEVNqPrPsD7z0cALFeTmIkh/3ez5yplJhfzVnpYsVgmiIkv 7nBUYAzVfnsP7OB5RUJ3Ibmb4kxkfSRTxXJntuAMf/BBy+CgLaW7Zaff7zr8EnHV7Pbi NpOKpmR486XOgWz8UU7n0U1QFiUHXxnvAmt/C+HmPw6bO7Bz8B504KMKkeiNgr0gVpy2 AgMpT7SqqJYLhzn2MMStkfK+NqnoMY4/RF+1BeHvZULuc8AO5Tgam5mY/KQzmwInCIU0 FDqg== X-Gm-Message-State: ABUngvdhW2d3+iIyarjAaDSvbH7fe5VIA7sJBVfMwXwptmv50f4EjGWrxbtCBYcMyqXzeJ6Z X-Received: by 10.98.139.19 with SMTP id j19mr38454190pfe.89.1477396946324; Tue, 25 Oct 2016 05:02:26 -0700 (PDT) Received: from blr-ubuntu-59.ap.qualcomm.com ([202.46.23.61]) by smtp.gmail.com with ESMTPSA id ij5sm33051828pab.2.2016.10.25.05.02.23 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 05:02:25 -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 v2 6/8] IB/hns: Replace counting semaphore event_sem with wait_event Date: Tue, 25 Oct 2016 17:31:57 +0530 Message-Id: <1477396919-27669-7-git-send-email-binoy.jayan@linaro.org> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1477396919-27669-1-git-send-email-binoy.jayan@linaro.org> References: <1477396919-27669-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 | 37 +++++++++++++++++++++-------- drivers/infiniband/hw/hns/hns_roce_device.h | 2 +- 2 files changed, 28 insertions(+), 11 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..efc5c48 100644 --- a/drivers/infiniband/hw/hns/hns_roce_cmd.c +++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c @@ -189,6 +189,26 @@ void hns_roce_cmd_event(struct hns_roce_dev *hr_dev, u16 token, u8 status, complete(&context->done); } +/* Similar to atomic_cmpxchg but with the complimentary condition. Returns + * index to a free node. It also sets cmd->free_head to 'new' so it ensures + * atomicity between a call to 'wait_event' and manipulating the free_head. + */ + +static inline int atomic_free_node(struct hns_roce_cmdq *cmd, int new) +{ + int orig; + + spin_lock(&cmd->context_lock); + + orig = cmd->free_head; + if (likely(cmd->free_head != -1)) + cmd->free_head = new; + + spin_unlock(&cmd->context_lock); + + return orig; +} + /* 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, @@ -198,11 +218,12 @@ static int __hns_roce_cmd_mbox_wait(struct hns_roce_dev *hr_dev, u64 in_param, struct hns_roce_cmdq *cmd = &hr_dev->cmd; struct device *dev = &hr_dev->pdev->dev; struct hns_roce_cmd_context *context; - int ret = 0; + int orig_free_head, ret = 0; + + wait_event(cmd->wq, (orig_free_head = atomic_free_node(cmd, -1)) != -1); spin_lock(&cmd->context_lock); - WARN_ON(cmd->free_head < 0); - context = &cmd->context[cmd->free_head]; + context = &cmd->context[orig_free_head]; context->token += cmd->token_mask + 1; cmd->free_head = context->next; spin_unlock(&cmd->context_lock); @@ -238,6 +259,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 +270,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 +333,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 +345,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;