nvmet: allow host connect even if no allowed subsystems are exported

It is perfectly valid that a host connects to a discovery subsystem
and gets an empty discovery log page since no subsystems are
provisioned to it. No reason to disallow connecting to the discovery
subsystem all together.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Jay Sternberg <jay.e.sternberg@intel.com>
Reviewed-by: Phil Cayton <phil.cayton@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 46345c3f9d4a42bb614d00e3ac359f37ad32776f..849080b4115c1b6eb9e83af0ba2df45e5520999f 100644 (file)
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -1032,14 +1032,18 @@ u16 nvmet_check_ctrl_status(struct nvmet_req *req, struct nvme_command *cmd)
        return 0;
 }
 
-static bool __nvmet_host_allowed(struct nvmet_subsys *subsys,
-               const char *hostnqn)
+bool nvmet_host_allowed(struct nvmet_subsys *subsys, const char *hostnqn)
 {
        struct nvmet_host_link *p;
 
+       lockdep_assert_held(&nvmet_config_sem);
+
        if (subsys->allow_any_host)
                return true;
 
+       if (subsys->type == NVME_NQN_DISC) /* allow all access to disc subsys */
+               return true;
+
        list_for_each_entry(p, &subsys->hosts, entry) {
                if (!strcmp(nvmet_host_name(p->host), hostnqn))
                        return true;
@@ -1048,30 +1052,6 @@ static bool __nvmet_host_allowed(struct nvmet_subsys *subsys,
        return false;
 }
 
-static bool nvmet_host_discovery_allowed(struct nvmet_req *req,
-               const char *hostnqn)
-{
-       struct nvmet_subsys_link *s;
-
-       list_for_each_entry(s, &req->port->subsystems, entry) {
-               if (__nvmet_host_allowed(s->subsys, hostnqn))
-                       return true;
-       }
-
-       return false;
-}
-
-bool nvmet_host_allowed(struct nvmet_req *req, struct nvmet_subsys *subsys,
-               const char *hostnqn)
-{
-       lockdep_assert_held(&nvmet_config_sem);
-
-       if (subsys->type == NVME_NQN_DISC)
-               return nvmet_host_discovery_allowed(req, hostnqn);
-       else
-               return __nvmet_host_allowed(subsys, hostnqn);
-}
-
 /*
  * Note: ctrl->subsys->lock should be held when calling this function
  */
@@ -1122,7 +1102,7 @@ u16 nvmet_alloc_ctrl(const char *subsysnqn, const char *hostnqn,
 
        status = NVME_SC_CONNECT_INVALID_PARAM | NVME_SC_DNR;
        down_read(&nvmet_config_sem);
-       if (!nvmet_host_allowed(req, subsys, hostnqn)) {
+       if (!nvmet_host_allowed(subsys, hostnqn)) {
                pr_info("connect by host %s for subsystem %s not allowed\n",
                        hostnqn, subsysnqn);
                req->rsp->result.u32 = IPO_IATTR_CONNECT_DATA(hostnqn);

diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index 050e4d759b65de753d3a0cbc67797e26cb1a974b..5fbb1bb2c4fc059171c6af7020e76fbc8426a8d9 100644 (file)
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -107,7 +107,7 @@ static void nvmet_execute_get_disc_log_page(struct nvmet_req *req)
 
        down_read(&nvmet_config_sem);
        list_for_each_entry(p, &req->port->subsystems, entry) {
-               if (!nvmet_host_allowed(req, p->subsys, ctrl->hostnqn))
+               if (!nvmet_host_allowed(p->subsys, ctrl->hostnqn))
                        continue;
                if (residual_len >= entry_size) {
                        char traddr[NVMF_TRADDR_SIZE];

diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index bc99c700a5834ff0b92875e9a55084f66fdfa2f0..05b98f25d65cb6192e0f7b63f82c9273ddc17549 100644 (file)
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -468,8 +468,7 @@ extern u32 nvmet_ana_group_enabled[NVMET_MAX_ANAGRPS + 1];
 extern u64 nvmet_ana_chgcnt;
 extern struct rw_semaphore nvmet_ana_sem;
 
-bool nvmet_host_allowed(struct nvmet_req *req, struct nvmet_subsys *subsys,
-               const char *hostnqn);
+bool nvmet_host_allowed(struct nvmet_subsys *subsys, const char *hostnqn);
 
 int nvmet_bdev_ns_enable(struct nvmet_ns *ns);
 int nvmet_file_ns_enable(struct nvmet_ns *ns);