diff options
authorSagi Grimberg <>2020-05-06 15:44:02 -0700
committerJens Axboe <>2020-05-09 16:07:58 -0600
commit59c7c3caaaf8750df4ec3255082f15eb4e371514 (patch)
parenta8de6639169b90e3dc4f27e752a3c5abac5e90da (diff)
nvme: fix possible hang when ns scanning fails during error recoveryblock-5.7-2020-05-09
When the controller is reconnecting, the host fails I/O and admin commands as the host cannot reach the controller. ns scanning may revalidate namespaces during that period and it is wrong to remove namespaces due to these failures as we may hang (see 205da2434301). One command that may fail is nvme_identify_ns_descs. Since we return success due to having ns identify descriptor list optional, we continue to compare ns identifiers in nvme_revalidate_disk, obviously fail and return -ENODEV to nvme_validate_ns, which will remove the namespace. Exactly what we don't want to happen. Fixes: 22802bf742c2 ("nvme: Namepace identification descriptor list is optional") Tested-by: Anton Eidelman <> Signed-off-by: Sagi Grimberg <> Reviewed-by: Keith Busch <> Signed-off-by: Christoph Hellwig <> Signed-off-by: Jens Axboe <>
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index f2adea96b04c..f3c037f5a9ba 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1110,7 +1110,7 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid,
* Don't treat an error as fatal, as we potentially already
* have a NGUID or EUI-64.
- if (status > 0)
+ if (status > 0 && !(status & NVME_SC_DNR))
status = 0;
goto free_data;