* [PATCH] IB/addr: Fix setting source address in addr6_resolve()
@ 2017-06-06 16:22 Roland Dreier
[not found] ` <20170606162200.24629-1-roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Roland Dreier @ 2017-06-06 16:22 UTC (permalink / raw)
To: Paolo Abeni, Doug Ledford; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
From: Roland Dreier <roland-BHEL68pLQRGGvPXPguhicg@public.gmane.org>
Commit eea40b8f624f ("infiniband: call ipv6 route lookup via the stub
interface") introduced a regression in address resolution when connecting
to IPv6 destination addresses. The old code called ip6_route_output(),
while the new code calls ipv6_stub->ipv6_dst_lookup(). The two are almost
the same, except that ipv6_dst_lookup() also calls ip6_route_get_saddr()
if the source address is in6addr_any.
This means that the test of ipv6_addr_any(&fl6.saddr) now never succeeds,
and so we never copy the source address out. This ends up causing
rdma_resolve_addr() to fail, because without a resolved source address,
cma_acquire_dev() will fail to find an RDMA device to use. For me, this
causes connecting to an NVMe over Fabrics target via RoCE / IPv6 to fail.
Fix this by copying out fl6.saddr if ipv6_addr_any() is true for the original
source address passed into addr6_resolve(). We can drop our call to
ipv6_dev_get_saddr() because ipv6_dst_lookup() already does that work.
Fixes: eea40b8f624 ("infiniband: call ipv6 route lookup via the stub interface")
Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.12+
Signed-off-by: Roland Dreier <roland-BHEL68pLQRGGvPXPguhicg@public.gmane.org>
---
drivers/infiniband/core/addr.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 02971e239a18..ece6926fa2e6 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -449,12 +449,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
return ret;
rt = (struct rt6_info *)dst;
- if (ipv6_addr_any(&fl6.saddr)) {
- ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,
- &fl6.daddr, 0, &fl6.saddr);
- if (ret)
- goto put;
-
+ if (ipv6_addr_any(&src_in->sin6_addr)) {
src_in->sin6_family = AF_INET6;
src_in->sin6_addr = fl6.saddr;
}
@@ -471,9 +466,6 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
*pdst = dst;
return 0;
-put:
- dst_release(dst);
- return ret;
}
#else
static int addr6_resolve(struct sockaddr_in6 *src_in,
--
2.11.0
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] IB/addr: Fix setting source address in addr6_resolve()
[not found] ` <20170606162200.24629-1-roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
@ 2017-06-07 12:57 ` Paolo Abeni
2017-06-08 0:18 ` Doug Ledford
1 sibling, 0 replies; 3+ messages in thread
From: Paolo Abeni @ 2017-06-07 12:57 UTC (permalink / raw)
To: Roland Dreier, Doug Ledford; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, 2017-06-06 at 09:22 -0700, Roland Dreier wrote:
> From: Roland Dreier <roland-BHEL68pLQRGGvPXPguhicg@public.gmane.org>
>
> Commit eea40b8f624f ("infiniband: call ipv6 route lookup via the stub
> interface") introduced a regression in address resolution when connecting
> to IPv6 destination addresses. The old code called ip6_route_output(),
> while the new code calls ipv6_stub->ipv6_dst_lookup(). The two are almost
> the same, except that ipv6_dst_lookup() also calls ip6_route_get_saddr()
> if the source address is in6addr_any.
>
> This means that the test of ipv6_addr_any(&fl6.saddr) now never succeeds,
> and so we never copy the source address out. This ends up causing
> rdma_resolve_addr() to fail, because without a resolved source address,
> cma_acquire_dev() will fail to find an RDMA device to use. For me, this
> causes connecting to an NVMe over Fabrics target via RoCE / IPv6 to fail.
>
> Fix this by copying out fl6.saddr if ipv6_addr_any() is true for the original
> source address passed into addr6_resolve(). We can drop our call to
> ipv6_dev_get_saddr() because ipv6_dst_lookup() already does that work.
>
> Fixes: eea40b8f624 ("infiniband: call ipv6 route lookup via the stub interface")
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.12+
> Signed-off-by: Roland Dreier <roland-BHEL68pLQRGGvPXPguhicg@public.gmane.org>
> ---
> drivers/infiniband/core/addr.c | 10 +---------
> 1 file changed, 1 insertion(+), 9 deletions(-)
>
> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
> index 02971e239a18..ece6926fa2e6 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -449,12 +449,7 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
> return ret;
>
> rt = (struct rt6_info *)dst;
> - if (ipv6_addr_any(&fl6.saddr)) {
> - ret = ipv6_dev_get_saddr(addr->net, ip6_dst_idev(dst)->dev,
> - &fl6.daddr, 0, &fl6.saddr);
> - if (ret)
> - goto put;
> -
> + if (ipv6_addr_any(&src_in->sin6_addr)) {
> src_in->sin6_family = AF_INET6;
> src_in->sin6_addr = fl6.saddr;
> }
> @@ -471,9 +466,6 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
>
> *pdst = dst;
> return 0;
> -put:
> - dst_release(dst);
> - return ret;
> }
> #else
> static int addr6_resolve(struct sockaddr_in6 *src_in,
LGTM, thank you for fixing this!
Acked-by: Paolo Abeni <pabeni-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] IB/addr: Fix setting source address in addr6_resolve()
[not found] ` <20170606162200.24629-1-roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-06-07 12:57 ` Paolo Abeni
@ 2017-06-08 0:18 ` Doug Ledford
1 sibling, 0 replies; 3+ messages in thread
From: Doug Ledford @ 2017-06-08 0:18 UTC (permalink / raw)
To: Roland Dreier, Paolo Abeni; +Cc: linux-rdma-u79uwXL29TY76Z2rM5mHXA
On Tue, 2017-06-06 at 09:22 -0700, Roland Dreier wrote:
> From: Roland Dreier <roland-BHEL68pLQRGGvPXPguhicg@public.gmane.org>
>
> Commit eea40b8f624f ("infiniband: call ipv6 route lookup via the stub
> interface") introduced a regression in address resolution when
> connecting
> to IPv6 destination addresses. The old code called
> ip6_route_output(),
> while the new code calls ipv6_stub->ipv6_dst_lookup(). The two are
> almost
> the same, except that ipv6_dst_lookup() also calls
> ip6_route_get_saddr()
> if the source address is in6addr_any.
>
> This means that the test of ipv6_addr_any(&fl6.saddr) now never
> succeeds,
> and so we never copy the source address out. This ends up causing
> rdma_resolve_addr() to fail, because without a resolved source
> address,
> cma_acquire_dev() will fail to find an RDMA device to use. For me,
> this
> causes connecting to an NVMe over Fabrics target via RoCE / IPv6 to
> fail.
>
> Fix this by copying out fl6.saddr if ipv6_addr_any() is true for the
> original
> source address passed into addr6_resolve(). We can drop our call to
> ipv6_dev_get_saddr() because ipv6_dst_lookup() already does that
> work.
>
> Fixes: eea40b8f624 ("infiniband: call ipv6 route lookup via the stub
> interface")
> Cc: <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # 3.12+
> Signed-off-by: Roland Dreier <roland-BHEL68pLQRGGvPXPguhicg@public.gmane.org>
Thanks Roland, applied.
--
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-06-08 0:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-06 16:22 [PATCH] IB/addr: Fix setting source address in addr6_resolve() Roland Dreier
[not found] ` <20170606162200.24629-1-roland-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-06-07 12:57 ` Paolo Abeni
2017-06-08 0:18 ` Doug Ledford
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.