From patchwork Tue Aug 15 09:52:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 9901521 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 905A460244 for ; Tue, 15 Aug 2017 09:52:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81B7C28816 for ; Tue, 15 Aug 2017 09:52:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7671828822; Tue, 15 Aug 2017 09:52:40 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 0E0CD28816 for ; Tue, 15 Aug 2017 09:52:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753425AbdHOJwj (ORCPT ); Tue, 15 Aug 2017 05:52:39 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:40857 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753395AbdHOJwj (ORCPT ); Tue, 15 Aug 2017 05:52:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.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=EVOJpXNgwVTkh1ceMCeYE00+tEBLIqDDSDqmyygn9/8=; b=C4MdSqfVH2zXDJCCJ9uDTilmt AGe1lGq+vR2c9sjC0GPy72HK3ohD14nLBxUK/PrkChzVdBW6mm51M5imP/YtsA6CIKR4Oyad1gdbv StbsxM//X3RGIvkoBxeLNSr4AJ5IHEjy113o2sY+2NlwwqI1gGJ6U1UkSRLjZoj4drhAJW9qYRZ2i OE64mT+FZXCNsURNIOzdAyUKm49LtHHcNGmvXJVPwVAIOpOIyZUyGiW2BLKP7wep6IemoH6TH9YsC fuPPIei6orLCjrEygaIRgXs6bv+XeVnKI3xQMd1E1a9IpAz02t09teLcQaAYexljc0RG4J1veOTYQ ws0ISvXJA==; Received: from bzq-82-81-101-184.red.bezeqint.net ([82.81.101.184] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.87 #1 (Red Hat Linux)) id 1dhYWa-0007Bp-Kv; Tue, 15 Aug 2017 09:52:37 +0000 From: Sagi Grimberg To: linux-nvme@lists.infradead.org, Christoph Hellwig , Keith Busch Cc: linux-block@vger.kernel.org Subject: [PATCH 04/12] nvme-rdma: restructure create_ctrl a bit Date: Tue, 15 Aug 2017 12:52:17 +0300 Message-Id: <1502790745-12569-5-git-send-email-sagi@grimberg.me> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502790745-12569-1-git-send-email-sagi@grimberg.me> References: <1502790745-12569-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 We'd like to split the generic part out, so rearrange to ease the split. post_configure will be called after the controller basic configuration occured and identification. Signed-off-by: Sagi Grimberg --- drivers/nvme/host/rdma.c | 89 ++++++++++++++++++++++++++---------------------- 1 file changed, 48 insertions(+), 41 deletions(-) diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index a0981fd5291c..dc903625a759 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -1844,6 +1844,39 @@ static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = { .get_address = nvmf_get_address, }; +static int nvme_rdma_post_configure(struct nvme_ctrl *ctrl) +{ + /* sanity check icdoff */ + if (ctrl->icdoff) { + dev_err(ctrl->device, "icdoff is not supported!\n"); + return -EINVAL; + } + + /* sanity check keyed sgls */ + if (!(ctrl->sgls & (1 << 20))) { + dev_err(ctrl->device, "Mandatory keyed sgls are not support\n"); + return -EINVAL; + } + + if (ctrl->opts->queue_size > ctrl->maxcmd) { + /* warn if maxcmd is lower than queue_size */ + dev_warn(ctrl->device, + "queue_size %zu > ctrl maxcmd %u, clamping down\n", + ctrl->opts->queue_size, ctrl->maxcmd); + ctrl->opts->queue_size = ctrl->maxcmd; + } + + if (ctrl->opts->queue_size > ctrl->sqsize + 1) { + /* warn if sqsize is lower than queue_size */ + dev_warn(ctrl->device, + "queue_size %zu > ctrl sqsize %u, clamping down\n", + ctrl->opts->queue_size, ctrl->sqsize + 1); + ctrl->opts->queue_size = ctrl->sqsize + 1; + } + + return 0; +} + static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, struct nvmf_ctrl_options *opts) { @@ -1855,7 +1888,11 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL); if (!ctrl) return ERR_PTR(-ENOMEM); + ctrl->ctrl.opts = opts; + ctrl->ctrl.queue_count = opts->nr_io_queues + 1; /* +1 for admin queue */ + ctrl->ctrl.sqsize = opts->queue_size - 1; + ctrl->ctrl.kato = opts->kato; INIT_LIST_HEAD(&ctrl->list); if (opts->mask & NVMF_OPT_TRSVCID) @@ -1880,10 +1917,16 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, } } + ret = -ENOMEM; + ctrl->queues = kcalloc(ctrl->ctrl.queue_count, sizeof(*ctrl->queues), + GFP_KERNEL); + if (!ctrl->queues) + goto out_free_ctrl; + ret = nvme_init_ctrl(&ctrl->ctrl, dev, &nvme_rdma_ctrl_ops, 0 /* no quirks, we're perfect! */); if (ret) - goto out_free_ctrl; + goto out_kfree_queues; INIT_DELAYED_WORK(&ctrl->ctrl.reconnect_work, nvme_rdma_reconnect_ctrl_work); @@ -1891,49 +1934,13 @@ static struct nvme_ctrl *nvme_rdma_create_ctrl(struct device *dev, INIT_WORK(&ctrl->ctrl.delete_work, nvme_rdma_del_ctrl_work); INIT_WORK(&ctrl->ctrl.reset_work, nvme_rdma_reset_ctrl_work); - ctrl->ctrl.queue_count = opts->nr_io_queues + 1; /* +1 for admin queue */ - ctrl->ctrl.sqsize = opts->queue_size - 1; - ctrl->ctrl.kato = opts->kato; - - ret = -ENOMEM; - ctrl->queues = kcalloc(ctrl->ctrl.queue_count, sizeof(*ctrl->queues), - GFP_KERNEL); - if (!ctrl->queues) - goto out_uninit_ctrl; - ret = nvme_rdma_configure_admin_queue(ctrl, true); if (ret) - goto out_kfree_queues; - - /* sanity check icdoff */ - if (ctrl->ctrl.icdoff) { - dev_err(ctrl->ctrl.device, "icdoff is not supported!\n"); - ret = -EINVAL; - goto out_remove_admin_queue; - } - - /* sanity check keyed sgls */ - if (!(ctrl->ctrl.sgls & (1 << 20))) { - dev_err(ctrl->ctrl.device, "Mandatory keyed sgls are not support\n"); - ret = -EINVAL; - goto out_remove_admin_queue; - } - - if (opts->queue_size > ctrl->ctrl.maxcmd) { - /* warn if maxcmd is lower than queue_size */ - dev_warn(ctrl->ctrl.device, - "queue_size %zu > ctrl maxcmd %u, clamping down\n", - opts->queue_size, ctrl->ctrl.maxcmd); - opts->queue_size = ctrl->ctrl.maxcmd; - } + goto out_uninit_ctrl; - if (opts->queue_size > ctrl->ctrl.sqsize + 1) { - /* warn if sqsize is lower than queue_size */ - dev_warn(ctrl->ctrl.device, - "queue_size %zu > ctrl sqsize %u, clamping down\n", - opts->queue_size, ctrl->ctrl.sqsize + 1); - opts->queue_size = ctrl->ctrl.sqsize + 1; - } + ret = nvme_rdma_post_configure(&ctrl->ctrl); + if (ret) + goto out_uninit_ctrl; if (opts->nr_io_queues) { ret = nvme_rdma_configure_io_queues(ctrl, true);