From patchwork Sun Jun 18 15:21:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sagi Grimberg X-Patchwork-Id: 9794867 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 C83AA601C8 for ; Sun, 18 Jun 2017 15:22:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BACEE283AF for ; Sun, 18 Jun 2017 15:22:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AFD67283C0; Sun, 18 Jun 2017 15:22:25 +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 69950283AF for ; Sun, 18 Jun 2017 15:22:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753223AbdFRPWY (ORCPT ); Sun, 18 Jun 2017 11:22:24 -0400 Received: from merlin.infradead.org ([205.233.59.134]:52126 "EHLO merlin.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753176AbdFRPWY (ORCPT ); Sun, 18 Jun 2017 11:22:24 -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=C3p/WypJJNEBQPgr8auyIffDgnFyO4RA9fbE3kl094Q=; b=d6AqXVwsdGh8UTkVwfSq3Y7CU OgcCKExgLOzQosVzOdBvA4b9UoOZBnRAwbOlTFpAAHdTlvJ5zZmAJKLJGoz/7SiT+tt3dmOOOPcqP p/N89pkXqpy7AdglKKkhzeacr8kZ/vpTZvJGnGESXD7HprnD+SYDM+RCEqsSgBWcIKYULw0iai3kE H+QxFoVDa3rcwFTK3Ynz3YtMGUBdpyM+bZBOQ++XbbTH8rSkWxIDMSGEse3Qta2I+mgLZShlQ1pI8 RFSphF6OhtQffRiSjCn/q2wnwnhdLq6MEAAZdLTJ8iv0mWqz1JgLpYSegfRPHXemxZ2rAXsAzmzct Wafu9AXBQ==; 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 1dMc1t-0006WN-ED; Sun, 18 Jun 2017 15:22:21 +0000 From: Sagi Grimberg To: linux-nvme@lists.infradead.org Cc: Christoph Hellwig , Keith Busch , linux-block@vger.kernel.org Subject: [PATCH rfc 10/30] nvme: Add admin_tagset pointer to nvme_ctrl Date: Sun, 18 Jun 2017 18:21:44 +0300 Message-Id: <1497799324-19598-11-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 Will be used when we centralize control flows. only rdma for now. Signed-off-by: Sagi Grimberg --- drivers/nvme/host/nvme.h | 1 + drivers/nvme/host/rdma.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 415a5ea4759c..3be59634b4af 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -126,6 +126,7 @@ struct nvme_ctrl { struct kref kref; int instance; struct blk_mq_tag_set *tagset; + struct blk_mq_tag_set *admin_tagset; struct list_head namespaces; struct mutex namespaces_mutex; struct device *device; /* char device */ diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c index 2b23f88bedfe..58ed2ae3cd35 100644 --- a/drivers/nvme/host/rdma.c +++ b/drivers/nvme/host/rdma.c @@ -801,6 +801,7 @@ static int nvme_rdma_configure_admin_queue(struct nvme_rdma_ctrl *ctrl, bool new error = blk_mq_alloc_tag_set(&ctrl->admin_tag_set); if (error) goto out_put_dev; + ctrl->ctrl.admin_tagset = &ctrl->admin_tag_set; ctrl->ctrl.admin_q = blk_mq_init_queue(&ctrl->admin_tag_set); if (IS_ERR(ctrl->ctrl.admin_q)) {