nvmet: fix ns enable/disable possible hang

[ Upstream commit f97914e35fd98b2b18fb8a092e0a0799f73afdfe ]

When disabling an nvmet namespace, there is a period where the
subsys->lock is released, as the ns disable waits for backend IO to
complete, and the ns percpu ref to be properly killed. The original
intent was to avoid taking the subsystem lock for a prolong period as
other processes may need to acquire it (for example new incoming
connections).

However, it opens up a window where another process may come in and
enable the ns, (re)intiailizing the ns percpu_ref, causing the disable
sequence to hang.

Solve this by taking the global nvmet_config_sem over the entire configfs
enable/disable sequence.

Fixes: a07b4970f464 ("nvmet: add a generic NVMe target")
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index baf8a3e4ed12a23fac7593a3485545cdce58796f..9add3516ae2e299efe7651f0d7187c87047f9131 100644 (file)
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -507,10 +507,18 @@ static ssize_t nvmet_ns_enable_store(struct config_item *item,
        if (strtobool(page, &enable))
                return -EINVAL;
 
+       /*
+        * take a global nvmet_config_sem because the disable routine has a
+        * window where it releases the subsys-lock, giving a chance to
+        * a parallel enable to concurrently execute causing the disable to
+        * have a misaccounting of the ns percpu_ref.
+        */
+       down_write(&nvmet_config_sem);
        if (enable)
                ret = nvmet_ns_enable(ns);
        else
                nvmet_ns_disable(ns);
+       up_write(&nvmet_config_sem);
 
        return ret ? ret : count;
 }