Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b75cc8f9 authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net/ipv6: Pass skb to route lookup 



IPv6 does path selection for multipath routes deep in the lookup
functions. The next patch adds L4 hash option and needs the skb
for the forward path. To get the skb to the relevant FIB lookup
functions it needs to go through the fib rules layer, so add a
lookup_data argument to the fib_lookup_arg struct.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@mellanox.com>
Reviewed-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3192dac6

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -1334,7 +1334,7 @@ static bool validate_ipv6_net_dev(struct net_device *net_dev, 
			   IPV6_ADDR_LINKLOCAL;

	struct rt6_info *rt = rt6_lookup(dev_net(net_dev), &dst_addr->sin6_addr,

					 &src_addr->sin6_addr, net_dev->ifindex,

					 strict);

					 NULL, strict);

	bool ret;



	if (!rt)

drivers/net/ipvlan/ipvlan_core.c

+2 −1
Original line number Diff line number Diff line
@@ -817,7 +817,8 @@ struct sk_buff *ipvlan_l3_rcv(struct net_device *dev, struct sk_buff *skb, 
		};



		skb_dst_drop(skb);

		dst = ip6_route_input_lookup(dev_net(sdev), sdev, &fl6, flags);

		dst = ip6_route_input_lookup(dev_net(sdev), sdev, &fl6,

					     skb, flags);

		skb_dst_set(skb, dst);

		break;

	}

drivers/net/vrf.c

+4 −3
Original line number Diff line number Diff line
@@ -941,6 +941,7 @@ static struct rt6_info *vrf_ip6_route_lookup(struct net *net, 
					     const struct net_device *dev,

					     struct flowi6 *fl6,

					     int ifindex,

					     const struct sk_buff *skb,

					     int flags)

{

	struct net_vrf *vrf = netdev_priv(dev);
@@ -959,7 +960,7 @@ static struct rt6_info *vrf_ip6_route_lookup(struct net *net, 
	if (!table)

		return NULL;



	return ip6_pol_route(net, table, ifindex, fl6, flags);

	return ip6_pol_route(net, table, ifindex, fl6, skb, flags);

}



static void vrf_ip6_input_dst(struct sk_buff *skb, struct net_device *vrf_dev,
@@ -977,7 +978,7 @@ static void vrf_ip6_input_dst(struct sk_buff *skb, struct net_device *vrf_dev, 
	struct net *net = dev_net(vrf_dev);

	struct rt6_info *rt6;



	rt6 = vrf_ip6_route_lookup(net, vrf_dev, &fl6, ifindex,

	rt6 = vrf_ip6_route_lookup(net, vrf_dev, &fl6, ifindex, skb,

				   RT6_LOOKUP_F_HAS_SADDR | RT6_LOOKUP_F_IFACE);

	if (unlikely(!rt6))

		return;
@@ -1110,7 +1111,7 @@ static struct dst_entry *vrf_link_scope_lookup(const struct net_device *dev, 
	if (!ipv6_addr_any(&fl6->saddr))

		flags |= RT6_LOOKUP_F_HAS_SADDR;



	rt = vrf_ip6_route_lookup(net, dev, fl6, fl6->flowi6_oif, flags);

	rt = vrf_ip6_route_lookup(net, dev, fl6, fl6->flowi6_oif, NULL, flags);

	if (rt)

		dst = &rt->dst;

include/net/fib_rules.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct fib_rule { 


struct fib_lookup_arg {

	void			*lookup_ptr;

	const void		*lookup_data;

	void			*result;

	struct fib_rule		*rule;

	u32			table;

include/net/ip6_fib.h

+3 −1
Original line number Diff line number Diff line
@@ -350,7 +350,8 @@ struct fib6_table { 


typedef struct rt6_info *(*pol_lookup_t)(struct net *,

					 struct fib6_table *,

					 struct flowi6 *, int);

					 struct flowi6 *,

					 const struct sk_buff *, int);



struct fib6_entry_notifier_info {

	struct fib_notifier_info info; /* must be first */
@@ -364,6 +365,7 @@ struct fib6_entry_notifier_info { 
struct fib6_table *fib6_get_table(struct net *net, u32 id);

struct fib6_table *fib6_new_table(struct net *net, u32 id);

struct dst_entry *fib6_rule_lookup(struct net *net, struct flowi6 *fl6,

				   const struct sk_buff *skb,

				   int flags, pol_lookup_t lookup);



struct fib6_node *fib6_lookup(struct fib6_node *root,