[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240910095006.41027-1-xyh1996@gmail.com>
Date: Tue, 10 Sep 2024 17:50:06 +0800
From: Yihan Xin <xyh1996@...il.com>
To: Keith Busch <kbusch@...nel.org>,
Jens Axboe <axboe@...nel.dk>,
Christoph Hellwig <hch@....de>,
Sagi Grimberg <sagi@...mberg.me>
Cc: Yihan Xin <xyh1996@...il.com>,
linux-nvme@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] nvme: Force ns info updates on validation if NID is bogus
When validating a namespace, nvme_update_ns_info()
would be skipped if nsid changed. However, this
happens everytime the in-use controller is
reattached if NID is bogus, causing nsid not being
restored to the previous one, eg /dev/nvme0n2 ->
/dev/nvme0n1.
Don't skip ns info updates on this circumstance.
Signed-off-by: Yihan Xin <xyh1996@...il.com>
---
drivers/nvme/host/core.c | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1236e3aa00ed..c0875fb93b8d 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3979,11 +3979,24 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_info *info)
int ret = NVME_SC_INVALID_NS | NVME_STATUS_DNR;
if (!nvme_ns_ids_equal(&ns->head->ids, &info->ids)) {
- dev_err(ns->ctrl->device,
- "identifiers changed for nsid %d\n", ns->head->ns_id);
- goto out;
+ /*
+ * Don't skip ns info updates if the NID is bogus as it
+ * changes everytime the in-use controller is reattached
+ * to the bus and thus the namespace is recognized as
+ * another one.
+ */
+ if (ns->ctrl->quirks & NVME_QUIRK_BOGUS_NID) {
+ dev_info(ns->ctrl->device,
+ "Ignoring nsid change for bogus ns\n");
+ } else {
+ dev_err(ns->ctrl->device,
+ "identifiers changed for nsid %d\n",
+ ns->head->ns_id);
+ goto out;
+ }
}
+
ret = nvme_update_ns_info(ns, info);
out:
/*
--
2.46.0
Powered by blists - more mailing lists