Commit 9ad1927a authored by Keith Busch's avatar Keith Busch Committed by Jens Axboe

nvme: always search for namespace head

Even if a namespace reports it is not capable of sharing, search the
subsystem for a matching namespace head. If found, the driver should
reject that namespace since it's coming from an invalid configuration.
Signed-off-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent ac262508
...@@ -3489,8 +3489,7 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid, ...@@ -3489,8 +3489,7 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid,
goto out; goto out;
mutex_lock(&ctrl->subsys->lock); mutex_lock(&ctrl->subsys->lock);
if (is_shared) head = nvme_find_ns_head(ctrl->subsys, nsid);
head = nvme_find_ns_head(ctrl->subsys, nsid);
if (!head) { if (!head) {
head = nvme_alloc_ns_head(ctrl, nsid, &ids); head = nvme_alloc_ns_head(ctrl, nsid, &ids);
if (IS_ERR(head)) { if (IS_ERR(head)) {
...@@ -3498,6 +3497,14 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid, ...@@ -3498,6 +3497,14 @@ static int nvme_init_ns_head(struct nvme_ns *ns, unsigned nsid,
goto out_unlock; goto out_unlock;
} }
} else { } else {
if (!is_shared) {
dev_err(ctrl->device,
"Duplicate unshared namespace %d\n",
nsid);
ret = -EINVAL;
nvme_put_ns_head(head);
goto out_unlock;
}
if (!nvme_ns_ids_equal(&head->ids, &ids)) { if (!nvme_ns_ids_equal(&head->ids, &ids)) {
dev_err(ctrl->device, dev_err(ctrl->device,
"IDs don't match for shared namespace %d\n", "IDs don't match for shared namespace %d\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment