Skip to contentSkip to conversation

net: introduce and use route hint

PATCH Superseded Paolo Abeni 4 participants 10 messages Nov 18, 2019 – Nov 19, 2019

Subsystems (3)
Networking Network drivers IPv4/IPv6

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Paolo Abeni

author maintainer
#0 lore raw

v2 cover net: introduce and use route hint

This series leverages the listification infrastructure to avoid unnecessary route lookup on ingress packets. In absence of policy routing, 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.

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

Paolo Abeni (2):
ipv6: introduce and uses route look hints for list input
ipv4: use dst hint for ipv4 list receive

 include/net/route.h  | 11 +++++++++++
 net/ipv4/ip_input.c  | 38 +++++++++++++++++++++++++++++++++-----
 net/ipv4/route.c     | 38 ++++++++++++++++++++++++++++++++++++++
 net/ipv6/ip6_input.c | 40 ++++++++++++++++++++++++++++++++++++----
 4 files changed, 118 insertions(+), 9 deletions(-)
Signature · 1 line
2.21.0
author maintainer
#1 lore raw

PATCH v2 1/2 ipv6: introduce and uses route look hints for list input

When doing RX batch packet processing, we currently always repeat the route lookup for each ingress packet. If policy routing is configured, and IPV6_SUBTREES is disabled at build time, we know that packets with the same destination address will use the same dst.

This change tries to avoid per packet route lookup caching the destination address of the latest successful lookup, and reusing it for the next packet when the above conditions are in place. Ingress traffic for most servers should fit.

The measured performance delta under UDP flood vs a recvmmsg receiver is as follow:

vanilla patched delta
Kpps Kpps %
1431 1664 +14

In the worst-case scenario - each packet has a different destination address - the performance delta is within noise range.

v1 -> v2:
- fix build issue with !CONFIG_IPV6_MULTIPLE_TABLES
- fix potential race when fib6_has_custom_rules is set while processing a packet batch

Signed-off-by Paolo Abeni <[email protected]>
---
 net/ipv6/ip6_input.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)
net/ipv6/ip6_input.c +36 -4
index ef7f707d9ae3..f559ad6b09ef 100644
@@ -44,10 +44,16 @@
 #include <net/inet_ecn.h>
 #include <net/dst_metadata.h>
 
+struct ip6_route_input_hint {
+	unsigned long	refdst;
+	struct in6_addr daddr;
+};
+
 INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *));
 INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *));
 static void ip6_rcv_finish_core(struct net *net, struct sock *sk,
-				struct sk_buff *skb)
+				struct sk_buff *skb,
+				struct ip6_route_input_hint *hint)
 {
 	void (*edemux)(struct sk_buff *skb);
 

@@ -59,7 +65,13 @@ static void ip6_rcv_finish_core(struct net *net, struct sock *sk,
 			INDIRECT_CALL_2(edemux, tcp_v6_early_demux,
 					udp_v6_early_demux, skb);
 	}
-	if (!skb_valid_dst(skb))
+
+	if (skb_valid_dst(skb))
+		return;
+
+	if (hint && ipv6_addr_equal(&hint->daddr, &ipv6_hdr(skb)->daddr))
+		__skb_dst_copy(skb, hint->refdst);
+	else
 		ip6_route_input(skb);
 }
 

@@ -71,7 +83,7 @@ int ip6_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
 	skb = l3mdev_ip6_rcv(skb);
 	if (!skb)
 		return NET_RX_SUCCESS;
-	ip6_rcv_finish_core(net, sk, skb);
+	ip6_rcv_finish_core(net, sk, skb, NULL);
 
 	return dst_input(skb);
 }

@@ -86,9 +98,20 @@ static void ip6_sublist_rcv_finish(struct list_head *head)
 	}
 }
 
