From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org,
linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>,
Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>,
Max Gurtovoy <maxg@mellanox.com>,
Stephen Bates <sbates@raithlin.com>,
Logan Gunthorpe <logang@deltatee.com>,
Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Subject: [PATCH v7 08/14] nvmet-core: allow one host per passthru-ctrl
Date: Thu, 1 Aug 2019 17:45:07 -0600 [thread overview]
Message-ID: <20190801234514.7941-9-logang@deltatee.com> (raw)
In-Reply-To: <20190801234514.7941-1-logang@deltatee.com>
This patch rejects any new connection to the passthru-ctrl if this
controller is already connected to a different host. At the time of
allocating the controller we check if the subsys associated with
the passthru ctrl is already connected to a host and reject it
if the hostnqn differs.
Connections from the same host (by hostnqn) are supported to allow
for multipath.
[chaitanya.kulkarni@wdc.com: based conceptually on a similar patch but
different implementation]
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
---
drivers/nvme/target/core.c | 4 ++++
drivers/nvme/target/io-cmd-passthru.c | 31 +++++++++++++++++++++++++++
drivers/nvme/target/nvmet.h | 7 ++++++
3 files changed, 42 insertions(+)
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 2e75968af7f4..c655f26db3da 100644
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -1278,6 +1278,10 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
if (!ctrl->sqs)
goto out_free_cqs;
+ ret = nvmet_passthru_alloc_ctrl(subsys, hostnqn);
+ if (ret)
+ goto out_free_sqs;
+
ret = ida_simple_get(&cntlid_ida,
NVME_CNTLID_MIN, NVME_CNTLID_MAX,
GFP_KERNEL);
diff --git a/drivers/nvme/target/io-cmd-passthru.c b/drivers/nvme/target/io-cmd-passthru.c
index b199785500ad..06a919283cc5 100644
--- a/drivers/nvme/target/io-cmd-passthru.c
+++ b/drivers/nvme/target/io-cmd-passthru.c
@@ -104,6 +104,37 @@ void nvmet_passthru_subsys_free(struct nvmet_subsys *subsys)
mutex_unlock(&subsys->lock);
}
+int nvmet_passthru_alloc_ctrl(struct nvmet_subsys *subsys,
+ const char *hostnqn)
+{
+ struct nvmet_ctrl *ctrl;
+
+ /*
+ * Check here if this subsystem is already connected to the passthru
+ * ctrl. We allow only one host to connect to a given passthru
+ * subsystem.
+ */
+ int rc = 0;
+
+ mutex_lock(&subsys->lock);
+
+ if (!subsys->passthru_ctrl)
+ goto out;
+
+ if (list_empty(&subsys->ctrls))
+ goto out;
+
+ ctrl = list_first_entry(&subsys->ctrls, struct nvmet_ctrl,
+ subsys_entry);
+
+ if (strcmp(hostnqn, ctrl->hostnqn))
+ rc = -ENODEV;
+
+out:
+ mutex_unlock(&subsys->lock);
+ return rc;
+}
+
static void nvmet_passthru_req_complete(struct nvmet_req *req,
struct request *rq, u16 status)
{
diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index aff4db03269d..6436cb990905 100644
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -513,6 +513,8 @@ void nvmet_passthru_destroy(void);
void nvmet_passthru_subsys_free(struct nvmet_subsys *subsys);
int nvmet_passthru_ctrl_enable(struct nvmet_subsys *subsys);
void nvmet_passthru_ctrl_disable(struct nvmet_subsys *subsys);
+int nvmet_passthru_alloc_ctrl(struct nvmet_subsys *subsys,
+ const char *hostnqn);
u16 nvmet_parse_passthru_cmd(struct nvmet_req *req);
static inline
@@ -536,6 +538,11 @@ static inline void nvmet_passthru_subsys_free(struct nvmet_subsys *subsys)
static inline void nvmet_passthru_ctrl_disable(struct nvmet_subsys *subsys)
{
}
+static inline int nvmet_passthru_alloc_ctrl(struct nvmet_subsys *subsys,
+ const char *hostnqn)
+{
+ return 0;
+}
static inline u16 nvmet_parse_passthru_cmd(struct nvmet_req *req)
{
return 0;
--
2.20.1
next prev parent reply other threads:[~2019-08-01 23:45 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 23:44 [PATCH v7 00/14] nvmet: add target passthru commands support Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 01/14] nvme-core: introduce nvme_ctrl_get_by_path() Logan Gunthorpe
2019-08-14 14:20 ` Max Gurtovoy
2019-08-15 11:46 ` Max Gurtovoy
2019-08-15 15:59 ` Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 02/14] nvme-core: export existing ctrl and ns interfaces Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 03/14] nvmet: add return value to nvmet_add_async_event() Logan Gunthorpe
2019-08-14 14:26 ` Max Gurtovoy
2019-08-14 16:59 ` Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 04/14] nvmet: make nvmet_copy_ns_identifier() non-static Logan Gunthorpe
2019-08-14 14:29 ` Max Gurtovoy
2019-08-15 7:15 ` Chaitanya Kulkarni
2019-08-01 23:45 ` [PATCH v7 05/14] nvmet-passthru: update KConfig with config passthru option Logan Gunthorpe
2019-08-14 14:31 ` Max Gurtovoy
2019-08-01 23:45 ` [PATCH v7 06/14] nvmet-passthru: add passthru code to process commands Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 07/14] nvmet-passthru: add enable/disable helpers Logan Gunthorpe
2019-08-15 12:20 ` Max Gurtovoy
2019-08-15 16:02 ` Logan Gunthorpe
2019-08-01 23:45 ` Logan Gunthorpe [this message]
2019-08-15 12:36 ` [PATCH v7 08/14] nvmet-core: allow one host per passthru-ctrl Max Gurtovoy
2019-08-15 16:06 ` Logan Gunthorpe
2019-08-18 10:33 ` Max Gurtovoy
2019-08-22 0:09 ` Sagi Grimberg
2019-08-22 8:50 ` Max Gurtovoy
2019-08-22 17:41 ` Sagi Grimberg
2019-08-22 19:17 ` Sagi Grimberg
2019-08-22 19:41 ` Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 09/14] nvmet-core: don't check the data len for pt-ctrl Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 10/14] nvmet-tcp: don't check data_len in nvmet_tcp_map_data() Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 11/14] nvmet-configfs: introduce passthru configfs interface Logan Gunthorpe
2019-08-15 12:46 ` Max Gurtovoy
2019-08-01 23:45 ` [PATCH v7 12/14] block: don't check blk_rq_is_passthrough() in blk_do_io_stat() Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 13/14] block: call blk_account_io_start() in blk_execute_rq_nowait() Logan Gunthorpe
2019-08-01 23:45 ` [PATCH v7 14/14] nvmet-passthru: support block accounting Logan Gunthorpe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190801234514.7941-9-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=Chaitanya.Kulkarni@wdc.com \
--cc=axboe@fb.com \
--cc=hch@lst.de \
--cc=kbusch@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=maxg@mellanox.com \
--cc=sagi@grimberg.me \
--cc=sbates@raithlin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).