nvme: multipath: round-robin: fix logic for non-optimized paths
PATCH 1/2 nvme: multipath: round-robin: fix logic for non-optimized paths
From: Martin Wilck <[email protected]>
Handle the special case where we have exactly one optimized path, which we should keep using in this case. Also, use the next non-optimized path, not the last one.
--- drivers/nvme/host/multipath.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
drivers/nvme/host/multipath.c +11 -10
@@ -224,13 +224,8 @@ static struct nvme_ns *nvme_next_ns(struct nvme_ns_head *head,static struct nvme_ns *nvme_round_robin_path (struct nvme_ns_head *head,int node,struct nvme_ns *old) { -struct nvme_ns *ns, *found, *fallback =NULL ; +struct nvme_ns *ns, *found =NULL ; -if (list_is_singular (&head->list)) { -if (nvme_path_is_disabled (old)) -return NULL ; -return old; - } for (ns = nvme_next_ns(head, old); ns != old;
@@ -242,13 +237,19 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, found = ns; goto out; } -if (ns->ana_state ==NVME_ANA_NONOPTIMIZED ) - fallback = ns; +if (!found && ns->ana_state ==NVME_ANA_NONOPTIMIZED ) + found = ns; } -if (!fallback) +/* Fall back to old if it's better than the others */ +if (!nvme_path_is_disabled (old) && + (old->ana_state ==NVME_ANA_OPTIMIZED || + (!found && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) + found = old; + +if (!found)return NULL ; - found = fallback; + out:rcu_assign_pointer (head->current_path[node], found);return found;
Signature · 7 lines
2.26.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
PATCH 2/2 nvme: multipath: round-robin: don't fall back to numa
From: Martin Wilck <[email protected]>
Currently, if the RR path selector returns a non-optimized path, we fall back to __nvme_find_path(), which uses the logic of the numa path selector. For a given numa node, this always chooses the same path, thus preventing round-robin logic on non-optimized paths.
By handling the situation where the current ns is NULL in nvme_round_robin_path(), we can avoid falling back from round-robin to NUMA, fixing the issue. The iopolicy case distinction in __nvme_find_path() can be skipped now.
--- drivers/nvme/host/multipath.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)
drivers/nvme/host/multipath.c +15 -8
@@ -181,10 +181,7 @@ static struct nvme_ns *__nvme_find_path(struct nvme_ns_head *head, int node)if (nvme_path_is_disabled (ns))continue ; -if (READ_ONCE (head->subsys->iopolicy) ==NVME_IOPOLICY_NUMA ) - distance =node_distance (node, ns->ctrl->numa_node); -else - distance =LOCAL_DISTANCE ; + distance =node_distance (node, ns->ctrl->numa_node);switch (ns->ana_state) {case NVME_ANA_OPTIMIZED :
@@ -225,7 +222,13 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, int node, struct nvme_ns *old) { struct nvme_ns *ns, *found = NULL; +bool was_null = (old ==NULL ); +if (unlikely (was_null)) + old =list_first_or_null_rcu (&head->list, + struct nvme_ns, siblings); +if (unlikely (!old)) +return NULL ; for (ns = nvme_next_ns(head, old); ns != old;
@@ -244,9 +247,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head,/* Fall back to old if it's better than the others */ if (!nvme_path_is_disabled (old) && (old->ana_state ==NVME_ANA_OPTIMIZED || - (!found && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) + (!found && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) { found = old; - +if (!was_null) +/* No need to switch */ +return found; + }if (!found)return NULL ;
@@ -267,8 +273,9 @@ 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 (READ_ONCE (head->subsys->iopolicy) ==NVME_IOPOLICY_RR ) +return nvme_round_robin_path (head, node, ns); +if (unlikely (!ns || !nvme_path_is_optimized (ns))) ns =__nvme_find_path (head, node);return ns;
Signature · 7 lines
2.26.2 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Re: [PATCH 2/2] nvme: multipath: round-robin: don't fall back to numa
Quoted 66 lines · On 7/16/20 9:59 PM, [email protected] wrote:
From: Martin Wilck <[email protected]>
Currently, if the RR path selector returns a non-optimized path, we fall back to
__nvme_find_path(), which uses the logic of the numa path selector. For a given numa node, this always chooses the same path, thus preventing round-robin logic on non-optimized paths.By handling the situation where the current ns is NULL in
nvme_round_robin_path(), we can avoid falling back from round-robin to NUMA, fixing the issue. The iopolicy case distinction in__nvme_find_path()can be skipped now.Signed-off-by Martin Wilck <[email protected]>--- drivers/nvme/host/multipath.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-)drivers/nvme/host/multipath.c +12
-6@@ -181,10 +181,7 @@ static struct nvme_ns *__nvme_find_path(struct nvme_ns_head *head, int node)if (nvme_path_is_disabled (ns))continue ; -if (READ_ONCE (head->subsys->iopolicy) ==NVME_IOPOLICY_NUMA ) - distance =node_distance (node, ns->ctrl->numa_node); -else - distance =LOCAL_DISTANCE ; + distance =node_distance (node, ns->ctrl->numa_node);switch (ns->ana_state) {case NVME_ANA_OPTIMIZED :@@ -225,7 +222,13 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, int node, struct nvme_ns *old) { struct nvme_ns *ns, *found = NULL; +bool was_null = (old ==NULL ); +if (unlikely (was_null)) + old =list_first_or_null_rcu (&head->list, + struct nvme_ns, siblings); +if (unlikely (!old)) +return NULL ; for (ns = nvme_next_ns(head, old); ns != old;@@ -244,9 +247,12 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head,/* Fall back to old if it's better than the others */ if (!nvme_path_is_disabled (old) && (old->ana_state ==NVME_ANA_OPTIMIZED || - (!found && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) + (!found && old->ana_state ==NVME_ANA_NONOPTIMIZED ))) { found = old; - +if (!was_null) +/* No need to switch */ +return found; + }if (!found)return NULL ;@@ -267,8 +273,9 @@ inline struct nvme_ns *nvme_find_path(struct nvme_ns_head *head)struct nvme_ns *ns;
drivers/nvme/host/multipath.c inline struct nvme_ns *nvme_find_path(struct nvme_ns_head *head) · line 281
Quoted 10 lines
drivers/nvme/host/multipath.c +3
-2ns =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 (READ_ONCE (head->subsys->iopolicy) ==NVME_IOPOLICY_RR ) +return nvme_round_robin_path (head, node, ns); +if (unlikely (!ns || !nvme_path_is_optimized (ns))) ns =__nvme_find_path (head, node);return ns;
Why not modify the last if clause to just
if (unlikely(!ns))
?
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 20 lines · On 7/16/20 9:59 PM, [email protected] wrote:
From: Martin Wilck <[email protected]>
Handle the special case where we have exactly one optimized path, which we should keep using in this case. Also, use the next non-optimized path, not the last one.
Signed-off-by Martin Wilck <[email protected]>--- drivers/nvme/host/multipath.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)drivers/nvme/host/multipath.c +0
-1@@ -224,13 +224,8 @@ static struct nvme_ns *nvme_next_ns(struct nvme_ns_head *head,static struct nvme_ns *nvme_round_robin_path (struct nvme_ns_head *head,int node,struct nvme_ns *old) { -struct nvme_ns *ns, *found, *fallback =NULL ;
drivers/nvme/host/multipath.c static struct nvme_ns *nvme_next_ns(struct nvme_ns_head *head, · line 231
Quoted 10 lines
drivers/nvme/host/multipath.c +1
-5+struct nvme_ns *ns, *found =NULL ; -if (list_is_singular (&head->list)) { -if (nvme_path_is_disabled (old)) -return NULL ; -return old; - } for (ns = nvme_next_ns(head, old); ns != old;
Why do you remove this?
This is an optimisation for single paths, and should stay.
Quoted 15 lines
drivers/nvme/host/multipath.c +5
-3@@ -242,13 +237,19 @@ static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, found = ns; goto out; } -if (ns->ana_state ==NVME_ANA_NONOPTIMIZED ) - fallback = ns; +if (!found && ns->ana_state ==NVME_ANA_NONOPTIMIZED ) + found = ns; } -if (!fallback) +/* Fall back to old if it's better than the others */ + if (!nvme_path_is_disabled(old) && + (old->ana_state == NVME_ANA_OPTIMIZED ||
drivers/nvme/host/multipath.c static struct nvme_ns *nvme_round_robin_path(struct nvme_ns_head *head, · line 255
Quoted 10 lines
drivers/nvme/host/multipath.c +5
-1+ (!found && old->ana_state == NVME_ANA_NONOPTIMIZED))) + found = old; + +if (!found)return NULL ; - found = fallback; + out:rcu_assign_pointer (head->current_path[node], found);return found;
The problem is that we should have tested all paths from (old + 1) up to and including (old); currently we're only testing paths from (old + 1) up to, but excluding, (old).
I would rather use this explanation instead of referring to 'better' paths; at the very least please name it 'optimal'.
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 6 lines
From: Martin Wilck <[email protected]>
Handle the special case where we have exactly one optimized path, which we should keep using in this case. Also, use the next non-optimized path, not the last one.
Not sure I understand, does this patch also use nonopt paths if we have a single opt path?
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 9 lines · Sagi Grimberg
Quoted 6 lines
From: Martin Wilck <[email protected]>
Handle the special case where we have exactly one optimized path, which we should keep using in this case. Also, use the next non-optimized path, not the last one.
Not sure I understand, does this patch also use nonopt paths if we have a single opt path?
Indeed, the latter change should be removed from this patch.
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 9 lines
Quoted 7 lines
Quoted 4 lines
Handle the special case where we have exactly one optimized path, which we should keep using in this case. Also, use the next non-optimized path, not the last one.
Not sure I understand, does this patch also use nonopt paths if we have a single opt path?
Indeed, the latter change should be removed from this patch.
Why should we even do this? we have a clear indication from the controller on ns access. If we have a optimized path we should never select any non-optimized path.
What if a non-optimized path has a 50x higher access latency? it's just wrong to use this path...
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Quoted 8 lines · Sagi Grimberg
Quoted 8 lines
Quoted 7 lines
Quoted 4 lines
Handle the special case where we have exactly one optimized path, which we should keep using in this case. Also, use the next non-optimized path, not the last one.
Not sure I understand, does this patch also use nonopt paths if we have a single opt path?
Quoted 8 lines
Quoted 1 line
Indeed, the latter change should be removed from this patch.
Why should we even do this? we have a clear indication from the controller on ns access. If we have a optimized path we should never select any non-optimized path.
What if a non-optimized path has a 50x higher access latency? it's just wrong to use this path...
Errm. I think Martin didn't state clearly what the problem was.
The problem is when the _current_ path is the only optimized path, and all other paths are non-optimized:
for (ns = nvme_next_ns(head, old);
ns != old;
ns = nvme_next_ns(head, ns)) {We start with the _next_ path, and stop _before_ we check the 'old' path. Consequently the 'old' path is never checked, and never selected.
Cheers,
Hannes
Signature · 9 lines
Dr. Hannes Reinecke Teamlead Storage & Networking [email protected] +49 911 74053 688 SUSE Software Solutions GmbH, Maxfeldstr. 5, 90409 Nürnberg HRB 36809 (AG Nürnberg), Geschäftsführer: Felix Imendörffer _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme