Skip to content

Commit 79f528a

Browse files
ttooxxaaChristoph Hellwig
authored andcommitted
nvme-multipath: fix ANA state updates when a namespace is not present
nvme_update_ana_state() has a deficiency that results in a failure to properly update the ana state for a namespace in the following case: NSIDs in ctrl->namespaces: 1, 3, 4 NSIDs in desc->nsids: 1, 2, 3, 4 Loop iteration 0: ns index = 0, n = 0, ns->head->ns_id = 1, nsid = 1, MATCH. Loop iteration 1: ns index = 1, n = 1, ns->head->ns_id = 3, nsid = 2, NO MATCH. Loop iteration 2: ns index = 2, n = 2, ns->head->ns_id = 4, nsid = 4, MATCH. Where the update to the ANA state of NSID 3 is missed. To fix this increment n and retry the update with the same ns when ns->head->ns_id is higher than nsid, Signed-off-by: Anton Eidelman <anton@lightbitslabs.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
1 parent 9edceaf commit 79f528a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

drivers/nvme/host/multipath.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -600,14 +600,17 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
600600

601601
down_read(&ctrl->namespaces_rwsem);
602602
list_for_each_entry(ns, &ctrl->namespaces, list) {
603-
unsigned nsid = le32_to_cpu(desc->nsids[n]);
604-
603+
unsigned nsid;
604+
again:
605+
nsid = le32_to_cpu(desc->nsids[n]);
605606
if (ns->head->ns_id < nsid)
606607
continue;
607608
if (ns->head->ns_id == nsid)
608609
nvme_update_ns_ana_state(desc, ns);
609610
if (++n == nr_nsids)
610611
break;
612+
if (ns->head->ns_id > nsid)
613+
goto again;
611614
}
612615
up_read(&ctrl->namespaces_rwsem);
613616
return 0;

0 commit comments

Comments
 (0)