From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A1F6C433E6 for ; Thu, 16 Jul 2020 20:33:49 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2022F207E8 for ; Thu, 16 Jul 2020 20:33:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ixcheupx"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=deltatee.com header.i=@deltatee.com header.b="kSCa4Jm3" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2022F207E8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=deltatee.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Subject:MIME-Version:References:In-Reply-To: Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SDFQT2C2bIEmo+2/MOLpoUXIAWOtvZWdRdVRCFZurb8=; b=IxcheupxL8vo6v30DTEdOLJdL a3jk/YTleTByKKr4Md8kiV5eYviBIcJVNrizKA8rp36vrNfZaNQK4P6vCbqZ8685pTZwHNfViDCzo XUD+dmZzHilrNIeRNKD8dXgh9X7mtHtVk17frn+doaFI4EDnEVEljqlYHkcKKhkBjHHtSTUPcxbWz XCiaEcA/kDNSjiUjAuSPPtqnmDd5MuffF+WPeVye6vVXNMUNBXHkuM0/T4FskJaGqTwfDiyUp8YQy gjVIfY0kGQmAgLA+TzC2VvDuJ2DkXEDcnati+a1fJCVMrog/Hw5P9yFoElMF9BOLTb8zetjT3AdMM iHt0jlEQg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwAZf-0007Sf-2j; Thu, 16 Jul 2020 20:33:47 +0000 Received: from ale.deltatee.com ([204.191.154.188]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwAZQ-0007NG-N3 for linux-nvme@lists.infradead.org; Thu, 16 Jul 2020 20:33:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=deltatee.com; s=20200525; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To: Content-Type: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=klEPLgc2P1bm0YLHvOahwUd8vB/Vch7Ho+KiFwLQTiU=; b=kSCa4Jm3a1uHZAj6Hj+MKVMe0G FARntbduT2HzpqzMy1nFHIsgO5zq9Doo1RQPueXU8GXsAUwDujd9oP0f6S5zY/bhj1EGa5PGf4wJc ZP2Daw5ji6jTzl+IbPITVC/6+evZYQU3wA1IJcnIEjviVMl8ILqvnbFuX4M3/H6Ywj0Iu1etapY5Z za92iTsyM4kIuJcwtOVHPfwKkryydZGviczQoMUUxnMd3kf8uXGubVoMHiBFREC3kNgSfmAnxz2st AQY3uFVmc7r9S/QBKebrhk0/RztX0N/F22Qnsp3FXnM+j1J1GMuqku5EFg+Hy+/IW6ezbY9oMQVWC j+FpI9ZA==; Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jwAZO-0005uJ-Kz; Thu, 16 Jul 2020 14:33:32 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.92) (envelope-from ) id 1jwAZF-0004BZ-7L; Thu, 16 Jul 2020 14:33:21 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org Date: Thu, 16 Jul 2020 14:33:16 -0600 Message-Id: <20200716203319.16022-7-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200716203319.16022-1-logang@deltatee.com> References: <20200716203319.16022-1-logang@deltatee.com> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me, kbusch@kernel.org, axboe@fb.com, maxg@mellanox.com, sbates@raithlin.com, logang@deltatee.com, Chaitanya.Kulkarni@wdc.com, chaitanya.kulkarni@wdc.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH v15 6/9] nvme: Export existing nvme core functions X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200716_163332_848836_44AFE78C X-CRM114-Status: GOOD ( 11.34 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sagi Grimberg , Chaitanya Kulkarni , Stephen Bates , Jens Axboe , Keith Busch , Max Gurtovoy , Logan Gunthorpe , Christoph Hellwig Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org Export nvme_put_ns(), nvme_command_effects(), nvme_execute_passthru_rq() and nvme_find_get_ns() for use in the nvmet passthru code. The exports are conditional on CONFIG_NVME_TARGET_PASSTHRU. Based-on-a-patch-by: Chaitanya Kulkarni Signed-off-by: Logan Gunthorpe Reviewed-by: Max Gurtovoy Reviewed-by: Sagi Grimberg --- drivers/nvme/host/core.c | 14 +++++++++----- drivers/nvme/host/nvme.h | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6e7d5cb43a06..2adddc69467c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -454,7 +454,7 @@ static void nvme_free_ns(struct kref *kref) kfree(ns); } -static void nvme_put_ns(struct nvme_ns *ns) +void nvme_put_ns(struct nvme_ns *ns) { kref_put(&ns->kref, nvme_free_ns); } @@ -911,8 +911,8 @@ static void *nvme_add_user_metadata(struct bio *bio, void __user *ubuf, return ERR_PTR(ret); } -static u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - u8 opcode) +u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, + u8 opcode) { u32 effects = 0; @@ -1008,7 +1008,7 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects) } } -static void nvme_execute_passthru_rq(struct request *rq) +void nvme_execute_passthru_rq(struct request *rq) { struct nvme_command *cmd = nvme_req(rq)->cmd; struct nvme_ctrl *ctrl = nvme_req(rq)->ctrl; @@ -3812,7 +3812,7 @@ static int ns_cmp(void *priv, struct list_head *a, struct list_head *b) return nsa->head->ns_id - nsb->head->ns_id; } -static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) +struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) { struct nvme_ns *ns, *ret = NULL; @@ -4578,6 +4578,10 @@ EXPORT_SYMBOL_GPL(nvme_sync_queues); * use by the nvmet-passthru and should not be used for * other things. */ +EXPORT_SYMBOL_GPL(nvme_put_ns); +EXPORT_SYMBOL_GPL(nvme_command_effects); +EXPORT_SYMBOL_GPL(nvme_execute_passthru_rq); +EXPORT_SYMBOL_GPL(nvme_find_get_ns); struct nvme_ctrl *nvme_ctrl_get_by_path(const char *path) { diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 485492a98ef5..87fb9e22c79d 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -767,6 +767,11 @@ static inline void nvme_hwmon_init(struct nvme_ctrl *ctrl) { } * These functions are only for use by nvmet-passthru and are only exported * if CONFIG_NVME_TARGET_PASSTHRU is set. */ +void nvme_put_ns(struct nvme_ns *ns); +u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, + u8 opcode); +void nvme_execute_passthru_rq(struct request *rq); +struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned int nsid); struct nvme_ctrl *nvme_ctrl_get_by_path(const char *path); #endif /* _NVME_H */ -- 2.20.1 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86F46C433E3 for ; Thu, 16 Jul 2020 21:17:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5F54320809 for ; Thu, 16 Jul 2020 21:17:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=deltatee.com header.i=@deltatee.com header.b="kSCa4Jm3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727829AbgGPVR6 (ORCPT ); Thu, 16 Jul 2020 17:17:58 -0400 Received: from ale.deltatee.com ([204.191.154.188]:47686 "EHLO ale.deltatee.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727120AbgGPVRx (ORCPT ); Thu, 16 Jul 2020 17:17:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=deltatee.com; s=20200525; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Cc:To:From:Sender:Reply-To: Content-Type: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=klEPLgc2P1bm0YLHvOahwUd8vB/Vch7Ho+KiFwLQTiU=; b=kSCa4Jm3a1uHZAj6Hj+MKVMe0G FARntbduT2HzpqzMy1nFHIsgO5zq9Doo1RQPueXU8GXsAUwDujd9oP0f6S5zY/bhj1EGa5PGf4wJc ZP2Daw5ji6jTzl+IbPITVC/6+evZYQU3wA1IJcnIEjviVMl8ILqvnbFuX4M3/H6Ywj0Iu1etapY5Z za92iTsyM4kIuJcwtOVHPfwKkryydZGviczQoMUUxnMd3kf8uXGubVoMHiBFREC3kNgSfmAnxz2st AQY3uFVmc7r9S/QBKebrhk0/RztX0N/F22Qnsp3FXnM+j1J1GMuqku5EFg+Hy+/IW6ezbY9oMQVWC j+FpI9ZA==; Received: from cgy1-donard.priv.deltatee.com ([172.16.1.31]) by ale.deltatee.com with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jwAZO-0005uJ-Kz; Thu, 16 Jul 2020 14:33:32 -0600 Received: from gunthorp by cgy1-donard.priv.deltatee.com with local (Exim 4.92) (envelope-from ) id 1jwAZF-0004BZ-7L; Thu, 16 Jul 2020 14:33:21 -0600 From: Logan Gunthorpe To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org Cc: Christoph Hellwig , Sagi Grimberg , Keith Busch , Jens Axboe , Chaitanya Kulkarni , Max Gurtovoy , Stephen Bates , Logan Gunthorpe , Chaitanya Kulkarni Date: Thu, 16 Jul 2020 14:33:16 -0600 Message-Id: <20200716203319.16022-7-logang@deltatee.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200716203319.16022-1-logang@deltatee.com> References: <20200716203319.16022-1-logang@deltatee.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 172.16.1.31 X-SA-Exim-Rcpt-To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, hch@lst.de, sagi@grimberg.me, kbusch@kernel.org, axboe@fb.com, maxg@mellanox.com, sbates@raithlin.com, logang@deltatee.com, Chaitanya.Kulkarni@wdc.com, chaitanya.kulkarni@wdc.com X-SA-Exim-Mail-From: gunthorp@deltatee.com Subject: [PATCH v15 6/9] nvme: Export existing nvme core functions X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on ale.deltatee.com) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Export nvme_put_ns(), nvme_command_effects(), nvme_execute_passthru_rq() and nvme_find_get_ns() for use in the nvmet passthru code. The exports are conditional on CONFIG_NVME_TARGET_PASSTHRU. Based-on-a-patch-by: Chaitanya Kulkarni Signed-off-by: Logan Gunthorpe Reviewed-by: Max Gurtovoy Reviewed-by: Sagi Grimberg --- drivers/nvme/host/core.c | 14 +++++++++----- drivers/nvme/host/nvme.h | 5 +++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6e7d5cb43a06..2adddc69467c 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -454,7 +454,7 @@ static void nvme_free_ns(struct kref *kref) kfree(ns); } -static void nvme_put_ns(struct nvme_ns *ns) +void nvme_put_ns(struct nvme_ns *ns) { kref_put(&ns->kref, nvme_free_ns); } @@ -911,8 +911,8 @@ static void *nvme_add_user_metadata(struct bio *bio, void __user *ubuf, return ERR_PTR(ret); } -static u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, - u8 opcode) +u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, + u8 opcode) { u32 effects = 0; @@ -1008,7 +1008,7 @@ static void nvme_passthru_end(struct nvme_ctrl *ctrl, u32 effects) } } -static void nvme_execute_passthru_rq(struct request *rq) +void nvme_execute_passthru_rq(struct request *rq) { struct nvme_command *cmd = nvme_req(rq)->cmd; struct nvme_ctrl *ctrl = nvme_req(rq)->ctrl; @@ -3812,7 +3812,7 @@ static int ns_cmp(void *priv, struct list_head *a, struct list_head *b) return nsa->head->ns_id - nsb->head->ns_id; } -static struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) +struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned nsid) { struct nvme_ns *ns, *ret = NULL; @@ -4578,6 +4578,10 @@ EXPORT_SYMBOL_GPL(nvme_sync_queues); * use by the nvmet-passthru and should not be used for * other things. */ +EXPORT_SYMBOL_GPL(nvme_put_ns); +EXPORT_SYMBOL_GPL(nvme_command_effects); +EXPORT_SYMBOL_GPL(nvme_execute_passthru_rq); +EXPORT_SYMBOL_GPL(nvme_find_get_ns); struct nvme_ctrl *nvme_ctrl_get_by_path(const char *path) { diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 485492a98ef5..87fb9e22c79d 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -767,6 +767,11 @@ static inline void nvme_hwmon_init(struct nvme_ctrl *ctrl) { } * These functions are only for use by nvmet-passthru and are only exported * if CONFIG_NVME_TARGET_PASSTHRU is set. */ +void nvme_put_ns(struct nvme_ns *ns); +u32 nvme_command_effects(struct nvme_ctrl *ctrl, struct nvme_ns *ns, + u8 opcode); +void nvme_execute_passthru_rq(struct request *rq); +struct nvme_ns *nvme_find_get_ns(struct nvme_ctrl *ctrl, unsigned int nsid); struct nvme_ctrl *nvme_ctrl_get_by_path(const char *path); #endif /* _NVME_H */ -- 2.20.1