From patchwork Sun Jun 18 15:21:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 9794873 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 28227601C8 for ; Sun, 18 Jun 2017 15:22:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1ADEF283AF for ; Sun, 18 Jun 2017 15:22:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FF21283C0; Sun, 18 Jun 2017 15:22:30 +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=-5.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, URIBL_BLACK 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 9A384283AF for ; Sun, 18 Jun 2017 15:22:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753227AbdFRPW3 (ORCPT ); Sun, 18 Jun 2017 11:22:29 -0400 Received: from merlin.infradead.org ([205.233.59.134]:52150 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbdFRPW2 (ORCPT ); Sun, 18 Jun 2017 11:22:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=6uR4cSX3oSSciR0PleMOgQzue4RaVzHdR6HZCHO+kGY=; b=mvUk2reHBdZDdwpwZ45yX4X+H MDlN/ckL7Gi9cuIamAHXFDyo8hW1rVCO420q//bnusjWi5WaYdUg8B2TGDWrNYM42augZljRgvqSy GZnli95zIkyiTVE0wCqmrmwmXlbRWGc9/RB0NOpRMXO3vo/GDJBYDGgawytAGhfNbh+yC5LXndIZG 1qdIlZ3rcjbWqHfvgZ6ns5dVkEpH6H4U2GOn/40cfnD72ItvydTMBj1ItZJ3VwwcdEdjsrDgSqgRo DH+1jv8z4THZR5RbCqjW+Z+pCm0k+bXdmofdJWcdxhgmwXoBTUgsDhZ4ZjVlo72yLaoo1iHWyDZu0 j8/gG9kXw==; Received: from bzq-82-81-101-184.red.bezeqint.net ([82.81.101.184] helo=bombadil.infradead.org) by merlin.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dMc1x-0006WN-At; Sun, 18 Jun 2017 15:22:25 +0000 From: Sagi Grimberg To: linux-nvme@lists.infradead.org Cc: Christoph Hellwig , Keith Busch , linux-block@vger.kernel.org Subject: [PATCH rfc 13/30] nvme-rdma: move queue LIVE/DELETING flags settings to queue routines Date: Sun, 18 Jun 2017 18:21:47 +0300 Message-Id: <1497799324-19598-14-git-send-email-sagi@grimberg.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497799324-19598-1-git-send-email-sagi@grimberg.me> References: <1497799324-19598-1-git-send-email-sagi@grimberg.me> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Sagi Grimberg Reviewed-by: Christoph Hellwig --- drivers/nvme/host/rdma.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 34518c90609a..d9524389aedd 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -565,7 +565,7 @@ static void nvme_rdma_stop_queue(struct nvme_rdma_ctrl *ctrl, int qid) { struct nvme_rdma_queue *queue = &ctrl->queues[qid]; - if (test_bit(NVME_RDMA_Q_DELETING, &queue->flags)) + if (!test_and_clear_bit(NVME_RDMA_Q_LIVE, &queue->flags)) return; rdma_disconnect(queue->cm_id); ib_drain_qp(queue->qp); @@ -617,7 +617,9 @@ static int nvme_rdma_start_queue(struct nvme_rdma_ctrl *ctrl, int idx) else ret = nvmf_connect_admin_queue(&ctrl->ctrl); - if (ret) + if (!ret) + set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[idx].flags); + else dev_info(ctrl->ctrl.device, "failed to connect queue: %d ret=%d\n", idx, ret); return ret; @@ -631,8 +633,6 @@ static int nvme_rdma_start_io_queues(struct nvme_rdma_ctrl *ctrl) ret = nvme_rdma_start_queue(ctrl, i); if (ret) goto out_stop_queues; - - set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[i].flags); } return 0; @@ -823,8 +823,6 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, bool new if (error) goto out_cleanup_connect_queue; - set_bit(NVME_RDMA_Q_LIVE, &ctrl->queues[0].flags); - error = nvmf_reg_read64(&ctrl->ctrl, NVME_REG_CAP, &ctrl->ctrl.cap); if (error) { dev_err(ctrl->ctrl.device,