From patchwork Mon Nov 6 16:07:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Selvin Xavier X-Patchwork-Id: 10043811 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DE6F260247 for ; Mon, 6 Nov 2017 16:09:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3D9129EFF for ; Mon, 6 Nov 2017 16:09:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8DAE29F08; Mon, 6 Nov 2017 16:09:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7268E29EFF for ; Mon, 6 Nov 2017 16:09:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754102AbdKFQJF (ORCPT ); Mon, 6 Nov 2017 11:09:05 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:43757 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753842AbdKFQJE (ORCPT ); Mon, 6 Nov 2017 11:09:04 -0500 Received: by mail-qk0-f195.google.com with SMTP id 78so4594886qkz.0 for ; Mon, 06 Nov 2017 08:09:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jTwYBCGJExL5bMIbKW7dCW+vM/LiDuXqFRj63WNxQfI=; b=XWo/BbN11AFf0wj9gSRM1zGbtYz+2gzKwL5/2YYcjYmzgqDdVbX0tu7MjLn27JMt0/ gwUE8HdhBdT9b0VABEyQVa9f4dEAOyryMlE8wN79NUoNHCwTO9Av3E0hZjmNjK+ib5mw tUW/WL3K6R75dGkYdi5uEG11Wu12i/vht+BC8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jTwYBCGJExL5bMIbKW7dCW+vM/LiDuXqFRj63WNxQfI=; b=Cy1Dn64p9lmROV96mRv3D0mgHx8bbJ2GCOEw6bJEDtHWz8o50HaAPRCdjrmdiH8Jgg bfW1Xm86BeCpHawqA2wwEu/QN06W6K2AIoLMLhqwZG4Nl3YKjrqloV41uaqi6SMp0hSV S+C+Wa3NeWblmzrYxY4H+dJTEmhfDkCNcypRAxgRPcjaBgOVHfnwuKxpN4ylnwYe9VJJ eCNibdbpOpzq2GUX8wXLUe02KRvxdODW+fae1DbCoeAlDMO0oja/a0I1PK992UL6x9av sWi1wc+UyS6BGMLkq4mwbNnKew3YLEwWn3687uv7dZBL1YKoXNuEfnHBXDCtERf4ANQ1 OAxQ== X-Gm-Message-State: AJaThX5S6ClyLi1IlAHksWZ1yiBH5xL22KI5TQVMbLNzDUpH0cwPOR9z egvKvHosbP0prm9aVIEZfcS2oJyi X-Google-Smtp-Source: ABhQp+ReB96rRooL0cUzOWP6GhParZqp1ucY02L+XnnOSsWNRKPw7oQqW/VtfXEnzDqYxK0k/LStWw== X-Received: by 10.55.215.221 with SMTP id t90mr567398qkt.226.1509984543261; Mon, 06 Nov 2017 08:09:03 -0800 (PST) Received: from dhcp-10-192-206-197.iig.avagotech.net ([192.19.239.250]) by smtp.gmail.com with ESMTPSA id c64sm8237717qkd.67.2017.11.06.08.09.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Nov 2017 08:09:02 -0800 (PST) From: Selvin Xavier To: dledford@redhat.com Cc: linux-rdma@vger.kernel.org, Selvin Xavier Subject: [PATCH 4/4] RDMA/bnxt_re: synchronize poll_cq and req_notify_cq verbs Date: Mon, 6 Nov 2017 08:07:32 -0800 Message-Id: <1509984452-18336-5-git-send-email-selvin.xavier@broadcom.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1509984452-18336-1-git-send-email-selvin.xavier@broadcom.com> References: <1509984452-18336-1-git-send-email-selvin.xavier@broadcom.com> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Synchronize poll_cq and req_notify_cq verbs using cq_lock, instead of the lower level qplib->hwq.lock. Signed-off-by: Selvin Xavier --- drivers/infiniband/hw/bnxt_re/ib_verbs.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c index 96ec797..d5770aa 100644 --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c @@ -2999,8 +2999,10 @@ int bnxt_re_req_notify_cq(struct ib_cq *ib_cq, enum ib_cq_notify_flags ib_cqn_flags) { struct bnxt_re_cq *cq = container_of(ib_cq, struct bnxt_re_cq, ib_cq); - int type = 0; + int type = 0, rc = 0; + unsigned long flags; + spin_lock_irqsave(&cq->cq_lock, flags); /* Trigger on the very next completion */ if (ib_cqn_flags & IB_CQ_NEXT_COMP) type = DBR_DBR_TYPE_CQ_ARMALL; @@ -3010,12 +3012,15 @@ int bnxt_re_req_notify_cq(struct ib_cq *ib_cq, /* Poll to see if there are missed events */ if ((ib_cqn_flags & IB_CQ_REPORT_MISSED_EVENTS) && - !(bnxt_qplib_is_cq_empty(&cq->qplib_cq))) - return 1; - + !(bnxt_qplib_is_cq_empty(&cq->qplib_cq))) { + rc = 1; + goto exit; + } bnxt_qplib_req_notify_cq(&cq->qplib_cq, type); - return 0; +exit: + spin_unlock_irqrestore(&cq->cq_lock, flags); + return rc; } /* Memory Regions */