nvme-multipath: do not fall back to __nvme_find_path() for non-optimized paths (fbd6a42d) · Commits · 戴 / test

When nvme_round_robin_path() finds a valid namespace we should be using it; falling back to __nvme_find_path() for non-optimized paths will cause the result from nvme_round_robin_path() to be ignored for non-optimized paths. Fixes: ("nvme-multipath: round-robin I/O policy") Signed-off-by:

Martin Wilck <mwilck@suse.com> Signed-off-by:

Hannes Reinecke <hare@suse.de> Reviewed-by:

Sagi Grimberg <sagi@grimberg.me> Signed-off-by:

Christoph Hellwig <hch@lst.de>

drivers/nvme/host/multipath.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -281,10 +281,13 @@ inline struct nvme_ns nvme_find_path(struct nvme_ns_head head)
		struct nvme_ns *ns;

		ns = srcu_dereference(head->current_path[node], &head->srcu);
		if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_RR && ns)
		ns = nvme_round_robin_path(head, node, ns);
		if (unlikely(!ns \|\| !nvme_path_is_optimized(ns)))
		ns = __nvme_find_path(head, node);
		if (unlikely(!ns))
		return __nvme_find_path(head, node);

		if (READ_ONCE(head->subsys->iopolicy) == NVME_IOPOLICY_RR)
		return nvme_round_robin_path(head, node, ns);
		if (unlikely(!nvme_path_is_optimized(ns)))
		return __nvme_find_path(head, node);
		return ns;
		}

Admin message