Commit 7d75c0cb authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-introduce-and-use-route-hint' 



Paolo Abeni says:

====================
net: introduce and use route hint

This series leverages the listification infrastructure to avoid
unnecessary route lookup on ingress packets. In absence of custom rules,
packets with equal daddr will usually land on the same dst.

When processing packet bursts (lists) we can easily reference the previous
dst entry. When we hit the 'same destination' condition we can avoid the
route lookup, coping the already available dst.

Detailed performance numbers are available in the individual commit
messages.

v3 -> v4:
 - move helpers to their own patches (Eric D.)
 - enable hints for SUBTREE builds (David A.)
 - re-enable hints for ipv4 forward (David A.)

v2 -> v3:
 - use fib*_has_custom_rules() helpers (David A.)
 - add ip*_extract_route_hint() helper (Edward C.)
 - use prev skb as hint instead of copying data (Willem )

v1 -> v2:
 - fix build issue with !CONFIG_IP*_MULTIPLE_TABLES
 - fix potential race in ip6_list_rcv_finish()
====================

Acked-by: default avatarEdward Cree <ecree@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2c44713e 02b24941

include/net/ip6_fib.h

+39 −0
Original line number Diff line number Diff line
@@ -90,7 +90,32 @@ struct fib6_gc_args { 


#ifndef CONFIG_IPV6_SUBTREES

#define FIB6_SUBTREE(fn)	NULL



static inline bool fib6_routes_require_src(const struct net *net)

{

	return false;

}



static inline void fib6_routes_require_src_inc(struct net *net) {}

static inline void fib6_routes_require_src_dec(struct net *net) {}



#else



static inline bool fib6_routes_require_src(const struct net *net)

{

	return net->ipv6.fib6_routes_require_src > 0;

}



static inline void fib6_routes_require_src_inc(struct net *net)

{

	net->ipv6.fib6_routes_require_src++;

}



static inline void fib6_routes_require_src_dec(struct net *net)

{

	net->ipv6.fib6_routes_require_src--;

}



#define FIB6_SUBTREE(fn)	(rcu_dereference_protected((fn)->subtree, 1))

#endif
@@ -212,6 +237,11 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) 
	return ((struct rt6_info *)dst)->rt6i_idev;

}



static inline bool fib6_requires_src(const struct fib6_info *rt)

{

	return rt->fib6_src.plen > 0;

}



static inline void fib6_clean_expires(struct fib6_info *f6i)

{

	f6i->fib6_flags &= ~RTF_EXPIRES;
@@ -502,6 +532,11 @@ static inline bool fib6_metric_locked(struct fib6_info *f6i, int metric) 
}



#ifdef CONFIG_IPV6_MULTIPLE_TABLES

static inline bool fib6_has_custom_rules(const struct net *net)

{

	return net->ipv6.fib6_has_custom_rules;

}



int fib6_rules_init(void);

void fib6_rules_cleanup(void);

bool fib6_rule_default(const struct fib_rule *rule);
@@ -527,6 +562,10 @@ static inline bool fib6_rules_early_flow_dissect(struct net *net, 
	return true;

}

#else

static inline bool fib6_has_custom_rules(const struct net *net)

{

	return false;

}

static inline int               fib6_rules_init(void)

{

	return 0;

include/net/ip_fib.h

+10 −0
Original line number Diff line number Diff line
@@ -311,6 +311,11 @@ static inline int fib_lookup(struct net *net, const struct flowi4 *flp, 
	return err;

}



static inline bool fib4_has_custom_rules(const struct net *net)

{

	return false;

}



static inline bool fib4_rule_default(const struct fib_rule *rule)

{

	return true;
@@ -378,6 +383,11 @@ out: 
	return err;

}



static inline bool fib4_has_custom_rules(const struct net *net)

{

	return net->ipv4.fib_has_custom_rules;

}



bool fib4_rule_default(const struct fib_rule *rule);

int fib4_rules_dump(struct net *net, struct notifier_block *nb,

		    struct netlink_ext_ack *extack);

include/net/netns/ipv6.h

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ struct netns_ipv6 { 
#ifdef CONFIG_IPV6_MULTIPLE_TABLES

	unsigned int		fib6_rules_require_fldissect;

	bool			fib6_has_custom_rules;

#ifdef CONFIG_IPV6_SUBTREES

	unsigned int		fib6_routes_require_src;

#endif

	struct rt6_info         *ip6_prohibit_entry;

	struct rt6_info         *ip6_blk_hole_entry;

	struct fib6_table       *fib6_local_tbl;

include/net/route.h

+4 −0
Original line number Diff line number Diff line
@@ -185,6 +185,10 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 dst, __be32 src, 
		       u8 tos, struct net_device *devin,

		       struct fib_result *res);



int ip_route_use_hint(struct sk_buff *skb, __be32 dst, __be32 src,

		      u8 tos, struct net_device *devin,

		      const struct sk_buff *hint);



static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,

				 u8 tos, struct net_device *devin)

{

net/ipv4/fib_frontend.c

+0 −10
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ fail: 
	fib_free_table(main_table);

	return -ENOMEM;

}



static bool fib4_has_custom_rules(struct net *net)

{

	return false;

}

#else



struct fib_table *fib_new_table(struct net *net, u32 id)
@@ -131,11 +126,6 @@ struct fib_table *fib_get_table(struct net *net, u32 id) 
	}

	return NULL;

}



static bool fib4_has_custom_rules(struct net *net)

{

	return net->ipv4.fib_has_custom_rules;

}

#endif /* CONFIG_IP_MULTIPLE_TABLES */



static void fib_replace_table(struct net *net, struct fib_table *old,

CRA Git | Maintained and supported by SUSTech CRA and CCSE