Commit 59c7c3ca authored May 06, 2020 by Sagi Grimberg Committed by Jens Axboe May 09, 2020

nvme: fix possible hang when ns scanning fails during error recovery



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 205da243).

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: 22802bf7 ("nvme: Namepace identification descriptor list is optional")
Tested-by: Anton Eidelman <anton@lightbitslabs.com>
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

parent a8de6639

drivers/nvme/host/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message