* [cip-dev] Backporting "net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup"
@ 2020-03-13 21:03 Pavel Machek
2020-03-19 21:52 ` Ben Hutchings
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2020-03-13 21:03 UTC (permalink / raw)
To: cip-dev
[-- Attachment #1.1: Type: text/plain, Size: 8119 bytes --]
Hi!
Here's backport of `subj` to 4.19. ip6_dst_lookup_flow() prototype
changed between 4.19 and mainline, files were moved around, and I
could not find some instances to update. Fun!
I did minimal compile testing, I'll need to run it behind gitlab ci;
but... if you are using IPv6 and can test this, it would be nice.
Best regards,
Pavel
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
index 46b855a42884..e3c948617c73 100644
--- a/drivers/infiniband/core/addr.c
+++ b/drivers/infiniband/core/addr.c
@@ -415,9 +415,9 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
fl6.saddr = src_in->sin6_addr;
fl6.flowi6_oif = addr->bound_dev_if;
- ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);
- if (ret < 0)
- return ret;
+ dst = ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL);
+ if (IS_ERR(dst))
+ return PTR_ERR(dst);
rt = (struct rt6_info *)dst;
if (ipv6_addr_any(&src_in->sin6_addr)) {
diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index 8094cbaa54a9..95cf4fd69c55 100644
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -154,10 +154,12 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,
memcpy(&fl6.daddr, daddr, sizeof(*daddr));
fl6.flowi6_proto = IPPROTO_UDP;
- if (unlikely(ipv6_stub->ipv6_dst_lookup(sock_net(recv_sockets.sk6->sk),
- recv_sockets.sk6->sk, &ndst, &fl6))) {
+ ndst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),
+ recv_sockets.sk6->sk, &fl6,
+ NULL);
+ if (unlikely(IS_ERR(ndst))) {
pr_err_ratelimited("no route to %pI6\n", daddr);
- goto put;
+ return NULL;
}
if (unlikely(ndst->error)) {
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 493cd382b8aa..f22f187a91cd 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -796,7 +796,9 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
if (dst)
return dst;
}
- if (ipv6_stub->ipv6_dst_lookup(geneve->net, gs6->sock->sk, &dst, fl6)) {
+ dst = ipv6_stub->ipv6_dst_lookup_flow(geneve->net, gs6->sock->sk, fl6,
+ NULL);
+ if (IS_ERR(dst)) {
netdev_dbg(dev, "no route to %pI6\n", &fl6->daddr);
return ERR_PTR(-ENETUNREACH);
}
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 27bd586b94b0..0b6e899bd02e 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1952,7 +1952,6 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
struct dst_entry *ndst;
struct flowi6 fl6;
- int err;
if (!sock6)
return ERR_PTR(-EIO);
@@ -1975,10 +1974,9 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
fl6.fl6_dport = dport;
fl6.fl6_sport = sport;
- err = ipv6_stub->ipv6_dst_lookup(vxlan->net,
- sock6->sock->sk,
- &ndst, &fl6);
- if (unlikely(err < 0)) {
+ ndst = ipv6_stub->ipv6_dst_lookup_flow(vxlan->net, sock6->sock->sk,
+ &fl6, NULL);
+ if (unlikely(IS_ERR(ndst))) {
netdev_dbg(dev, "no route to %pI6\n", daddr);
return ERR_PTR(-ENETUNREACH);
}
diff --git a/include/net/addrconf.h b/include/net/addrconf.h
index 6def0351bcc3..ceb36cce91ee 100644
--- a/include/net/addrconf.h
+++ b/include/net/addrconf.h
@@ -235,9 +235,10 @@ struct ipv6_stub {
const struct in6_addr *addr);
int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex,
const struct in6_addr *addr);
- int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,
- struct dst_entry **dst, struct flowi6 *fl6);
-
+ struct dst_entry *(*ipv6_dst_lookup_flow)(struct net *net,
+ const struct sock *sk,
+ struct flowi6 *fl6,
+ const struct in6_addr *final_dst);
struct fib6_table *(*fib6_get_table)(struct net *net, u32 id);
struct fib6_info *(*fib6_lookup)(struct net *net, int oif,
struct flowi6 *fl6, int flags);
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index ff33f498c137..035cd7dc3836 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -961,6 +961,13 @@ int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,
struct flowi6 *fl6);
struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
const struct in6_addr *final_dst);
+
+static inline struct dst_entry *ip6_dst_lookup_flow_net(struct net *ign, const struct sock *sk, struct flowi6 *fl6,
+ const struct in6_addr *final_dst)
+{
+ return ip6_dst_lookup_flow(sk, fl6, final_dst);
+}
+
struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
const struct in6_addr *final_dst,
bool connected);
diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
index 5cd0029d930e..fe7f59193bb1 100644
--- a/net/ipv6/addrconf_core.c
+++ b/net/ipv6/addrconf_core.c
@@ -127,11 +127,12 @@ int inet6addr_validator_notifier_call_chain(unsigned long val, void *v)
}
EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain);
-static int eafnosupport_ipv6_dst_lookup(struct net *net, struct sock *u1,
- struct dst_entry **u2,
- struct flowi6 *u3)
+static struct dst_entry *eafnosupport_ipv6_dst_lookup_flow(struct net *net,
+ const struct sock *sk,
+ struct flowi6 *fl6,
+ const struct in6_addr *final_dst)
{
- return -EAFNOSUPPORT;
+ return ERR_PTR(-EAFNOSUPPORT);
}
static struct fib6_table *eafnosupport_fib6_get_table(struct net *net, u32 id)
@@ -169,7 +170,7 @@ eafnosupport_ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr,
}
const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {
- .ipv6_dst_lookup = eafnosupport_ipv6_dst_lookup,
+ .ipv6_dst_lookup_flow = eafnosupport_ipv6_dst_lookup_flow,
.fib6_get_table = eafnosupport_fib6_get_table,
.fib6_table_lookup = eafnosupport_fib6_table_lookup,
.fib6_lookup = eafnosupport_fib6_lookup,
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
index 9a4261e50272..e44534f22e00 100644
--- a/net/ipv6/af_inet6.c
+++ b/net/ipv6/af_inet6.c
@@ -889,7 +889,7 @@ static struct pernet_operations inet6_net_ops = {
static const struct ipv6_stub ipv6_stub_impl = {
.ipv6_sock_mc_join = ipv6_sock_mc_join,
.ipv6_sock_mc_drop = ipv6_sock_mc_drop,
- .ipv6_dst_lookup = ip6_dst_lookup,
+ .ipv6_dst_lookup_flow = ip6_dst_lookup_flow_net,
.fib6_get_table = fib6_get_table,
.fib6_table_lookup = fib6_table_lookup,
.fib6_lookup = fib6_lookup,
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
index 8fbe6cdbe255..e42ef8f835fa 100644
--- a/net/mpls/af_mpls.c
+++ b/net/mpls/af_mpls.c
@@ -618,16 +618,15 @@ static struct net_device *inet6_fib_lookup_dev(struct net *net,
struct net_device *dev;
struct dst_entry *dst;
struct flowi6 fl6;
- int err;
if (!ipv6_stub)
return ERR_PTR(-EAFNOSUPPORT);
memset(&fl6, 0, sizeof(fl6));
memcpy(&fl6.daddr, addr, sizeof(struct in6_addr));
- err = ipv6_stub->ipv6_dst_lookup(net, NULL, &dst, &fl6);
- if (err)
- return ERR_PTR(err);
+ dst = ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &fl6, NULL);
+ if (IS_ERR(dst))
+ return ERR_CAST(dst);
dev = dst->dev;
dev_hold(dev);
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 9783101bc4a9..1ab684a4f565 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -190,6 +190,14 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb,
.saddr = src->ipv6,
.flowi6_proto = IPPROTO_UDP
};
+ ndst = ipv6_stub->ipv6_dst_lookup_flow(net,
+ ub->ubsock->sk,
+ &fl6, NULL);
+ if (IS_ERR(ndst)) {
+ err = PTR_ERR(ndst);
+ goto tx_error;
+ }
+
err = ipv6_stub->ipv6_dst_lookup(net, ub->ubsock->sk, &ndst,
&fl6);
if (err)
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
[-- Attachment #2: Type: text/plain, Size: 154 bytes --]
_______________________________________________
cip-dev mailing list
cip-dev@lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [cip-dev] Backporting "net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup"
2020-03-13 21:03 [cip-dev] Backporting "net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup" Pavel Machek
@ 2020-03-19 21:52 ` Ben Hutchings
0 siblings, 0 replies; 3+ messages in thread
From: Ben Hutchings @ 2020-03-19 21:52 UTC (permalink / raw)
To: Pavel Machek, cip-dev
On Fri, 2020-03-13 at 22:03 +0100, Pavel Machek wrote:
> Hi!
>
> Here's backport of `subj` to 4.19. ip6_dst_lookup_flow() prototype
> changed between 4.19 and mainline, files were moved around, and I
> could not find some instances to update. Fun!
I also had a go at this before catching up on cip-dev and finding you
had also done so. So I've compared this with my version.
> I did minimal compile testing, I'll need to run it behind gitlab ci;
> but... if you are using IPv6 and can test this, it would be nice.
I haven't done real testing yet either.
> Best regards,
> Pavel
>
>
>
> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
> index 46b855a42884..e3c948617c73 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -415,9 +415,9 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
> fl6.saddr = src_in->sin6_addr;
> fl6.flowi6_oif = addr->bound_dev_if;
>
> - ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);
> - if (ret < 0)
> - return ret;
> + dst = ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL);
> + if (IS_ERR(dst))
> + return PTR_ERR(dst);
This leaves the ret variable unused, so I deleted it.
[...]
> diff --git a/include/net/ipv6.h b/include/net/ipv6.h
> index ff33f498c137..035cd7dc3836 100644
> --- a/include/net/ipv6.h
> +++ b/include/net/ipv6.h
> @@ -961,6 +961,13 @@ int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,
> struct flowi6 *fl6);
> struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
> const struct in6_addr *final_dst);
> +
> +static inline struct dst_entry *ip6_dst_lookup_flow_net(struct net *ign, const struct sock *sk, struct flowi6 *fl6,
> + const struct in6_addr *final_dst)
> +{
> + return ip6_dst_lookup_flow(sk, fl6, final_dst);
> +}
> +
I think we should pick commit c4e85f73afb6 "net: ipv6: add net argument
to ip6_dst_lookup_flow" first instead of adding this adapter. It is
explicitly described as preparation for this fix.
[...]
> --- a/net/tipc/udp_media.c
> +++ b/net/tipc/udp_media.c
> @@ -190,6 +190,14 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb,
> .saddr = src->ipv6,
> .flowi6_proto = IPPROTO_UDP
> };
> + ndst = ipv6_stub->ipv6_dst_lookup_flow(net,
> + ub->ubsock->sk,
> + &fl6, NULL);
> + if (IS_ERR(ndst)) {
> + err = PTR_ERR(ndst);
> + goto tx_error;
> + }
> +
> err = ipv6_stub->ipv6_dst_lookup(net, ub->ubsock->sk, &ndst,
> &fl6);
> if (err)
You've not deleted the call to the old ipv6_dst_lookup operation here.
The mlx5_en driver *does* use the ipv6_dst_lookup operation in 4.19 so
it should be converted to ipv6_dst_lookup_flow. The relevant code is
in drivers/net/ethernet/mellanox/mlx5/core/en_tc.c.
Ben.
--
Ben Hutchings, Software Developer Codethink Ltd
https://www.codethink.co.uk/ Dale House, 35 Dale Street
Manchester, M1 2HF, United Kingdom
_______________________________________________
cip-dev mailing list
cip-dev@lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [cip-dev] Backporting "net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup"
@ 2020-03-16 1:29 Punit Agrawal
0 siblings, 0 replies; 3+ messages in thread
From: Punit Agrawal @ 2020-03-16 1:29 UTC (permalink / raw)
To: pavel; +Cc: cip-dev
Hi Pavel,
Not sure if the email was intended for any specific recipient so my
comments below may not make sense...
Pavel Machek <pavel@ucw.cz> writes:
> Hi!
>
> Here's backport of `subj` to 4.19. ip6_dst_lookup_flow() prototype
> changed between 4.19 and mainline, files were moved around, and I
> could not find some instances to update. Fun!
It would be helpful for readers / reviewers if this was sent following
the same format / guidelines as expected by the stable tree
(Documentation/process/stable-kernel-rules.rst). Especially including
the commit hash so it's easier to lookup the context.
Thanks,
Punit
> I did minimal compile testing, I'll need to run it behind gitlab ci;
> but... if you are using IPv6 and can test this, it would be nice.
>
> Best regards,
> Pavel
>
>
>
> diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c
> index 46b855a42884..e3c948617c73 100644
> --- a/drivers/infiniband/core/addr.c
> +++ b/drivers/infiniband/core/addr.c
> @@ -415,9 +415,9 @@ static int addr6_resolve(struct sockaddr_in6 *src_in,
> fl6.saddr = src_in->sin6_addr;
> fl6.flowi6_oif = addr->bound_dev_if;
>
> - ret = ipv6_stub->ipv6_dst_lookup(addr->net, NULL, &dst, &fl6);
> - if (ret < 0)
> - return ret;
> + dst = ipv6_stub->ipv6_dst_lookup_flow(addr->net, NULL, &fl6, NULL);
> + if (IS_ERR(dst))
> + return PTR_ERR(dst);
>
> rt = (struct rt6_info *)dst;
> if (ipv6_addr_any(&src_in->sin6_addr)) {
> diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
> index 8094cbaa54a9..95cf4fd69c55 100644
> --- a/drivers/infiniband/sw/rxe/rxe_net.c
> +++ b/drivers/infiniband/sw/rxe/rxe_net.c
> @@ -154,10 +154,12 @@ static struct dst_entry *rxe_find_route6(struct net_device *ndev,
> memcpy(&fl6.daddr, daddr, sizeof(*daddr));
> fl6.flowi6_proto = IPPROTO_UDP;
>
> - if (unlikely(ipv6_stub->ipv6_dst_lookup(sock_net(recv_sockets.sk6->sk),
> - recv_sockets.sk6->sk, &ndst, &fl6))) {
> + ndst = ipv6_stub->ipv6_dst_lookup_flow(sock_net(recv_sockets.sk6->sk),
> + recv_sockets.sk6->sk, &fl6,
> + NULL);
> + if (unlikely(IS_ERR(ndst))) {
> pr_err_ratelimited("no route to %pI6\n", daddr);
> - goto put;
> + return NULL;
> }
>
> if (unlikely(ndst->error)) {
> diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
> index 493cd382b8aa..f22f187a91cd 100644
> --- a/drivers/net/geneve.c
> +++ b/drivers/net/geneve.c
> @@ -796,7 +796,9 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb,
> if (dst)
> return dst;
> }
> - if (ipv6_stub->ipv6_dst_lookup(geneve->net, gs6->sock->sk, &dst, fl6)) {
> + dst = ipv6_stub->ipv6_dst_lookup_flow(geneve->net, gs6->sock->sk, fl6,
> + NULL);
> + if (IS_ERR(dst)) {
> netdev_dbg(dev, "no route to %pI6\n", &fl6->daddr);
> return ERR_PTR(-ENETUNREACH);
> }
> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
> index 27bd586b94b0..0b6e899bd02e 100644
> --- a/drivers/net/vxlan.c
> +++ b/drivers/net/vxlan.c
> @@ -1952,7 +1952,6 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
> bool use_cache = ip_tunnel_dst_cache_usable(skb, info);
> struct dst_entry *ndst;
> struct flowi6 fl6;
> - int err;
>
> if (!sock6)
> return ERR_PTR(-EIO);
> @@ -1975,10 +1974,9 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan,
> fl6.fl6_dport = dport;
> fl6.fl6_sport = sport;
>
> - err = ipv6_stub->ipv6_dst_lookup(vxlan->net,
> - sock6->sock->sk,
> - &ndst, &fl6);
> - if (unlikely(err < 0)) {
> + ndst = ipv6_stub->ipv6_dst_lookup_flow(vxlan->net, sock6->sock->sk,
> + &fl6, NULL);
> + if (unlikely(IS_ERR(ndst))) {
> netdev_dbg(dev, "no route to %pI6\n", daddr);
> return ERR_PTR(-ENETUNREACH);
> }
> diff --git a/include/net/addrconf.h b/include/net/addrconf.h
> index 6def0351bcc3..ceb36cce91ee 100644
> --- a/include/net/addrconf.h
> +++ b/include/net/addrconf.h
> @@ -235,9 +235,10 @@ struct ipv6_stub {
> const struct in6_addr *addr);
> int (*ipv6_sock_mc_drop)(struct sock *sk, int ifindex,
> const struct in6_addr *addr);
> - int (*ipv6_dst_lookup)(struct net *net, struct sock *sk,
> - struct dst_entry **dst, struct flowi6 *fl6);
> -
> + struct dst_entry *(*ipv6_dst_lookup_flow)(struct net *net,
> + const struct sock *sk,
> + struct flowi6 *fl6,
> + const struct in6_addr *final_dst);
> struct fib6_table *(*fib6_get_table)(struct net *net, u32 id);
> struct fib6_info *(*fib6_lookup)(struct net *net, int oif,
> struct flowi6 *fl6, int flags);
> diff --git a/include/net/ipv6.h b/include/net/ipv6.h
> index ff33f498c137..035cd7dc3836 100644
> --- a/include/net/ipv6.h
> +++ b/include/net/ipv6.h
> @@ -961,6 +961,13 @@ int ip6_dst_lookup(struct net *net, struct sock *sk, struct dst_entry **dst,
> struct flowi6 *fl6);
> struct dst_entry *ip6_dst_lookup_flow(const struct sock *sk, struct flowi6 *fl6,
> const struct in6_addr *final_dst);
> +
> +static inline struct dst_entry *ip6_dst_lookup_flow_net(struct net *ign, const struct sock *sk, struct flowi6 *fl6,
> + const struct in6_addr *final_dst)
> +{
> + return ip6_dst_lookup_flow(sk, fl6, final_dst);
> +}
> +
> struct dst_entry *ip6_sk_dst_lookup_flow(struct sock *sk, struct flowi6 *fl6,
> const struct in6_addr *final_dst,
> bool connected);
> diff --git a/net/ipv6/addrconf_core.c b/net/ipv6/addrconf_core.c
> index 5cd0029d930e..fe7f59193bb1 100644
> --- a/net/ipv6/addrconf_core.c
> +++ b/net/ipv6/addrconf_core.c
> @@ -127,11 +127,12 @@ int inet6addr_validator_notifier_call_chain(unsigned long val, void *v)
> }
> EXPORT_SYMBOL(inet6addr_validator_notifier_call_chain);
>
> -static int eafnosupport_ipv6_dst_lookup(struct net *net, struct sock *u1,
> - struct dst_entry **u2,
> - struct flowi6 *u3)
> +static struct dst_entry *eafnosupport_ipv6_dst_lookup_flow(struct net *net,
> + const struct sock *sk,
> + struct flowi6 *fl6,
> + const struct in6_addr *final_dst)
> {
> - return -EAFNOSUPPORT;
> + return ERR_PTR(-EAFNOSUPPORT);
> }
>
> static struct fib6_table *eafnosupport_fib6_get_table(struct net *net, u32 id)
> @@ -169,7 +170,7 @@ eafnosupport_ip6_mtu_from_fib6(struct fib6_info *f6i, struct in6_addr *daddr,
> }
>
> const struct ipv6_stub *ipv6_stub __read_mostly = &(struct ipv6_stub) {
> - .ipv6_dst_lookup = eafnosupport_ipv6_dst_lookup,
> + .ipv6_dst_lookup_flow = eafnosupport_ipv6_dst_lookup_flow,
> .fib6_get_table = eafnosupport_fib6_get_table,
> .fib6_table_lookup = eafnosupport_fib6_table_lookup,
> .fib6_lookup = eafnosupport_fib6_lookup,
> diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
> index 9a4261e50272..e44534f22e00 100644
> --- a/net/ipv6/af_inet6.c
> +++ b/net/ipv6/af_inet6.c
> @@ -889,7 +889,7 @@ static struct pernet_operations inet6_net_ops = {
> static const struct ipv6_stub ipv6_stub_impl = {
> .ipv6_sock_mc_join = ipv6_sock_mc_join,
> .ipv6_sock_mc_drop = ipv6_sock_mc_drop,
> - .ipv6_dst_lookup = ip6_dst_lookup,
> + .ipv6_dst_lookup_flow = ip6_dst_lookup_flow_net,
> .fib6_get_table = fib6_get_table,
> .fib6_table_lookup = fib6_table_lookup,
> .fib6_lookup = fib6_lookup,
> diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c
> index 8fbe6cdbe255..e42ef8f835fa 100644
> --- a/net/mpls/af_mpls.c
> +++ b/net/mpls/af_mpls.c
> @@ -618,16 +618,15 @@ static struct net_device *inet6_fib_lookup_dev(struct net *net,
> struct net_device *dev;
> struct dst_entry *dst;
> struct flowi6 fl6;
> - int err;
>
> if (!ipv6_stub)
> return ERR_PTR(-EAFNOSUPPORT);
>
> memset(&fl6, 0, sizeof(fl6));
> memcpy(&fl6.daddr, addr, sizeof(struct in6_addr));
> - err = ipv6_stub->ipv6_dst_lookup(net, NULL, &dst, &fl6);
> - if (err)
> - return ERR_PTR(err);
> + dst = ipv6_stub->ipv6_dst_lookup_flow(net, NULL, &fl6, NULL);
> + if (IS_ERR(dst))
> + return ERR_CAST(dst);
>
> dev = dst->dev;
> dev_hold(dev);
> diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
> index 9783101bc4a9..1ab684a4f565 100644
> --- a/net/tipc/udp_media.c
> +++ b/net/tipc/udp_media.c
> @@ -190,6 +190,14 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb,
> .saddr = src->ipv6,
> .flowi6_proto = IPPROTO_UDP
> };
> + ndst = ipv6_stub->ipv6_dst_lookup_flow(net,
> + ub->ubsock->sk,
> + &fl6, NULL);
> + if (IS_ERR(ndst)) {
> + err = PTR_ERR(ndst);
> + goto tx_error;
> + }
> +
> err = ipv6_stub->ipv6_dst_lookup(net, ub->ubsock->sk, &ndst,
> &fl6);
> if (err)
_______________________________________________
cip-dev mailing list
cip-dev@lists.cip-project.org
https://lists.cip-project.org/mailman/listinfo/cip-dev
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-03-19 21:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-13 21:03 [cip-dev] Backporting "net: ipv6_stub: use ip6_dst_lookup_flow instead of ip6_dst_lookup" Pavel Machek
2020-03-19 21:52 ` Ben Hutchings
2020-03-16 1:29 Punit Agrawal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).