nvme: retrigger ANA log update if group descriptor isn't found
authorHannes Reinecke <hare@suse.de>
Sat, 5 Dec 2020 15:29:01 +0000 (16:29 +0100)
committerChristoph Hellwig <hch@lst.de>
Tue, 6 Apr 2021 06:34:38 +0000 (08:34 +0200)
If ANA is enabled but no ANA group descriptor is found when creating
a new namespace the ANA log is most likely out of date, so trigger
a re-read. The namespace will be tagged with the NS_ANA_PENDING flag
to exclude it from path selection until the ANA log has been re-read.

Fixes: 32acab3181c7 ("nvme: implement multipath access to nvme subsystems")
Reported-by: Martin George <marting@netapp.com>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/multipath.c

index e62369d..f2d0ce0 100644 (file)
@@ -668,6 +668,10 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id)
                if (desc.state) {
                        /* found the group desc: update */
                        nvme_update_ns_ana_state(&desc, ns);
+               } else {
+                       /* group desc not found: trigger a re-read */
+                       set_bit(NVME_NS_ANA_PENDING, &ns->flags);
+                       queue_work(nvme_wq, &ns->ctrl->ana_work);
                }
        } else {
                ns->ana_state = NVME_ANA_OPTIMIZED;