+static bool ip6_can_cache_route_hint(struct net *net)
+{
+	return !IS_ENABLED(IPV6_SUBTREES) &&
+#ifdef CONFIG_IPV6_MULTIPLE_TABLES
+	       !net->ipv6.fib6_has_custom_rules;
+#else
+	       1;
+#endif
+}
+
 static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
 				struct list_head *head)
 {
+	struct ip6_route_input_hint _hint, *hint = NULL;
 	struct dst_entry *curr_dst = NULL;
 	struct sk_buff *skb, *next;
 	struct list_head sublist;

@@ -104,9 +127,18 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
 		skb = l3mdev_ip6_rcv(skb);
 		if (!skb)
 			continue;
-		ip6_rcv_finish_core(net, sk, skb);
+		ip6_rcv_finish_core(net, sk, skb, hint);
 		dst = skb_dst(skb);
 		if (curr_dst != dst) {
+			if (ip6_can_cache_route_hint(net)) {
+				_hint.refdst = skb->_skb_refdst;
+				memcpy(&_hint.daddr, &ipv6_hdr(skb)->daddr,
+				       sizeof(_hint.daddr));
+				hint = &_hint;
+			} else {
+				hint = NULL;
+			}
+
 			/* dispatch old sublist */
 			if (!list_empty(&sublist))
 				ip6_sublist_rcv_finish(&sublist);
Signature · 1 line
2.21.0
#2 lore raw

Re: [PATCH net-next v2 1/2] ipv6: introduce and uses route look hints for list input

Quoted 12 lines · Paolo Abeni

When doing RX batch packet processing, we currently always repeat the route lookup for each ingress packet. If policy routing is configured, and IPV6_SUBTREES is disabled at build time, we know that packets with the same destination address will use the same dst.

This change tries to avoid per packet route lookup caching the destination address of the latest successful lookup, and reusing it for the next packet when the above conditions are in place. Ingress traffic for most servers should fit.

Quoted 6 lines

The measured performance delta under UDP flood vs a recvmmsg receiver is as follow:

vanilla         patched         delta
Kpps            Kpps            %
1431            1664            +14

Since IPv4 speed-up is almost half and code considerably more complex, maybe only do IPv6?

Quoted 40 lines

In the worst-case scenario - each packet has a different destination address - the performance delta is within noise range.

v1 -> v2:
- fix build issue with !CONFIG_IPV6_MULTIPLE_TABLES
- fix potential race when fib6_has_custom_rules is set while processing a packet batch

Signed-off-by Paolo Abeni <[email protected]>
---
 net/ipv6/ip6_input.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)
net/ipv6/ip6_input.c +7 -1
index ef7f707d9ae3..f559ad6b09ef 100644
@@ -44,10 +44,16 @@
 #include <net/inet_ecn.h>
 #include <net/dst_metadata.h>
 
+struct ip6_route_input_hint {
+       unsigned long   refdst;
+       struct in6_addr daddr;
+};
+
 INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *));
 INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *));
 static void ip6_rcv_finish_core(struct net *net, struct sock *sk,
-                               struct sk_buff *skb)
+                               struct sk_buff *skb,
+                               struct ip6_route_input_hint *hint)
 {
        void (*edemux)(struct sk_buff *skb);
 

@@ -59,7 +65,13 @@ static void ip6_rcv_finish_core(struct net *net, struct sock *sk,
                        INDIRECT_CALL_2(edemux, tcp_v6_early_demux,
                                        udp_v6_early_demux, skb);

net/ipv6/ip6_input.c static void ip6_rcv_finish_core(struct net *net, struct sock *sk, · line 75

Quoted 10 lines
net/ipv6/ip6_input.c +7 -1
        }
-       if (!skb_valid_dst(skb))
+
+       if (skb_valid_dst(skb))
+               return;
+
+       if (hint && ipv6_addr_equal(&hint->daddr, &ipv6_hdr(skb)->daddr))
+               __skb_dst_copy(skb, hint->refdst);
+       else
                ip6_route_input(skb);

Is it possible to do the address comparison in ip6_list_rcv_finish itself and pass a pointer to refdst if safe? To avoid new struct definition, memcpy and to have all logic in one place. Need to keep a pointer to the prev skb, then, instead.

Quoted 13 lines
net/ipv6/ip6_input.c +0 -0
 static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
                                struct list_head *head)

{

net/ipv6/ip6_input.c +2 -1
+       struct ip6_route_input_hint _hint, *hint = NULL;
        struct dst_entry *curr_dst = NULL;
        struct sk_buff *skb, *next;
        struct list_head sublist;

@@ -104,9 +127,18 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
                skb = l3mdev_ip6_rcv(skb);
                if (!skb)
                        continue;
-               ip6_rcv_finish_core(net, sk, skb);
+               ip6_rcv_finish_core(net, sk, skb, hint);

net/ipv6/ip6_input.c static void ip6_list_rcv_finish(struct net *net, struct sock *sk, · line 140

Quoted 10 lines
net/ipv6/ip6_input.c +8 -0
                dst = skb_dst(skb);
                if (curr_dst != dst) {
+                       if (ip6_can_cache_route_hint(net)) {
+                               _hint.refdst = skb->_skb_refdst;
+                               memcpy(&_hint.daddr, &ipv6_hdr(skb)->daddr,
+                                      sizeof(_hint.daddr));
+                               hint = &_hint;
+                       } else {
+                               hint = NULL;
+                       }

not needed. ip6_can_cache_route_hit is the same for all iterations of the loop (indeed, compile time static), so if false, hint is never set.

Quoted 7 lines
net/ipv6/ip6_input.c +1 -1
+
                        /* dispatch old sublist */
                        if (!list_empty(&sublist))
                                ip6_sublist_rcv_finish(&sublist);
--

2.21.0

author maintainer
#3 lore raw

Re: [PATCH net-next v2 1/2] ipv6: introduce and uses route look hints for list input

Quoted 15 lines · Willem de Bruijn
Quoted 14 lines · Paolo Abeni

When doing RX batch packet processing, we currently always repeat the route lookup for each ingress packet. If policy routing is configured, and IPV6_SUBTREES is disabled at build time, we know that packets with the same destination address will use the same dst.

This change tries to avoid per packet route lookup caching the destination address of the latest successful lookup, and reusing it for the next packet when the above conditions are in place. Ingress traffic for most servers should fit.

The measured performance delta under UDP flood vs a recvmmsg receiver is as follow:

Quoted 6 lines
Quoted 3 lines
vanilla         patched         delta
Kpps            Kpps            %
1431            1664            +14

Since IPv4 speed-up is almost half and code considerably more complex, maybe only do IPv6?

uhmm... I would avoid that kind of assimmetry, and I would not look down on a 8% speedup, if possible.

Quoted 46 lines
Quoted 46 lines

In the worst-case scenario - each packet has a different destination address - the performance delta is within noise range.

v1 -> v2:
- fix build issue with !CONFIG_IPV6_MULTIPLE_TABLES
- fix potential race when fib6_has_custom_rules is set while processing a packet batch

Signed-off-by Paolo Abeni <[email protected]>
---
 net/ipv6/ip6_input.c | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)
net/ipv6/ip6_input.c +12 -2
index ef7f707d9ae3..f559ad6b09ef 100644
@@ -44,10 +44,16 @@
 #include <net/inet_ecn.h>
 #include <net/dst_metadata.h>
 
+struct ip6_route_input_hint {
+       unsigned long   refdst;
+       struct in6_addr daddr;
+};
+
 INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *));
 INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *));
 static void ip6_rcv_finish_core(struct net *net, struct sock *sk,
-                               struct sk_buff *skb)
+                               struct sk_buff *skb,
+                               struct ip6_route_input_hint *hint)
 {
        void (*edemux)(struct sk_buff *skb);
 

@@ -59,7 +65,13 @@ static void ip6_rcv_finish_core(struct net *net, struct sock *sk,
                        INDIRECT_CALL_2(edemux, tcp_v6_early_demux,
                                        udp_v6_early_demux, skb);
        }
-       if (!skb_valid_dst(skb))
+
+       if (skb_valid_dst(skb))
+               return;
+
+       if (hint && ipv6_addr_equal(&hint->daddr, &ipv6_hdr(skb)->daddr))
Quoted 8 lines

net/ipv6/ip6_input.c static void ip6_rcv_finish_core(struct net *net, struct sock *sk, · line 75

Quoted 3 lines
net/ipv6/ip6_input.c +2 -0
+               __skb_dst_copy(skb, hint->refdst);
+       else
                ip6_route_input(skb);

Is it possible to do the address comparison in ip6_list_rcv_finish itself and pass a pointer to refdst if safe? To avoid new struct definition, memcpy and to have all logic in one place. Need to keep a pointer to the prev skb, then, instead.

I haven't tought about that. Sounds promising. I'll try, thanks.

Quoted 19 lines
Quoted 19 lines
net/ipv6/ip6_input.c +0 -0
 static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
                                struct list_head *head)

{

net/ipv6/ip6_input.c +6 -1
+       struct ip6_route_input_hint _hint, *hint = NULL;
        struct dst_entry *curr_dst = NULL;
        struct sk_buff *skb, *next;
        struct list_head sublist;

@@ -104,9 +127,18 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
                skb = l3mdev_ip6_rcv(skb);
                if (!skb)
                        continue;
-               ip6_rcv_finish_core(net, sk, skb);
+               ip6_rcv_finish_core(net, sk, skb, hint);
                dst = skb_dst(skb);
                if (curr_dst != dst) {
+                       if (ip6_can_cache_route_hint(net)) {
+                               _hint.refdst = skb->_skb_refdst;
+                               memcpy(&_hint.daddr, &ipv6_hdr(skb)->daddr,
+                                      sizeof(_hint.daddr));
Quoted 8 lines

net/ipv6/ip6_input.c static void ip6_list_rcv_finish(struct net *net, struct sock *sk, · line 140

Quoted 4 lines
net/ipv6/ip6_input.c +4 -0
+                               hint = &_hint;
+                       } else {
+                               hint = NULL;
+                       }

not needed. ip6_can_cache_route_hit is the same for all iterations of the loop (indeed, compile time static), so if false, hint is never set.

I think this is needed, instead: if CONFIG_MULTIPLE_TABLES=y, fib6_has_custom_rules can change at runtime - from 'false' to 'true'. If we don't reset 'hint', we could end-up with use-after-free.

Cheers,

Paolo

#4 lore raw

Re: [PATCH net-next v2 1/2] ipv6: introduce and uses route look hints for list input

Quoted 21 lines · Paolo Abeni
Quoted 19 lines · Willem de Bruijn
Quoted 17 lines · Paolo Abeni

When doing RX batch packet processing, we currently always repeat the route lookup for each ingress packet. If policy routing is configured, and IPV6_SUBTREES is disabled at build time, we know that packets with the same destination address will use the same dst.

This change tries to avoid per packet route lookup caching the destination address of the latest successful lookup, and reusing it for the next packet when the above conditions are in place. Ingress traffic for most servers should fit.

The measured performance delta under UDP flood vs a recvmmsg receiver is as follow:

vanilla         patched         delta
Kpps            Kpps            %
1431            1664            +14
Quoted 5 lines
Quoted 2 lines

Since IPv4 speed-up is almost half and code considerably more complex, maybe only do IPv6?

uhmm... I would avoid that kind of assimmetry, and I would not look down on a 8% speedup, if possible.

Okay, that's fair.

Quoted 21 lines
Quoted 12 lines
Quoted 12 lines
net/ipv6/ip6_input.c +5 -1
@@ -104,9 +127,18 @@ static void ip6_list_rcv_finish(struct net *net, struct sock *sk,
                skb = l3mdev_ip6_rcv(skb);
                if (!skb)
                        continue;
-               ip6_rcv_finish_core(net, sk, skb);
+               ip6_rcv_finish_core(net, sk, skb, hint);
                dst = skb_dst(skb);
                if (curr_dst != dst) {
+                       if (ip6_can_cache_route_hint(net)) {
+                               _hint.refdst = skb->_skb_refdst;
+                               memcpy(&_hint.daddr, &ipv6_hdr(skb)->daddr,
+                                      sizeof(_hint.daddr));
Quoted 8 lines

net/ipv6/ip6_input.c static void ip6_list_rcv_finish(struct net *net, struct sock *sk, · line 140

Quoted 4 lines
net/ipv6/ip6_input.c +4 -0
+                               hint = &_hint;
+                       } else {
+                               hint = NULL;
+                       }

not needed. ip6_can_cache_route_hit is the same for all iterations of the loop (indeed, compile time static), so if false, hint is never set.

Quoted 3 lines

I think this is needed, instead: if CONFIG_MULTIPLE_TABLES=y, fib6_has_custom_rules can change at runtime - from 'false' to 'true'. If we don't reset 'hint', we could end-up with use-after-free.

Uhm, of course, this is not compile time static at all. I clearly missed a part.

But such a config change does not expect instantaneous effect on packets in flight, like those in the recv rcu critical section? In which case it should be safe to treat all skbs in the list the same.

I would need to read that code more closely to be certain, and the current solution errs on the side of caution, so is definitely fine as is, of course.

author maintainer
#5 lore raw

PATCH v2 2/2 ipv4: use dst hint for ipv4 list receive

In reply to Paolo Abeni

This is alike the previous change, with some additional ipv4 specific quirk. Even when using the route hint we still have to do perform additional per packet checks about source address validity: a new helper is added to wrap them.

Moreover, the ipv4 route lookup, even in the absence of policy routing, may depend on pkts ToS, so we cache that values, too.

Explicitly avoid hints for local broadcast: this simplify the code and broadcasts are slower path anyway.

UDP flood performances vs recvmmsg() receiver:

vanilla patched delta
Kpps Kpps %
1683 1833 +8

In the worst case scenario - each packet has a different destination address - the performance delta is within noise range.

v1 -> v2:
- fix build issue with !CONFIG_IP_MULTIPLE_TABLES

Signed-off-by Paolo Abeni <[email protected]>
---
 include/net/route.h | 11 +++++++++++
 net/ipv4/ip_input.c | 38 +++++++++++++++++++++++++++++++++-----
 net/ipv4/route.c    | 38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 5 deletions(-)
include/net/route.h +11 -0
index 6c516840380d..f7a8a52318cd 100644
@@ -185,6 +185,17 @@ int ip_route_input_rcu(struct sk_buff *skb, __be32 dst, __be32 src,
 		       u8 tos, struct net_device *devin,
 		       struct fib_result *res);
 
+struct ip_route_input_hint {
+	unsigned long	refdst;
+	__be32		daddr;
+	char		tos;
+	bool		local;
+};
+
+int ip_route_use_hint(struct sk_buff *skb, __be32 dst, __be32 src,
+		      u8 tos, struct net_device *devin,
+		      struct ip_route_input_hint *hint);
+
 static inline int ip_route_input(struct sk_buff *skb, __be32 dst, __be32 src,
 				 u8 tos, struct net_device *devin)
 {
net/ipv4/ip_input.c +33 -5
index 24a95126e698..25f6fcc65380 100644
@@ -305,7 +305,8 @@ static inline bool ip_rcv_options(struct sk_buff *skb, struct net_device *dev)
 INDIRECT_CALLABLE_DECLARE(int udp_v4_early_demux(struct sk_buff *));
 INDIRECT_CALLABLE_DECLARE(int tcp_v4_early_demux(struct sk_buff *));
 static int ip_rcv_finish_core(struct net *net, struct sock *sk,
-			      struct sk_buff *skb, struct net_device *dev)
+			      struct sk_buff *skb, struct net_device *dev,
+			      struct ip_route_input_hint *hint)
 {
 	const struct iphdr *iph = ip_hdr(skb);
 	int (*edemux)(struct sk_buff *skb);

@@ -335,8 +336,12 @@ static int ip_rcv_finish_core(struct net *net, struct sock *sk,
 	 *	how the packet travels inside Linux networking.
 	 */
 	if (!skb_valid_dst(skb)) {
-		err = ip_route_input_noref(skb, iph->daddr, iph->saddr,
-					   iph->tos, dev);
+		if (hint && hint->daddr == iph->daddr && hint->tos == iph->tos)
+			err = ip_route_use_hint(skb, iph->daddr, iph->saddr,
+						iph->tos, dev, hint);
+		else
+			err = ip_route_input_noref(skb, iph->daddr, iph->saddr,
+						   iph->tos, dev);
 		if (unlikely(err))
 			goto drop_error;
 	}

@@ -408,7 +413,7 @@ static int ip_rcv_finish(struct net *net, struct sock *sk, struct sk_buff *skb)
 	if (!skb)
 		return NET_RX_SUCCESS;
 
-	ret = ip_rcv_finish_core(net, sk, skb, dev);
+	ret = ip_rcv_finish_core(net, sk, skb, dev, NULL);
 	if (ret != NET_RX_DROP)
 		ret = dst_input(skb);
 	return ret;

@@ -535,9 +540,20 @@ static void ip_sublist_rcv_finish(struct list_head *head)
 	}
 }
 
+static bool ip_can_cache_route_hint(struct net *net, struct rtable *rt)
+{
+	return rt->rt_type != RTN_BROADCAST &&
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	       !net->ipv6.fib6_has_custom_rules;
+#else
+	       1;
+#endif
+}
+
 static void ip_list_rcv_finish(struct net *net, struct sock *sk,
 			       struct list_head *head)
 {
+	struct ip_route_input_hint _hint, *hint = NULL;
 	struct dst_entry *curr_dst = NULL;
 	struct sk_buff *skb, *next;
 	struct list_head sublist;

@@ -554,11 +570,23 @@ static void ip_list_rcv_finish(struct net *net, struct sock *sk,
 		skb = l3mdev_ip_rcv(skb);
 		if (!skb)
 			continue;
-		if (ip_rcv_finish_core(net, sk, skb, dev) == NET_RX_DROP)
+		if (ip_rcv_finish_core(net, sk, skb, dev, hint) == NET_RX_DROP)
 			continue;
 
 		dst = skb_dst(skb);
 		if (curr_dst != dst) {
+			struct rtable *rt = (struct rtable *)dst;
+
+			if (ip_can_cache_route_hint(net, rt)) {
+				_hint.refdst = skb->_skb_refdst;
+				_hint.daddr = ip_hdr(skb)->daddr;
+				_hint.tos = ip_hdr(skb)->tos;
+				_hint.local = rt->rt_type == RTN_LOCAL;
+				hint = &_hint;
+			} else {
+				hint = NULL;
+			}
+
 			/* dispatch old sublist */
 			if (!list_empty(&sublist))
 				ip_sublist_rcv_finish(&sublist);
net/ipv4/route.c +38 -0
index dcc4fa10138d..b0ddff17db80 100644
@@ -2019,6 +2019,44 @@ static int ip_mkroute_input(struct sk_buff *skb,
 	return __mkroute_input(skb, res, in_dev, daddr, saddr, tos);
 }
 
+/* Implements all the saddr-related checks as ip_route_input_slow(),
+ * assuming daddr is valid and this is not a local broadcast.
+ * Uses the provided hint instead of performing a route lookup.
+ */
+int ip_route_use_hint(struct sk_buff *skb, __be32 daddr, __be32 saddr,
+		      u8 tos, struct net_device *dev,
+		      struct ip_route_input_hint *hint)
+{
+	struct in_device *in_dev = __in_dev_get_rcu(dev);
+	struct net *net = dev_net(dev);
+	int err = -EINVAL;
+	u32 itag = 0;
+
+	if (ipv4_is_multicast(saddr) || ipv4_is_lbcast(saddr))
+		goto martian_source;
+
+	if (ipv4_is_zeronet(saddr))
+		goto martian_source;
+
+	if (ipv4_is_loopback(saddr) && !IN_DEV_NET_ROUTE_LOCALNET(in_dev, net))
+		goto martian_source;
+
+	if (hint->local) {
+		err = fib_validate_source(skb, saddr, daddr, tos, 0, dev,
+					  in_dev, &itag);
+		if (err < 0)
+			goto martian_source;
+	}
+
+	err = 0;
+	__skb_dst_copy(skb, hint->refdst);
+	return err;
+
+martian_source:
+	ip_handle_martian_source(dev, in_dev, skb, daddr, saddr);
+	return err;
+}
+
 /*
  *	NOTE. We drop all the packets that has local source
  *	addresses, because every properly looped back packet
Signature · 1 line
2.21.0
build bot
#6 lore raw

Re: [PATCH net-next v2 2/2] ipv4: use dst hint for ipv4 list receive

Thank you for the patch! Yet something to improve:

Hi Paolo,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on net-next/master]
[also build test ERROR on v5.4-rc8 next-20191115]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system. BTW, we also suggest to use '--base' option to specify the base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Paolo-Abeni/net-introduce-and-use-route-hint/20191118-195936
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git 19b7e21c55c81713c4011278143006af9f232504
config: mips-malta_kvm_defconfig (attached as .config)
compiler: mipsel-linux-gcc (GCC) 7.4.0

reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=7.4.0 make.cross ARCH=mips

If you fix the issue, kindly add following tag

Reported-by kbuild test robot <[email protected]>

All errors (new ones prefixed by >>):

net//ipv4/ip_input.c: In function 'ip_can_cache_route_hint':

>> net//ipv4/ip_input.c:547:19: error: 'struct netns_ipv6' has no member named 'fib6_has_custom_rules'
            !net->ipv6.fib6_has_custom_rules;
                      ^
   net//ipv4/ip_input.c:551:1: warning: control reaches end of non-void function [-Wreturn-type]
    }
    ^

vim +547 net//ipv4/ip_input.c

542
543 static bool ip_can_cache_route_hint(struct net *net, struct rtable *rt)
544 {
545 return rt->rt_type != RTN_BROADCAST &&
546 #ifdef CONFIG_IP_MULTIPLE_TABLES

 > 547		       !net->ipv6.fib6_has_custom_rules;

548 #else
549 1;
550 #endif
551 }
552

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org Intel Corporation

#7 lore raw

Re: [PATCH net-next v2 2/2] ipv4: use dst hint for ipv4 list receive

In reply to Paolo Abeni

net/ipv4/ip_input.c static void ip_sublist_rcv_finish(struct list_head *head) · line 547

Quoted 9 lines · Paolo Abeni
net/ipv4/ip_input.c +5 -0
@@ -535,9 +540,20 @@ static void ip_sublist_rcv_finish(struct list_head *head)
 	}
 }
 
+static bool ip_can_cache_route_hint(struct net *net, struct rtable *rt)
+{
+	return rt->rt_type != RTN_BROADCAST &&
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	       !net->ipv6.fib6_has_custom_rules;

that should be ipv4, not ipv6, right?

Also, for readability it would be better to have 2 helpers in include//net/fib_rules.h that return true false and manage the net namespace issue.

Quoted 5 lines
net/ipv4/ip_input.c +5 -0
+#else
+	       1;
+#endif
+}
+
author maintainer
#8 lore raw

Re: [PATCH net-next v2 2/2] ipv4: use dst hint for ipv4 list receive

Hi,

Thank you for the feedback.

Quoted 5 lines · David Ahern
Quoted 4 lines · Paolo Abeni
(quoted diff) +0 -0
@@ -535,9 +540,20 @@ static void ip_sublist_rcv_finish(struct list_head *head)
 	}
 }
Quoted 7 lines

Review static void ip_sublist_rcv_finish(struct list_head *head) · line 547

Quoted 5 lines
(quoted diff) +5 -0
+static bool ip_can_cache_route_hint(struct net *net, struct rtable *rt)
+{
+	return rt->rt_type != RTN_BROADCAST &&
+#ifdef CONFIG_IP_MULTIPLE_TABLES
+	       !net->ipv6.fib6_has_custom_rules;

that should be ipv4, not ipv6, right?

Indeed. More coffee needed here, sorry.

Quoted 3 lines

Also, for readability it would be better to have 2 helpers in include//net/fib_rules.h that return true false and manage the net namespace issue.

Double checking I parsed the above correctly. Do you mean something like the following - I think net/ip_fib.h fits more, as it already deals with CONFIG_IP_MULTIPLE_TABLES?

---

include/net/ip_fib.h +10 -1
index 52b2406a5dfc..b6c5cd544402 100644
@@ -272,6 +272,11 @@ void fib_free_table(struct fib_table *tb);
 #define TABLE_LOCAL_INDEX      (RT_TABLE_LOCAL & (FIB_TABLE_HASHSZ - 1))
 #define TABLE_MAIN_INDEX       (RT_TABLE_MAIN  & (FIB_TABLE_HASHSZ - 1))
 
+static bool fib4_has_custom_rules(struct net *net)
+{
+       return 0;
+}
+
 static inline struct fib_table *fib_get_table(struct net *net, u32 id)
 {
        struct hlist_node *tb_hlist;

@@ -341,6 +346,11 @@ void __net_exit fib4_rules_exit(struct net *net);
 struct fib_table *fib_new_table(struct net *net, u32 id);
 struct fib_table *fib_get_table(struct net *net, u32 id);
 
+static bool fib4_has_custom_rules(struct net *net)
+{
+       return net->ipv4.fib_has_custom_rules;
+}
+
 int __fib_lookup(struct net *net, struct flowi4 *flp,
                 struct fib_result *res, unsigned int flags);
---

plus something similar for the previous patch, in include/net/ip6_fib.h

Thank you,

Paolo

#9 lore raw

Re: [PATCH net-next v2 2/2] ipv4: use dst hint for ipv4 list receive

Quoted 7 lines · Paolo Abeni
Quoted 3 lines

Also, for readability it would be better to have 2 helpers in include//net/fib_rules.h that return true false and manage the net namespace issue.

Double checking I parsed the above correctly. Do you mean something like the following - I think net/ip_fib.h fits more, as it already deals with CONFIG_IP_MULTIPLE_TABLES?

sure.

And it looks like they already exist in net//ipv4/fib_frontend.c, so those can be moved to ip_fib.h